contrib/cni/*: Change CNI config to latest spec

Changes in the CNI specification have been leading to issues with older configuration file formats. Previously used fields or structures are causing parsing errors like missing 'type' errors in configurations. Checking out main brain than a particular release version to ensure latest plugin build. Signed-off-by: PannagaRamamanohara <pbhojara@redhat.com>
cri-o · May 21, 2024 · 648bed5 · 648bed5
1 parent e90afe2
commit 648bed5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/contrib/cni/10-crio-bridge.conflist b/contrib/cni/10-crio-bridge.conflist
@@ -1,24 +1,20 @@
 {
-  "cniVersion": "1.0.0",
-  "name": "crio",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "cni0",
-      "isGateway": true,
-      "ipMasq": true,
-      "hairpinMode": true,
-      "ipam": {
-        "type": "host-local",
-        "routes": [
-            { "dst": "0.0.0.0/0" },
-            { "dst": "::/0" }
-        ],
-        "ranges": [
-            [{ "subnet": "10.85.0.0/16" }],
-            [{ "subnet": "1100:200::/24" }]
-        ]
-      }
-    }
-  ]
-}
+	"cniVersion": "1.0.0",
+	"name": "crio-bridge",
+	"type": "bridge",
+	"bridge": "cni0",
+	"isGateway": true,
+	"ipMasq": true,
+  	"hairpinMode": true,
+	"ipam": {
+		"type": "host-local",
+		"routes": [
+			{ "dst": "0.0.0.0/0" },
+      { "dst": "::/0" }
+		],
+    "ranges": [
+      [{ "subnet": "10.85.0.0/16" }],
+      [{ "subnet": "1100:200::/24" }]
+    ]
+	}
+}
diff --git a/contrib/cni/README.md b/contrib/cni/README.md
@@ -63,7 +63,7 @@ Download the `CNI` plugins source tree:
 ```bash
 git clone https://github.com/containernetworking/plugins
 cd plugins
-git checkout v1.1.1
+git checkout main
 ```
 
 Build the `CNI` plugins: