Commit b0006630 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'gitlab_kubernetes_helm_bump' into 'master'

Bump helm and kubectl for Kubernetes integration

See merge request gitlab-org/gitlab-ce!25268
parents 094d7408 80045089
title: Bump Helm and kubectl used in Kubernetes integration to 2.12.3 and 1.11.7 respectively
merge_request: 25268
type: other
......@@ -3,8 +3,8 @@
module Gitlab
module Kubernetes
module Helm
HELM_VERSION = '2.12.2'.freeze
KUBECTL_VERSION = '1.11.0'.freeze
HELM_VERSION = '2.12.3'.freeze
KUBECTL_VERSION = '1.11.7'.freeze
NAMESPACE = 'gitlab-managed-apps'.freeze
SERVICE_ACCOUNT = 'tiller'.freeze
CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze
......@@ -30,7 +30,7 @@ describe Gitlab::Kubernetes::Helm::Pod do
it 'should generate the appropriate specifications for the container' do
container = subject.generate.spec.containers.first
expect( eq('helm')
expect(container.image).to eq('')
expect(container.image).to eq('')
expect(container.env.count).to eq(3)
expect(container.command).to match_array(["/bin/sh"])
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment