X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fsetup-cni.sh;h=d1b27bcf097485089ad13f3e20948dbf8f6a7e09;hb=69177e641b600de94225403909519923a33d3c0e;hp=643f157cbcaf724f5e2f7d79f3bea3e63c9129a0;hpb=38539411e0db414bd281be6313e080cbff7bab13;p=iec.git

diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh
index 643f157..d1b27bc 100755
--- a/src/foundation/scripts/setup-cni.sh
+++ b/src/foundation/scripts/setup-cni.sh
@@ -2,28 +2,68 @@
 set -o xtrace
 set -e
 
+if [ -f "$HOME/.bashrc" ]; then
+  # shellcheck source=/dev/null
+  source "$HOME/.bashrc"
+fi
+
+
 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
-fi
+CNI_TYPE=${3:-calico}
+DEV_NAME=${4:-}
 
 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_calico(){
+  # Install the Etcd Database
+  ETCD_YAML=etcd.yaml
+
+  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 "${SCRIPTS_DIR}/cni/calico/rbac.yaml"
+
+  # Install Calico to system
+  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"
+}
+
+install_flannel(){
+  # Install the flannel CNI
+  sed -i "s@10.244.0.0/16@${POD_NETWORK_CIDR}@" "${SCRIPTS_DIR}/cni/flannel/kube-flannel.yml"
+  kubectl apply -f "${SCRIPTS_DIR}/cni/flannel/kube-flannel.yml"
+}
+
+install_contivpp(){
+  # Update vpp config file
+  ${SCRIPTS_DIR}/cni/contivpp/contiv-update-config.sh $DEV_NAME
 
-# Install the RBAC Roles required for Calico
-kubectl apply -f "${SCRIPTS_DIR}/cni/calico/rbac.yaml"
+  # Install contivpp CNI
+  sed -i "s@10.1.0.0/16@${POD_NETWORK_CIDR}@" "${SCRIPTS_DIR}/cni/contivpp/contiv-vpp.yaml"
+  kubectl apply -f "${SCRIPTS_DIR}/cni/contivpp/contiv-vpp.yaml"
+}
 
-# Install Calico to system
-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"
+case ${CNI_TYPE} in
+ 'calico')
+        echo "Install calico ..."
+        install_calico
+        ;;
+ 'flannel')
+        echo "Install flannel ..."
+        install_flannel
+        ;;
+ 'contivpp')
+        echo "Install Contiv-VPP ..."
+        install_contivpp
+        ;;
+ *)
+        echo "${CNI_TYPE} is not supported"
+        exit 1
+        ;;
+esac
 
 # Remove the taints on master node
 kubectl taint nodes --all node-role.kubernetes.io/master- || true