promote Jinquan ni as MSB commiter and ptl

[msb/service-mesh.git] / install / 1_install_k8s_master.sh

diff --git a/install/1_install_k8s_master.sh b/install/1_install_k8s_master.sh
index 8ad2b12..4dd3b42 100755 (executable)
--- a/install/1_install_k8s_master.sh
+++ b/install/1_install_k8s_master.sh
@@ -26,19 +26,19 @@ deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt-get update
 
-read -p "Install kubelet (y/n)?" -n1 choice
+read -p "Install kubelet (y/n)?" choice
 case "$choice" in
   y|Y ) sudo apt-get install -y kubelet=1.11.1-00;;
 esac
 printf "\n"
 
-read -p "Install kubeadm (y/n)?" -n1 choice
+read -p "Install kubeadm (y/n)?" choice
 case "$choice" in
   y|Y ) sudo apt-get install -y kubeadm=1.11.1-00;;
 esac
 printf "\n"
 
-read -p "Install kubectl (y/n)?" -n1 choice
+read -p "Install kubectl (y/n)?" choice
 case "$choice" in
   y|Y ) sudo apt-get install -y kubectli=1.11.1-00;;
 esac
@@ -47,7 +47,7 @@ printf "\n"
 echo "*************dry run to test kubeadm.conf************"
 sudo kubeadm init --config kubeadm.conf --dry-run
 
-read -p "Create kubernetees master(y/n)?" -n1 choice
+read -p "Create kubernetees master(y/n)?" choice
 case "$choice" in
   y|Y )
     sudo kubeadm init --config kubeadm.conf
@@ -59,21 +59,21 @@ case "$choice" in
 esac
 printf "\n"
 
-read -p "Install calico network plugin (y/n)?" -n1 choice
+read -p "Install calico network plugin (y/n)?" choice
 case "$choice" in
   y|Y ) kubectl apply -f https://docs.projectcalico.org/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml;;
 esac
 printf "\n"
 
-read -p "Install helm (y/n)?" -n1 choice
+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