X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fsetup-cni.sh;h=f0689de462d407e2b81b90e046bd7f63aceffac1;hb=f2feb61b3cbb690e475cee8731a3e08102965cf3;hp=c29b6c0bb4789bddca2a436ae69f6c710d177742;hpb=561213b39acb3a3ced713655dec5493df715b86c;p=iec.git diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh index c29b6c0..f0689de 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,9 +11,9 @@ 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]}") @@ -107,6 +108,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 ..." @@ -136,11 +150,13 @@ case ${CNI_TYPE} in echo "Install danm ..." install_danm ;; + 'cilium') + echo "Install cilium ..." + install_cilium + ;; *) 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