From 5bbe38071eb82b121c374742b5454b5de4dc2c9e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 14 Dec 2021 18:02:30 +0100 Subject: [PATCH] Update version of helm3 for OSM community installer Change-Id: Ia3c7c957d3283d9b9761d5585f5f04fa4282c7bc Signed-off-by: garciadeblas --- installers/install_kubeadm_cluster.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh index bca1904e..f31889cb 100755 --- a/installers/install_kubeadm_cluster.sh +++ b/installers/install_kubeadm_cluster.sh @@ -19,6 +19,7 @@ set +eux function install_kube() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function K8S_VERSION=1.23.3-00 + # Kubernetes releases can be found here: https://kubernetes.io/releases/ # To check other available versions, run the following command # curl -s https://packages.cloud.google.com/apt/dists/kubernetes-xenial/main/binary-amd64/Packages | grep Version | awk '{print $2}' sudo apt-get update && sudo apt-get install -y apt-transport-https @@ -76,20 +77,23 @@ function taint_master_node() { } #Install Helm v3 +#Helm releases can be found here: https://github.com/helm/helm/releases function install_helm() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function - helm > /dev/null 2>&1 - if [ $? != 0 ] ; then + HELM_VERSION="v3.7.2" + if ! [[ "$(helm version --short 2>/dev/null)" =~ ^v3.* ]]; then # Helm is not installed. Install helm - echo "Helm is not installed, installing ..." - curl https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz --output helm-v3.6.3.tar.gz - tar -zxvf helm-v3.6.3.tar.gz + echo "Helm3 is not installed, installing ..." + curl https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz --output helm-${HELM_VERSION}.tar.gz + tar -zxvf helm-${HELM_VERSION}.tar.gz sudo mv linux-amd64/helm /usr/local/bin/helm rm -r linux-amd64 - rm helm-v3.6.3.tar.gz - helm repo add stable https://charts.helm.sh/stable - helm repo update + rm helm-${HELM_VERSION}.tar.gz + else + echo "Helm3 is already installed. Skipping installation..." fi + helm repo add stable https://charts.helm.sh/stable + helm repo update [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } -- 2.25.1