From ba48f8a659602809a01cc3afa8c6497350f689cc Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Mon, 6 Sep 2021 17:21:13 +0200 Subject: [PATCH] plugins: fix bug where support for CNI version 0.4.0 or 1.0.0 was dropped Signed-off-by: Casey Callendrello --- plugins/main/windows/win-bridge/win-bridge_windows.go | 2 +- plugins/main/windows/win-overlay/win-overlay_windows.go | 2 +- plugins/meta/bandwidth/main.go | 2 +- plugins/meta/firewall/firewall.go | 2 +- plugins/meta/vrf/main.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/main/windows/win-bridge/win-bridge_windows.go b/plugins/main/windows/win-bridge/win-bridge_windows.go index 0e2645fc..3e6de2b4 100644 --- a/plugins/main/windows/win-bridge/win-bridge_windows.go +++ b/plugins/main/windows/win-bridge/win-bridge_windows.go @@ -215,5 +215,5 @@ func cmdCheck(_ *skel.CmdArgs) error { } func main() { - skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.PluginSupports("0.1.0", "0.2.0", "0.3.0"), bv.BuildString("win-bridge")) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("win-bridge")) } diff --git a/plugins/main/windows/win-overlay/win-overlay_windows.go b/plugins/main/windows/win-overlay/win-overlay_windows.go index 3882b9af..6c124d88 100644 --- a/plugins/main/windows/win-overlay/win-overlay_windows.go +++ b/plugins/main/windows/win-overlay/win-overlay_windows.go @@ -173,5 +173,5 @@ func cmdCheck(_ *skel.CmdArgs) error { } func main() { - skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.PluginSupports("0.1.0", "0.2.0", "0.3.0"), bv.BuildString("win-overlay")) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("win-overlay")) } diff --git a/plugins/meta/bandwidth/main.go b/plugins/meta/bandwidth/main.go index 68c64257..2e926055 100644 --- a/plugins/meta/bandwidth/main.go +++ b/plugins/meta/bandwidth/main.go @@ -246,7 +246,7 @@ func cmdDel(args *skel.CmdArgs) error { } func main() { - skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.PluginSupports("0.3.0", "0.3.1", version.Current()), bv.BuildString("bandwidth")) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.VersionsStartingFrom("0.3.0"), bv.BuildString("bandwidth")) } func SafeQdiscList(link netlink.Link) ([]netlink.Qdisc, error) { diff --git a/plugins/meta/firewall/firewall.go b/plugins/meta/firewall/firewall.go index f4d0c639..b0569866 100644 --- a/plugins/meta/firewall/firewall.go +++ b/plugins/meta/firewall/firewall.go @@ -157,7 +157,7 @@ func cmdDel(args *skel.CmdArgs) error { } func main() { - skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.PluginSupports("0.4.0"), bv.BuildString("firewall")) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.VersionsStartingFrom("0.4.0"), bv.BuildString("firewall")) } func cmdCheck(args *skel.CmdArgs) error { diff --git a/plugins/meta/vrf/main.go b/plugins/meta/vrf/main.go index 3d5a002a..0a1de8e7 100644 --- a/plugins/meta/vrf/main.go +++ b/plugins/meta/vrf/main.go @@ -40,7 +40,7 @@ type VRFNetConf struct { } func main() { - skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.PluginSupports("0.3.1", "0.4.0"), bv.BuildString("vrf")) + skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.VersionsStartingFrom("0.3.1"), bv.BuildString("vrf")) } func cmdAdd(args *skel.CmdArgs) error {