diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-04-05 09:43:46 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-04-05 09:43:46 +0000 |
| commit | a827092b65973772c6fe708fc0c064fbe2ed1cb1 (patch) | |
| tree | 36f094f9cd5ccb2b87fdde0a42056be11849efd2 /spec/lib | |
| parent | ca72809cb0760a4498131dbf040c0977a8a5fd35 (diff) | |
| parent | 38b40f91649d2aa670cf229f38cc70c9de3ebdd7 (diff) | |
| download | gitlab-ce-a827092b65973772c6fe708fc0c064fbe2ed1cb1.tar.gz | |
Merge branch 'bump_kubernetes_1_11_9' into 'master'
Bump Helm to 2.13.1 and kubectl to 1.11.9
See merge request gitlab-org/gitlab-ce!26991
Diffstat (limited to 'spec/lib')
| -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..10876709f36 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.13.1-kube-1.11.9') 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"]) |