From 674ab84d0d7209fb561af7a35910412a4ddd909a Mon Sep 17 00:00:00 2001
From: Syed Ahsan <ahsanmohsin04@yahoo.com>
Date: Thu, 24 Oct 2019 18:05:44 -0700
Subject: [PATCH] Adding Flannel to CNI (#239)

This patch add's Flannel to CNI, export the environment variable
to use Flannel, and uses crio as default unless the user
specify otherwise.

Signed-Off: Syed Ahsan <syed.ahsan.shamim.zaidi@intel.com>
---
 .../kustomization.yaml                                 |  2 ++
 clr-k8s-examples/create_stack.sh                       | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 clr-k8s-examples/0-flannel/overlays/16b0fe66285d1ad1f42b154ab852682f6fafb1a7/kustomization.yaml

diff --git a/clr-k8s-examples/0-flannel/overlays/16b0fe66285d1ad1f42b154ab852682f6fafb1a7/kustomization.yaml b/clr-k8s-examples/0-flannel/overlays/16b0fe66285d1ad1f42b154ab852682f6fafb1a7/kustomization.yaml
new file mode 100644
index 0000000..682baa2
--- /dev/null
+++ b/clr-k8s-examples/0-flannel/overlays/16b0fe66285d1ad1f42b154ab852682f6fafb1a7/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 3287547..79baf12 100755
--- a/clr-k8s-examples/create_stack.sh
+++ b/clr-k8s-examples/create_stack.sh
@@ -18,6 +18,7 @@ HIGH_POD_COUNT=${HIGH_POD_COUNT:-""}
 # versions
 CANAL_VER="${CLRK8S_CANAL_VER:-v3.9}"
 CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.6}"
+FLANNEL_VER="${CLRK8S_FLANNEL_VER:-16b0fe66285d1ad1f42b154ab852682f6fafb1a7}"
 K8S_VER="${CLRK8S_K8S_VER:-}"
 ROOK_VER="${CLRK8S_ROOK_VER:-v1.1.1}"
 METRICS_VER="${CLRK8S_METRICS_VER:-v0.3.5}"
@@ -133,6 +134,15 @@ function cni() {
 		# canal doesnt pass kustomize validation
 		kubectl apply -k "${CANAL_DIR}/overlays/${CANAL_VER}" --validate=false
 		;;
+	flannel)
+		FLANNEL_VER=${1:-$FLANNEL_VER}
+		FLANNEL_URL="https://github.com/coreos/flannel"
+		FLANNEL_DIR="0-flannel"
+		
+		get_repo "${FLANNEL_URL}" "${FLANNEL_DIR}/overlays/${FLANNEL_VER}"
+        	set_repo_version "${FLANNEL_VER}" "${FLANNEL_DIR}/overlays/${FLANNEL_VER}/flannel"
+        	kubectl apply -k "${FLANNEL_DIR}/overlays/${FLANNEL_VER}"
+		;;
 	cilium)
 		CILIUM_VER=${1:-$CILIUM_VER}
 		CILIUM_URL="https://github.com/cilium/cilium.git"