diff options
| author |   Zhaoxing Meng <meng.zhaoxing1@zte.com.cn> | 2018-08-02 06:44:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-02 06:44:40 +0000 |
| commit | 1ff0bbd2faff8ede6fdca26504f5a448ba459ac8 (patch) | |
| tree | 8f80a6ac1c03b6bac30c15821b2617dd63228265 | |
| parent | bbb5ce47b790b91dbc9a394a32e6b43ebde1990c (diff) | |
| parent | e54b48bc552ffbc3f80bdd707795f29d6cb0a4bf (diff) | |
Merge "Fix bash error"
| -rwxr-xr-x | install/1_install_k8s_master.sh | 12 | ||||
| -rwxr-xr-x | install/2_install_k8s_minion.sh | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/install/1_install_k8s_master.sh b/install/1_install_k8s_master.sh index 8ad2b12..037b54f 100755 --- 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,13 +59,13 @@ 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 diff --git a/install/2_install_k8s_minion.sh b/install/2_install_k8s_minion.sh index 65fe0d8..e7fed69 100755 --- a/install/2_install_k8s_minion.sh +++ b/install/2_install_k8s_minion.sh @@ -26,25 +26,25 @@ 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 kubectl=1.11.1-00;; 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 |