Merge pull request #753 from ccamacho/tkflow

fix: fix cri-o cbr0 interface file path
Kubeinit · Jul 13, 2023 · 9bf94c0 · 9bf94c0
2 parents bae68a5 + b9a56f8
commit 9bf94c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/ci/container_sync.sh b/ci/container_sync.sh
@@ -58,6 +58,7 @@ declare -a container_images=(
     "flannel flannel-cni-plugin v1.1.2"
     "flannel flannel v0.21.4"
     "flannel flannel v0.21.5"
+    "flannel flannel v0.22.0"
 )
 
 retry() {

diff --git a/kubeinit/roles/kubeinit_k8s/defaults/main.yml b/kubeinit/roles/kubeinit_k8s/defaults/main.yml
@@ -33,7 +33,7 @@ kubeinit_k8s_kubernetes_version_full: "1.26.3"
 kubeinit_k8s_container_runtime: "cri-o"
 # kubeinit_k8s_container_runtime: "containerd"
 
-kubeinit_k8s_flannel_version: "0.21.5"
+kubeinit_k8s_flannel_version: "0.22.0"
 kubeinit_k8s_flannel_cni_plugin_version: "1.1.2"
 kubeinit_k8s_flannel_cni_version: "0.3.1"
 

diff --git a/kubeinit/roles/kubeinit_k8s/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_k8s/tasks/post_configure_guest.yml
@@ -48,7 +48,7 @@
         # Make sure crio binary is reachable
         ln -s /usr/bin/crio /usr/local/bin/crio
         tmp=$(mktemp)
-        jq '.ipam.ranges[0][0].subnet = "{{ kubeinit_k8s_pod_network }}/{{ kubeinit_k8s_pod_subnet_len }}"' /etc/cni/net.d/87-crio-bridge.conf > "$tmp" && mv -f "$tmp" /etc/cni/net.d/87-crio-bridge.conf
+        jq '.ipam.ranges[0][0].subnet = "{{ kubeinit_k8s_pod_network }}/{{ kubeinit_k8s_pod_subnet_len }}"' /etc/cni/net.d/87-crio-bridge.conflist > "$tmp" && mv -f "$tmp" /etc/cni/net.d/87-crio-bridge.conflist
         # jq '.type = "flannel"' /etc/cni/net.d/87-crio-bridge.conf > "$tmp" && mv -f "$tmp" /etc/cni/net.d/87-crio-bridge.conf
         # rm -rf /etc/cni/net.d/87-crio-bridge.conf
         # echo '{"name": "crio","type": "flannel"}' > /etc/cni/net.d/10-crio.conf

diff --git a/kubeinit/roles/kubeinit_k8s/templates/kube-flannel.yml.j2 b/kubeinit/roles/kubeinit_k8s/templates/kube-flannel.yml.j2
@@ -141,9 +141,9 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-       #image: docker.io/flannel/flannel-cni-plugin:v{{ kubeinit_k8s_flannel_cni_plugin_version }}
-        image: quay.io/kubeinit/flannel-cni-plugin:v{{ kubeinit_k8s_flannel_cni_plugin_version }} 
-       #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v{{ kubeinit_k8s_flannel_cni_plugin_version }}
+       #image: docker.io/flannel/flannel-cni-plugin:v1.1.2
+       #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
+       image: quay.io/kubeinit/flannel-cni-plugin:v{{ kubeinit_k8s_flannel_cni_plugin_version }}
         command:
         - cp
         args:
@@ -154,9 +154,9 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-       #image: docker.io/flannel/flannel:v{{ kubeinit_k8s_flannel_version }}
+       #image: docker.io/flannel/flannel:v0.22.0
+       #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
         image: quay.io/kubeinit/flannel:v{{ kubeinit_k8s_flannel_version }}
-       #image: docker.io/rancher/mirrored-flannelcni-flannel:v{{ kubeinit_k8s_flannel_version }}
         command:
         - cp
         args:
@@ -170,9 +170,9 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-       #image: docker.io/flannel/flannel:v{{ kubeinit_k8s_flannel_version }}
+       #image: docker.io/flannel/flannel:v0.22.0
+       #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
         image: quay.io/kubeinit/flannel:v{{ kubeinit_k8s_flannel_version }}
-       #image: docker.io/rancher/mirrored-flannelcni-flannel:v{{ kubeinit_k8s_flannel_version }}
         command:
         - /opt/bin/flanneld
         args: