cni-install: bump to v0.4.0, switch to ConfList

squeed · aanm · commit fa5b1fc1275d · 2022-09-01T15:47:40.000+02:00
CNI v0.4.0 introduces CHECK, which we support.
CNI v1.0.0 no longer supports single-plugin configs, so let's switch to
the list now.

Signed-off-by: Casey Callendrello &lt;cdc@isovalent.com&gt;
diff --git a/plugins/cilium-cni/cni-install.sh b/plugins/cilium-cni/cni-install.sh
@@ -18,7 +18,7 @@ case "$CILIUM_CNI_CHAINING_MODE" in
 	CNI_CONF_NAME=${CNI_CONF_NAME:-05-cilium.conflist}
 	;;
 *)
-	CNI_CONF_NAME=${CNI_CONF_NAME:-05-cilium.conf}
+	CNI_CONF_NAME=${CNI_CONF_NAME:-05-cilium.conflist}
 	;;
 esac
 
@@ -142,7 +142,7 @@ case "$CILIUM_CNI_CHAINING_MODE" in
 "flannel")
 	cat > "${CNI_CONF_NAME}" <<EOF
 {
-  "cniVersion": "0.3.1",
+  "cniVersion": "0.4.0",
   "name": "flannel",
   "plugins": [
     {
@@ -172,7 +172,7 @@ EOF
 "portmap")
 	cat > "${CNI_CONF_NAME}" <<EOF
 {
-  "cniVersion": "0.3.1",
+  "cniVersion": "0.4.0",
   "name": "portmap",
   "plugins": [
     {
@@ -198,7 +198,7 @@ EOF
   else
     cat > "${CNI_CONF_NAME}" <<EOF
 {
-  "cniVersion": "0.3.1",
+  "cniVersion": "0.4.0",
   "name": "aws-cni",
   "plugins": [
     {
@@ -229,11 +229,15 @@ EOF
 *)
 	cat > "${CNI_CONF_NAME}" <<EOF
 {
-  "cniVersion": "0.3.1",
+  "cniVersion": "0.4.0",
   "name": "cilium",
-  "type": "cilium-cni",
-  "enable-debug": ${ENABLE_DEBUG},
-  "log-file": "${LOG_FILE}"
+  "plugins": [
+    {
+      "type": "cilium-cni",
+      "enable-debug": ${ENABLE_DEBUG},
+      "log-file": "${LOG_FILE}"
+    }
+  ]
 }
 EOF
 	;;
