X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fsetup-cni.sh;h=76af5d9c8e07ee71f4ddc492cb43c164e723827a;hb=55fbf4451a30337c7db112433126c07c091dbc07;hp=70b97679099928a217fdac244b543d11963238ee;hpb=ae05e0e18ddc318e0a420157da288001d6b3e734;p=iec.git

diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh
index 70b9767..76af5d9 100755
--- a/src/foundation/scripts/setup-cni.sh
+++ b/src/foundation/scripts/setup-cni.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC1073,SC1072,SC1039,SC2059,SC2046
 set -o xtrace
 set -e
 
@@ -10,27 +11,39 @@ fi
 
 CNI_TYPE=${1:-calico}
 POD_NETWORK_CIDR=${2:-192.168.0.0/16}
-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}
+K8S_MASTER_IP=${3:-10.169.41.173}
+SERVICE_CIDR=${4:-172.16.1.0/24}
+CLUSTER_IP=${5:-172.16.1.136} # Align with the value in our K8s setup script
 DEV_NAME=${6:-}
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
 
 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}"
+  #If k8s version is greater than 1.15, then uses new Calico install
 
-  # Install the RBAC Roles required for Calico
-  kubectl apply -f "${SCRIPTS_DIR}/cni/calico/rbac.yaml"
+  kube_version=$(kubectl version |grep "Client" | cut -f 5 -d : | cut -f 1 -d ,)
+  echo "Install Calico for K8s version: "$kube_version
+  if [[ $kube_version > "v1.15.0" ]]; then
+    sed -i "s@192.168.0.0/16@${POD_NETWORK_CIDR}@" \
+      "${SCRIPTS_DIR}/cni/calico/k8s-new/calico-multi-arch.yaml"
+    kubectl create -f "${SCRIPTS_DIR}/cni/calico/k8s-new/calico-multi-arch.yaml"
+  else
+    # 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"
+  fi
 
-  # 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(){
@@ -51,21 +64,25 @@ install_contivpp(){
 install_ovn_kubernetes(){
   # Update the ovn-kubernetes yaml files
 
-  net_cidr_repl="{{ net_cidr | default('10.128.0.0/14/23') }}"
-  svc_cidr_repl="{{ svc_cidr | default('172.30.0.0/16') }}"
-  k8s_apiserver_repl="{{ k8s_apiserver.stdout }}"
+  net_cidr_repl="{{ net_cidr }}"
+  svc_cidr_repl="{{ svc_cidr }}"
+  k8s_apiserver_repl="{{ k8s_apiserver }}"
+  mtu_repl="{{ mtu_value }}"
 
   k8s_apiserver="https://${K8S_MASTER_IP}:6443"
   net_cidr="${POD_NETWORK_CIDR}"
   svc_cidr="${SERVICE_CIDR}"
+  mtu_def_value=1400
 
   echo "net_cidr: ${net_cidr}"
   echo "svc_cidr: ${svc_cidr}"
   echo "k8s_apiserver: ${k8s_apiserver}"
+  echo "mtu: ${mtu_def_value}"
 
   sed "s,${net_cidr_repl},${net_cidr},
   s,${svc_cidr_repl},${svc_cidr},
-  s,${k8s_apiserver_repl},${k8s_apiserver}," \
+  s,${k8s_apiserver_repl},${k8s_apiserver},
+  s,${mtu_repl},${mtu_def_value}," \
   ${SCRIPTS_DIR}/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 > \
   ${SCRIPTS_DIR}/cni/ovn-kubernetes/yaml/ovn-setup.yaml
 
@@ -84,6 +101,16 @@ install_multus_sriov_flannel(){
 
 }
 
+install_multus_sriov_calico(){
+
+  sed -i "s@10.244.0.0/16@${POD_NETWORK_CIDR}@" \
+    "${SCRIPTS_DIR}/cni/multus/multus-sriov-calico/calico-daemonset.yaml"
+  # Install Multus Calico+SRIOV by yaml files
+  # shellcheck source=/dev/null
+  source ${SCRIPTS_DIR}/cni/multus/multus-sriov-calico/install.sh
+
+}
+
 install_danm(){
   ${SCRIPTS_DIR}/cni/danm/danm_install.sh
 
@@ -97,12 +124,19 @@ install_danm(){
   install_flannel
 }
 
+
 install_cilium(){
   ${SCRIPTS_DIR}/cni/cilium/cilium_install.sh
 
   # Deploying cilium CNI
   kubectl create -f ${SCRIPTS_DIR}/cni/cilium/quick-install.yaml
 }
+
+# Remove the taints on master node
+# Taint master before installing the CNI for the case that there is
+# only one master node
+kubectl taint nodes --all node-role.kubernetes.io/master- || true
+
 case ${CNI_TYPE} in
  'calico')
         echo "Install calico ..."
@@ -124,6 +158,10 @@ case ${CNI_TYPE} in
         echo "Install Flannel with SRIOV CNI by Multus-CNI ..."
         install_multus_sriov_flannel
         ;;
+ 'multus-calico-sriov')
+        echo "Install Calico with SRIOV CNI by Multus-CNI ..."
+        install_multus_sriov_calico
+        ;;
  'danm')
         echo "Install danm ..."
         install_danm
@@ -138,5 +176,3 @@ case ${CNI_TYPE} in
         ;;
 esac
 
-# Remove the taints on master node
-kubectl taint nodes --all node-role.kubernetes.io/master- || true