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
This commit is contained in:
commit
5e471c78ec
3 changed files with 7 additions and 2 deletions
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fixes base command used in Helm installations
|
||||||
|
merge_request: 20471
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -18,7 +18,7 @@ module Gitlab
|
||||||
ALPINE_VERSION=$(cat /etc/alpine-release | cut -d '.' -f 1,2)
|
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://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
|
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
|
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/
|
mv /tmp/linux-amd64/helm /usr/bin/
|
||||||
HEREDOC
|
HEREDOC
|
||||||
|
|
|
@ -6,7 +6,7 @@ shared_examples 'helm commands' do
|
||||||
ALPINE_VERSION=$(cat /etc/alpine-release | cut -d '.' -f 1,2)
|
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://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
|
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-v2.7.0-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
|
wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.7.0-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
|
||||||
mv /tmp/linux-amd64/helm /usr/bin/
|
mv /tmp/linux-amd64/helm /usr/bin/
|
||||||
EOS
|
EOS
|
||||||
|
|
Loading…
Reference in a new issue