X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsetup-cni.sh;h=643f157cbcaf724f5e2f7d79f3bea3e63c9129a0;hb=a06c33c3c247eeeac2b75ef24e9f689ef0f866a2;hp=8b9730c50518aad298fe51066368ae2ced966933;hpb=424e72ce7a22cda402692d4ec96d099ad7618254;p=iec.git diff --git a/scripts/setup-cni.sh b/scripts/setup-cni.sh index 8b9730c..643f157 100755 --- a/scripts/setup-cni.sh +++ b/scripts/setup-cni.sh @@ -3,6 +3,7 @@ set -o xtrace set -e CLUSTER_IP=${1:-172.16.1.136} # Align with the value in our K8s setup script +POD_NETWORK_CIDR=${2:-192.168.0.0/16} # Install the Etcd Database if [ "$(uname -m)" == 'aarch64' ]; then @@ -20,7 +21,8 @@ kubectl apply -f "${SCRIPTS_DIR}/cni/calico/${ETCD_YAML}" kubectl apply -f "${SCRIPTS_DIR}/cni/calico/rbac.yaml" # Install Calico to system -sed -i "s/10.96.232.136/${CLUSTER_IP}/" "${SCRIPTS_DIR}/cni/calico/calico.yaml" +sed -i "s@10.96.232.136@${CLUSTER_IP}@; s@192.168.0.0/16@${POD_NETWORK_CIDR}@" \ + "${SCRIPTS_DIR}/cni/calico/calico.yaml" kubectl apply -f "${SCRIPTS_DIR}/cni/calico/calico.yaml" # Remove the taints on master node