update cni to 1.2.0 (projectcalico#8839)

Signed-off-by: scyda <scyda@outlook.com>
coutinhop · Jul 18, 2024 · fef4e4e · fef4e4e
1 parent 95d5f47
commit fef4e4e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/cni-plugin/pkg/ipamplugin/ipam_plugin.go b/cni-plugin/pkg/ipamplugin/ipam_plugin.go
@@ -110,7 +110,13 @@ func Main(version string) {
  os.Exit(0)
  }
 
- skel.PluginMain(cmdAdd, nil, cmdDel,
+ funcs := skel.CNIFuncs{
+ Add: cmdAdd,
+ Check: nil,
+ Del: cmdDel,
+ }
+
+ skel.PluginMainFuncs(funcs,
  cniSpecVersion.PluginSupports("0.1.0", "0.2.0", "0.3.0", "0.3.1", "0.4.0", "1.0.0"),
  "Calico CNI IPAM "+version)
 }

diff --git a/cni-plugin/pkg/plugin/plugin.go b/cni-plugin/pkg/plugin/plugin.go
@@ -753,7 +753,12 @@ func Main(version string) {
  os.Exit(1)
  }
 
- skel.PluginMain(cmdAdd, cmdDummyCheck, cmdDel,
+ funcs := skel.CNIFuncs{
+ Add: cmdAdd,
+ Del: cmdDel,
+ Check: cmdDummyCheck,
+ }
+ skel.PluginMainFuncs(funcs,
  cniSpecVersion.PluginSupports("0.1.0", "0.2.0", "0.3.0", "0.3.1", "0.4.0", "1.0.0"),
  "Calico CNI plugin "+version)
 }