Code Review
/
iec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor SEBA install.sh
[iec.git]
/
src
/
foundation
/
scripts
/
setup-cni.sh
diff --git
a/src/foundation/scripts/setup-cni.sh
b/src/foundation/scripts/setup-cni.sh
index
1e16d97
..
f0689de
100755
(executable)
--- a/
src/foundation/scripts/setup-cni.sh
+++ b/
src/foundation/scripts/setup-cni.sh
@@
-1,4
+1,5
@@
#!/bin/bash
#!/bin/bash
+# shellcheck disable=SC1073,SC1072,SC1039,SC2059,SC2046
set -o xtrace
set -e
set -o xtrace
set -e
@@
-10,9
+11,9
@@
fi
CNI_TYPE=${1:-calico}
POD_NETWORK_CIDR=${2:-192.168.0.0/16}
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]}")
DEV_NAME=${6:-}
SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
@@
-107,12
+108,19
@@
install_danm(){
install_flannel
}
install_flannel
}
+
install_cilium(){
${SCRIPTS_DIR}/cni/cilium/cilium_install.sh
# Deploying cilium CNI
kubectl create -f ${SCRIPTS_DIR}/cni/cilium/quick-install.yaml
}
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 ..."
case ${CNI_TYPE} in
'calico')
echo "Install calico ..."
@@
-152,5
+160,3
@@
case ${CNI_TYPE} in
;;
esac
;;
esac
-# Remove the taints on master node
-kubectl taint nodes --all node-role.kubernetes.io/master- || true