Merge pull request #756 from ccamacho/tkflow

fix: bind flannel to crio
Kubeinit · Jul 14, 2023 · a3079d4 · a3079d4
2 parents e2e837b + 1ac9f7a
commit a3079d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/kubeinit/README.md b/kubeinit/README.md
@@ -128,7 +128,7 @@ ansible-galaxy collection install --force --force-with-deps releases/kubeinit-ku
 ansible-playbook \
     -v --user root \
     -e kubeinit_spec=okd-libvirt-3-1-1 \
-    -i ./kubeinit/inventory.yml \
+    -e hypervisor_hosts_spec='[{"ansible_host":"nyctea"},{"ansible_host":"tyto"}]' \
     ./kubeinit/playbook.yml
 ```
 

diff --git a/kubeinit/roles/kubeinit_k8s/templates/kube-flannel.yml.j2 b/kubeinit/roles/kubeinit_k8s/templates/kube-flannel.yml.j2
@@ -1,5 +1,7 @@
+#
 # From: https://raw.githubusercontent.com/flannel-io/flannel/master/Documentation/kube-flannel.yml
-
+# There is a custom config for cni-conf.json check that section before updating the template content
+#
 ---
 kind: Namespace
 apiVersion: v1
@@ -76,26 +78,16 @@ metadata:
     tier: node
     k8s-app: flannel
     app: flannel
+#
+# DO NOT EDIT: WE USE FLANNEL+CRIO SO
+# /etc/cni/net.d/10-flannel.conflist
+# IS CONFIGURED CORRECTLY
+#
 data:
   cni-conf.json: |
     {
-      "name": "cbr0",
-      "cniVersion": "{{ kubeinit_k8s_flannel_cni_version }}",
-      "plugins": [
-        {
-          "type": "flannel",
-          "delegate": {
-            "hairpinMode": true,
-            "isDefaultGateway": true
-          }
-        },
-        {
-          "type": "portmap",
-          "capabilities": {
-            "portMappings": true
-          }
-        }
-      ]
+        "name": "crio",
+        "type": "flannel"
     }
   net-conf.json: |
     {