summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-08-01 22:43:27 +1200
committerThong Kuah <tkuah@gitlab.com>2018-08-02 13:19:20 +1200
commit05c7c7e0ef0639fde2d98ad3fe9f09b2297ffa4b (patch)
tree836cdcc69b031fd1d28b7bebd471f685b9be9a17
parentb690c268c2c34e1a7e34a9bbef264fe986e2f2d4 (diff)
downloadgitlab-ce-05c7c7e0ef0639fde2d98ad3fe9f09b2297ffa4b.tar.gz
Update Helm Tiller used by gitlab-managed-apps to 2.7.2
-rw-r--r--changelogs/unreleased/49830-use-helm-272.yml5
-rw-r--r--lib/gitlab/kubernetes/helm.rb2
-rw-r--r--spec/support/shared_examples/helm_generated_script.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/49830-use-helm-272.yml b/changelogs/unreleased/49830-use-helm-272.yml
new file mode 100644
index 00000000000..f6ecc12dbfa
--- /dev/null
+++ b/changelogs/unreleased/49830-use-helm-272.yml
@@ -0,0 +1,5 @@
+---
+title: Use Helm 2.7.2 for GitLab Managed Apps
+merge_request: 20956
+author:
+type: changed
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 0f0588b8b23..530ccf88053 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -1,7 +1,7 @@
module Gitlab
module Kubernetes
module Helm
- HELM_VERSION = '2.7.0'.freeze
+ HELM_VERSION = '2.7.2'.freeze
NAMESPACE = 'gitlab-managed-apps'.freeze
end
end
diff --git a/spec/support/shared_examples/helm_generated_script.rb b/spec/support/shared_examples/helm_generated_script.rb
index 05d53a13fd3..ef9bb7f5533 100644
--- a/spec/support/shared_examples/helm_generated_script.rb
+++ b/spec/support/shared_examples/helm_generated_script.rb
@@ -7,7 +7,7 @@ shared_examples 'helm commands' do
echo http://mirror.clarkson.edu/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
echo http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
apk add -U wget ca-certificates openssl >/dev/null
- wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.7.0-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
+ wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.7.2-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
mv /tmp/linux-amd64/helm /usr/bin/
EOS
end