X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsetup-cni.sh;h=643f157cbcaf724f5e2f7d79f3bea3e63c9129a0;hb=a06c33c3c247eeeac2b75ef24e9f689ef0f866a2;hp=c8240331ea463a27954a1643276ac289a89f8e3d;hpb=90a9008bb919362632d3b262c9111cb41a7ba384;p=iec.git

diff --git a/scripts/setup-cni.sh b/scripts/setup-cni.sh
index c824033..643f157 100755
--- a/scripts/setup-cni.sh
+++ b/scripts/setup-cni.sh
@@ -3,23 +3,27 @@ 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
   ETCD_YAML=etcd-arm64.yaml
 else
   ETCD_YAML=etcd-amd64.yaml
-if
+fi
 
-sed -i "s/10.96.232.136/${CLUSTER_IP}/" "cni/calico/${ETCD_YAML}"
-kubectl apply -f "cni/calico/${ETCD_YAML}"
+SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
+
+sed -i "s/10.96.232.136/${CLUSTER_IP}/" "${SCRIPTS_DIR}/cni/calico/${ETCD_YAML}"
+kubectl apply -f "${SCRIPTS_DIR}/cni/calico/${ETCD_YAML}"
 
 # Install the RBAC Roles required for Calico
-kubectl apply -f "cni/calico/rbac.yaml"
+kubectl apply -f "${SCRIPTS_DIR}/cni/calico/rbac.yaml"
 
 # Install Calico to system
-sed -i "s/10.96.232.136/${CLUSTER_IP}/" cni/calico/calico.yaml
-kubectl apply -f 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
 kubectl taint nodes --all node-role.kubernetes.io/master- || true