Fix "config is \"1.0.0\", plugin supports [\"0.4.0\"]"

Some plugins could not be executed with `cniVersion: "1.0.0"` JSON because `version.Current()` was not included in `version.PluginSupports()` checks. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
containernetworking · Aug 12, 2021 · 3cdb6d2 · 3cdb6d2
1 parent 8632ace
commit 3cdb6d2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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.PluginSupports("0.1.0", "0.2.0", "0.3.0", version.Current()), 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
@@ -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.PluginSupports("0.1.0", "0.2.0", "0.3.0", version.Current()), bv.BuildString("win-overlay"))
 }
diff --git 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.PluginSupports("0.4.0", version.Current()), bv.BuildString("firewall"))
 }
 
 func cmdCheck(args *skel.CmdArgs) error {

diff --git 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.PluginSupports("0.3.1", "0.4.0", version.Current()), bv.BuildString("vrf"))
 }
 
 func cmdAdd(args *skel.CmdArgs) error {