From fef4e4e012b6d2a9285407af838ba7a7fad3011b Mon Sep 17 00:00:00 2001 From: scydas Date: Wed, 19 Jun 2024 00:48:05 +0800 Subject: [PATCH] update cni to 1.2.0 (#8839) Signed-off-by: scyda --- cni-plugin/pkg/ipamplugin/ipam_plugin.go | 8 +++++++- cni-plugin/pkg/plugin/plugin.go | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cni-plugin/pkg/ipamplugin/ipam_plugin.go b/cni-plugin/pkg/ipamplugin/ipam_plugin.go index e22bcaf438d..21002f70bf1 100644 --- 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 index 5a7451ef8c7..b4061c674c6 100644 --- 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) }