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 | |
| 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
| -rw-r--r-- | changelogs/unreleased/bump_kubernetes_1_11_9.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/kubernetes/helm.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/bump_kubernetes_1_11_9.yml b/changelogs/unreleased/bump_kubernetes_1_11_9.yml new file mode 100644 index 00000000000..4bc7ff6d8e9 --- /dev/null +++ b/changelogs/unreleased/bump_kubernetes_1_11_9.yml @@ -0,0 +1,5 @@ +--- +title: Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively +merge_request: 26991 +author: +type: other diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb index 42c4745ff98..24713223513 100644 --- a/lib/gitlab/kubernetes/helm.rb +++ b/lib/gitlab/kubernetes/helm.rb @@ -3,8 +3,8 @@ module Gitlab module Kubernetes module Helm - HELM_VERSION = '2.12.3'.freeze - KUBECTL_VERSION = '1.11.7'.freeze + HELM_VERSION = '2.13.1'.freeze + KUBECTL_VERSION = '1.11.9'.freeze NAMESPACE = 'gitlab-managed-apps'.freeze SERVICE_ACCOUNT = 'tiller'.freeze CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze 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"]) |