diff --git a/changelogs/unreleased/patch-35.yml b/changelogs/unreleased/patch-35.yml new file mode 100644 index 0000000000000000000000000000000000000000..ff65fa5d66c595dc11db77ec5e86f6998be9d71e --- /dev/null +++ b/changelogs/unreleased/patch-35.yml @@ -0,0 +1,5 @@ +--- +title: 'Updated Auto-DevOps to kubectl v1.13.12 and helm v2.15.1' +merge_request: 19054 +author: Leo Antunes +type: other diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb index 16ed0cb0f8eefb67b447032065ee18c5d4b62f2a..5762c77bb95a8df32a6c53bcbf5948bf92518bda 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.14.3' - KUBECTL_VERSION = '1.11.10' + HELM_VERSION = '2.15.1' + KUBECTL_VERSION = '1.13.12' NAMESPACE = 'gitlab-managed-apps' SERVICE_ACCOUNT = 'tiller' CLUSTER_ROLE_BINDING = 'tiller-admin' diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 64cadcc011c78e4a2ae6dc65e15fcba7ca515a82..ee9751b1bf3520a85f7736252cb70f3c794eee46 100644 --- a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb @@ -30,7 +30,7 @@ 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.14.3-kube-1.11.10') + expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.15.1-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"])