diff options
author | Huabing Zhao <zhaohuabing@gmail.com> | 2018-10-16 08:01:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-16 08:01:25 +0000 |
commit | 364114510df798c2e8889196c86eba77b73cab96 (patch) | |
tree | bc94d3da5371d23b9ec729a3bccb6e69c01ce55e | |
parent | a31c2eea386c6bf1c900e14c989ec00bc8fe199a (diff) | |
parent | bc64fd35c800e0f2710d82cc59ecda92a1484a15 (diff) |
Merge "upgrade to helm 2.9.1 - follow OOM-1299"
-rwxr-xr-x | install/1_install_k8s_master.sh | 6 | ||||
-rwxr-xr-x | install/2_install_k8s_minion.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/install/1_install_k8s_master.sh b/install/1_install_k8s_master.sh index 037b54f..4dd3b42 100755 --- a/install/1_install_k8s_master.sh +++ b/install/1_install_k8s_master.sh @@ -68,12 +68,12 @@ printf "\n" read -p "Install helm (y/n)?" choice case "$choice" in y|Y ) - wget https://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz - tar -zxvf helm-v2.8.2-linux-amd64.tar.gz + wget https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz + tar -zxvf helm-v2.9.1-linux-amd64.tar.gz chmod o+x linux-amd64/helm sudo mv linux-amd64/helm /usr/local/bin/helm rm -rf linux-amd64 - rm -rf helm-v2.8.2-linux-amd64.tar.gz + rm -rf helm-v2.9.1-linux-amd64.tar.gz kubectl create -f helm_service_account.yaml helm init --service-account tiller diff --git a/install/2_install_k8s_minion.sh b/install/2_install_k8s_minion.sh index e7fed69..4eea65b 100755 --- a/install/2_install_k8s_minion.sh +++ b/install/2_install_k8s_minion.sh @@ -47,12 +47,12 @@ printf "\n" read -p "Install helm (y/n)?" choice case "$choice" in y|Y ) - wget https://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz - tar -zxvf helm-v2.8.2-linux-amd64.tar.gz + wget https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz + tar -zxvf helm-v2.9.1-linux-amd64.tar.gz chmod o+x linux-amd64/helm sudo mv linux-amd64/helm /usr/local/bin/helm rm -rf linux-amd64 - rm -rf helm-v2.8.2-linux-amd64.tar.gz + rm -rf helm-v2.9.1-linux-amd64.tar.gz ;; esac printf "\n" |