Revise to install the latest Calico CNI

Now the Calico CNI install will use:
1. The default route to 8.8.8.8 as the running interface for
Felix Bird
2. VXLAN as the backend instead of IPIP

Signed-off-by: trevor tao <trevor.tao@arm.com>
Change-Id: Ia6cbbf0c4a3fa71eb586ca74e409426baf047b50

diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh
index 76af5d9..75fa1f2 100755 (executable)
--- a/src/foundation/scripts/setup-cni.sh
+++ b/src/foundation/scripts/setup-cni.sh
@@ -27,7 +27,7 @@ install_calico(){
   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"
+    kubectl create -f "${SCRIPTS_DIR}/cni/calico/k8s-new/calico-3.23-install-vxlan.yaml"
   else
     # Install the Etcd Database
     ETCD_YAML=etcd.yaml