From 379b515ad753750eb9c8e6fb2c5a82bbd0859aa0 Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Thu, 24 Oct 2019 00:01:04 +0000 Subject: [PATCH 1/5] k8s: update helm version --- lib/gitlab/kubernetes/helm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb index 16ed0cb0f8eefb..21e30f2ce51a07 100644 --- a/lib/gitlab/kubernetes/helm.rb +++ b/lib/gitlab/kubernetes/helm.rb @@ -3,7 +3,7 @@ module Gitlab module Kubernetes module Helm - HELM_VERSION = '2.14.3' + HELM_VERSION = '2.15.1' KUBECTL_VERSION = '1.11.10' NAMESPACE = 'gitlab-managed-apps' SERVICE_ACCOUNT = 'tiller' -- GitLab From dba49ca7bc18fd55bc4eaa59765c1e1bf6da7028 Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Thu, 24 Oct 2019 00:05:13 +0000 Subject: [PATCH 2/5] update pod_spec to match new helm version --- spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 64cadcc011c78e..ee9751b1bf3520 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"]) -- GitLab From 0c93997e5fdc58ca19f9d91db29bac447ad27848 Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Thu, 24 Oct 2019 23:28:24 +0200 Subject: [PATCH 3/5] bump kubectl to 1.13.12 --- lib/gitlab/kubernetes/helm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb index 21e30f2ce51a07..5762c77bb95a8d 100644 --- a/lib/gitlab/kubernetes/helm.rb +++ b/lib/gitlab/kubernetes/helm.rb @@ -4,7 +4,7 @@ module Gitlab module Kubernetes module Helm HELM_VERSION = '2.15.1' - KUBECTL_VERSION = '1.11.10' + KUBECTL_VERSION = '1.13.12' NAMESPACE = 'gitlab-managed-apps' SERVICE_ACCOUNT = 'tiller' CLUSTER_ROLE_BINDING = 'tiller-admin' -- GitLab From be5b9fa225334c623b920c6050a7af74dfd303fc Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Thu, 24 Oct 2019 23:28:41 +0200 Subject: [PATCH 4/5] add changelog entry --- changelogs/unreleased/patch-35.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/patch-35.yml diff --git a/changelogs/unreleased/patch-35.yml b/changelogs/unreleased/patch-35.yml new file mode 100644 index 00000000000000..665399c15c21ae --- /dev/null +++ b/changelogs/unreleased/patch-35.yml @@ -0,0 +1,5 @@ +--- +title: 'k8s: bump helm and kubectl' +merge_request: 19054 +author: Leo Antunes +type: other -- GitLab From 2a9b6bdab1e06dc869dc739411c123d1a728d0f8 Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Fri, 25 Oct 2019 21:16:06 +0000 Subject: [PATCH 5/5] Apply suggestion to changelogs/unreleased/patch-35.yml --- changelogs/unreleased/patch-35.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/patch-35.yml b/changelogs/unreleased/patch-35.yml index 665399c15c21ae..ff65fa5d66c595 100644 --- a/changelogs/unreleased/patch-35.yml +++ b/changelogs/unreleased/patch-35.yml @@ -1,5 +1,5 @@ --- -title: 'k8s: bump helm and kubectl' +title: 'Updated Auto-DevOps to kubectl v1.13.12 and helm v2.15.1' merge_request: 19054 author: Leo Antunes type: other -- GitLab