diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-08-13 21:57:14 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-08-13 21:57:14 +0000 |
commit | 383a18403f049652807df0be3be7a4a9cfc2aa95 (patch) | |
tree | f87d2275795c9997ffbab57ce87bd919014202c7 /spec/lib/gitlab | |
parent | e2361565ceb1754bd63c2d98a5c1cfe134e93160 (diff) | |
parent | b577825e5485f1659d5b054fb59430fb4190f75a (diff) | |
download | gitlab-ce-383a18403f049652807df0be3be7a4a9cfc2aa95.tar.gz |
Merge branch 'bump_helm_kubectl_gitlab' into 'master'
Bump Helm to 2.14.3 and kubectl to 1.11.10
See merge request gitlab-org/gitlab-ce!31716
Diffstat (limited to 'spec/lib/gitlab')
-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 06c8d127951..fce2aded786 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 'generates 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.3-kube-1.11.7') + expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.14.3-kube-1.11.10') 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"]) |