From 40f958ce64fc08b5fb35aac3f05941fe4b514ec5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 8 May 2022 02:17:33 +0200
Subject: kubernetes/kubeadm: fix kubeguard network plugin

---
 roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml    |  4 ++--
 .../kubeadm/base/templates/net_kubeguard/cni.conflist.j2 | 16 ++++++++++++++++
 .../kubeadm/base/templates/net_kubeguard/cni.json.j2     | 12 ------------
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
 delete mode 100644 roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.json.j2

(limited to 'roles')

diff --git a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml
index 40cee3b7..350ecdee 100644
--- a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml
+++ b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml
@@ -87,8 +87,8 @@
 
 - name: install cni config
   template:
-    src: net_kubeguard/cni.json.j2
-    dest: /etc/cni/net.d/kubeguard.conf
+    src: net_kubeguard/cni.conflist.j2
+    dest: /etc/cni/net.d/kubeguard.conflist
 
 - name: install packages needed for debugging kube-router
   when: kubernetes_network_plugin_variant == 'with-kube-router'
diff --git a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2 b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
new file mode 100644
index 00000000..240d86ef
--- /dev/null
+++ b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
@@ -0,0 +1,16 @@
+{
+  "cniVersion": "0.3.1",
+  "name": "kubeguard",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "kubeguard-br0",
+      "isDefaultGateway": true,
+      "hairpinMode": true,
+      "ipam": {
+        "type": "host-local",
+        "subnet": "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) }}"
+      }
+    }
+  ]
+}
diff --git a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.json.j2 b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.json.j2
deleted file mode 100644
index eb9e3d61..00000000
--- a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.json.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "cniVersion": "0.3.1",
-  "name": "kubeguard",
-  "type": "bridge",
-  "bridge": "kubeguard-br0",
-  "isDefaultGateway": true,
-  "hairpinMode": true,
-  "ipam": {
-    "type": "host-local",
-    "subnet": "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) }}"
-  }
-}
-- 
cgit v1.2.3