diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-20 13:44:28 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-20 13:44:28 +0000 |
| commit | b0006630d685db369bc29a0a1df979537174120b (patch) | |
| tree | 30f5d4c685e6811e53fb462f1d882c339c118966 /spec | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| parent | 8004508943fcdc273e9b09c86104e57295a6c866 (diff) | |
| download | gitlab-ce-b0006630d685db369bc29a0a1df979537174120b.tar.gz | |
Merge branch 'gitlab_kubernetes_helm_bump' into 'master'
Bump helm and kubectl for Kubernetes integration
See merge request gitlab-org/gitlab-ce!25268
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 27c802f34ec..95b6b3fd953 100644 --- a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb @@ -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(container.name).to eq('helm') - expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.12.2-kube-1.11.0') + expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.12.3-kube-1.11.7') expect(container.env.count).to eq(3) expect(container.env.map(&:name)).to match_array([:HELM_VERSION, :TILLER_NAMESPACE, :COMMAND_SCRIPT]) expect(container.command).to match_array(["/bin/sh"]) |