diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-09 10:15:39 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-09 15:51:13 +0200 |
| commit | e73ccc9e65563c8f9b708e06780bad9576e69d00 (patch) | |
| tree | b5cfb00c0830e2cb39a8771640b9e5615c155814 /lib | |
| parent | 9aeb2515f71c072e6cff8957a91239510b863170 (diff) | |
| download | gitlab-ce-e73ccc9e65563c8f9b708e06780bad9576e69d00.tar.gz | |
Merge branch '48978-fix-helm-installation-on-cluster' into 'master'
Resolve "Installing Helm Tiller Failing"
Closes #48978
See merge request gitlab-org/gitlab-ce!20471
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/kubernetes/helm/base_command.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes/helm/base_command.rb b/lib/gitlab/kubernetes/helm/base_command.rb index 3d778da90c7..f9ebe53d6af 100644 --- a/lib/gitlab/kubernetes/helm/base_command.rb +++ b/lib/gitlab/kubernetes/helm/base_command.rb @@ -18,7 +18,7 @@ module Gitlab ALPINE_VERSION=$(cat /etc/alpine-release | cut -d '.' -f 1,2) 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 ca-certificates openssl >/dev/null + apk add -U wget ca-certificates openssl >/dev/null wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v#{Gitlab::Kubernetes::Helm::HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null mv /tmp/linux-amd64/helm /usr/bin/ HEREDOC |