From 56dd5e0f2164b37b40ac1daa188ccc618b4cbd19 Mon Sep 17 00:00:00 2001 From: Trevor Tao Date: Mon, 16 Dec 2019 16:03:16 +0800 Subject: [PATCH] Change the order of setup-cni.sh parameters To facilitate the manual installation of various CNIs by using setup-cni.sh, the order of setup-cni.sh parameters is changed as: 1. CNI_TYPE 2. POD_NETWORK_CIDR 3. CLUSTER_IP 4. As-is ... The reason to do in this way is that the CLUSTER_IP parameter is only needed by Calico CNI, but the CNI_TYPE and POD_NETWORK_CIDR is needed by all CNIs when we do it manually (by calling setup-cni.sh directly). Signed-off-by: Trevor Tao Change-Id: I5e41f23ed882ed8bb7e9ab74e4d6a9237532d060 --- src/foundation/scripts/setup-cni.sh | 4 ++-- src/foundation/scripts/startup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh index 61e9f06..74b15e5 100755 --- a/src/foundation/scripts/setup-cni.sh +++ b/src/foundation/scripts/setup-cni.sh @@ -8,9 +8,9 @@ if [ -f "$HOME/.bashrc" ]; then fi -CLUSTER_IP=${1:-172.16.1.136} # Align with the value in our K8s setup script +CNI_TYPE=${1:-calico} POD_NETWORK_CIDR=${2:-192.168.0.0/16} -CNI_TYPE=${3:-calico} +CLUSTER_IP=${3:-172.16.1.136} # Align with the value in our K8s setup script K8S_MASTER_IP=${4:-10.169.41.173} SERVICE_CIDR=${5:-172.16.1.0/24} DEV_NAME=${6:-} diff --git a/src/foundation/scripts/startup.sh b/src/foundation/scripts/startup.sh index cc4e669..40f54d3 100755 --- a/src/foundation/scripts/startup.sh +++ b/src/foundation/scripts/startup.sh @@ -98,7 +98,7 @@ deploy_k8s () { #Deploy etcd & CNI from master node - SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh $CLUSTER_IP $POD_NETWORK_CIDR $CNI_TYPE $K8S_MASTER_IP $SVC_CIDR" + SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh $CNI_TYPE $POD_NETWORK_CIDR $CLUSTER_IP $K8S_MASTER_IP $SVC_CIDR" sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI} SETUP_HELM="cd iec/src/foundation/scripts && source helm.sh" sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_HELM} -- 2.16.6