From 6b56a905a6226f1062f158131fc4ccf19d8ebe11 Mon Sep 17 00:00:00 2001
From: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
Date: Mon, 17 May 2021 18:48:55 -0700
Subject: [PATCH] Update CNIs

Canal: v3.18
Cilium: v1.9
Flannel: 0.14.0-rc1

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
---
 .../0-canal/overlays/v3.18/kustomization.yaml        |  2 ++
 clr-k8s-examples/0-cilium/overlays/v1.9/values.yaml  |  5 +++++
 .../overlays/v0.14.0-rc1/kustomization.yaml          |  2 ++
 clr-k8s-examples/create_stack.sh                     | 12 ++++++++----
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 clr-k8s-examples/0-canal/overlays/v3.18/kustomization.yaml
 create mode 100644 clr-k8s-examples/0-cilium/overlays/v1.9/values.yaml
 create mode 100644 clr-k8s-examples/0-flannel/overlays/v0.14.0-rc1/kustomization.yaml

diff --git a/clr-k8s-examples/0-canal/overlays/v3.18/kustomization.yaml b/clr-k8s-examples/0-canal/overlays/v3.18/kustomization.yaml
new file mode 100644
index 0000000..efe89d2
--- /dev/null
+++ b/clr-k8s-examples/0-canal/overlays/v3.18/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - canal/canal.yaml
diff --git a/clr-k8s-examples/0-cilium/overlays/v1.9/values.yaml b/clr-k8s-examples/0-cilium/overlays/v1.9/values.yaml
new file mode 100644
index 0000000..fa96ec3
--- /dev/null
+++ b/clr-k8s-examples/0-cilium/overlays/v1.9/values.yaml
@@ -0,0 +1,5 @@
+ipam:
+  mode: "cluster-pool"
+  operator:
+    clusterPoolIPv4PodCIDR: "10.244.0.0/16"
+    clusterPoolIPv4MaskSize: 24
diff --git a/clr-k8s-examples/0-flannel/overlays/v0.14.0-rc1/kustomization.yaml b/clr-k8s-examples/0-flannel/overlays/v0.14.0-rc1/kustomization.yaml
new file mode 100644
index 0000000..682baa2
--- /dev/null
+++ b/clr-k8s-examples/0-flannel/overlays/v0.14.0-rc1/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+        - flannel/Documentation/kube-flannel.yml
diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh
index 095c84c..197b9f5 100755
--- a/clr-k8s-examples/create_stack.sh
+++ b/clr-k8s-examples/create_stack.sh
@@ -18,9 +18,10 @@ LOAD_BALANCER_IP=${LOAD_BALANCER_IP:-""}
 LOAD_BALANCER_PORT="${LOAD_BALANCER_PORT:-6444}"
 
 # versions
-CANAL_VER="${CLRK8S_CANAL_VER:-v3.10}"
-CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.6.4}"
-FLANNEL_VER="${CLRK8S_FLANNEL_VER:-960b3243b9a7faccdfe7b3c09097105e68030ea7}"
+CANAL_VER="${CLRK8S_CANAL_VER:-v3.18}"
+CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.9}"
+FLANNEL_VER="${CLRK8S_FLANNEL_VER:-v0.14.0-rc1}"
+CILIUM_VAL_OVERRIDE=""
 K8S_VER="${CLRK8S_K8S_VER:-}"
 KATA_VER="${CLRK8S_KATA_VER:-1.9.1-kernel-config}"
 ROOK_VER="${CLRK8S_ROOK_VER:-v1.2.6}"
@@ -167,7 +168,10 @@ function cni() {
 
 		get_repo "${CILIUM_URL}" "${CILIUM_DIR}/overlays/${CILIUM_VER}"
 		set_repo_version "${CILIUM_VER}" "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/"
-		helm template "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/install/kubernetes/cilium" --namespace kube-system --set global.containerRuntime.integration="$RUNNER" | kubectl apply -f -
+		if [ -f "${CILIUM_DIR}/overlays/${CILIUM_VER}/values.yaml" ]; then
+			CILIUM_VAL_OVERRIDE="--values ${CILIUM_DIR}/overlays/${CILIUM_VER}/values.yaml"
+		fi
+		helm template "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/install/kubernetes/cilium" ${CILIUM_VAL_OVERRIDE} --namespace kube-system --set global.containerRuntime.integration="$RUNNER" | kubectl apply -f -
 		;;
 	*)
 		echo"Unknown cni $CNI"