From 648bed52b87351497bbe0bdea69e382974dc3252 Mon Sep 17 00:00:00 2001 From: PannagaRamamanohara Date: Tue, 21 May 2024 16:06:03 -0400 Subject: [PATCH] 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 --- contrib/cni/10-crio-bridge.conflist | 42 +++++++++++++---------------- contrib/cni/README.md | 2 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/contrib/cni/10-crio-bridge.conflist b/contrib/cni/10-crio-bridge.conflist index 02702a588ae..10fa70324dc 100644 --- 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" }] + ] + } +} \ No newline at end of file diff --git a/contrib/cni/README.md b/contrib/cni/README.md index 75f4bf56fb6..15fcf41191c 100644 --- 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: