Update ovs cni plugin to support cni version 1.0.0 (#313)

Signed-off-by: adrianc <[email protected]>
k8snetworkplumbingwg · Jun 3, 2024 · 9c77f01 · 9c77f01
1 parent 2d464d0
commit 9c77f01
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/cmd/mirror-consumer/main.go b/cmd/mirror-consumer/main.go
@@ -24,5 +24,5 @@ import (
 
 // mirror-consumer
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.PluginSupports("0.3.0", "0.3.1", "0.4.0"), buildversion.BuildString("OVS mirror consumer"))
+	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS mirror consumer"))
 }
diff --git a/cmd/mirror-producer/main.go b/cmd/mirror-producer/main.go
@@ -24,5 +24,5 @@ import (
 
 // ovs-mirror-producer
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.PluginSupports("0.3.0", "0.3.1", "0.4.0"), buildversion.BuildString("OVS mirror producer"))
+	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS mirror producer"))
 }
diff --git a/cmd/plugin/main.go b/cmd/plugin/main.go
@@ -23,5 +23,5 @@ import (
 )
 
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.PluginSupports("0.3.0", "0.3.1", "0.4.0"), buildversion.BuildString("OVS bridge"))
+	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS bridge"))
 }
diff --git a/tests/mirror_test.go b/tests/mirror_test.go
@@ -28,6 +28,7 @@ import (
 var _ = Describe("ovs-mirror 0.3.0", func() { testMirrorFunc("0.3.0") })
 var _ = Describe("ovs-mirror 0.3.1", func() { testMirrorFunc("0.3.1") })
 var _ = Describe("ovs-mirror 0.4.0", func() { testMirrorFunc("0.4.0") })
+var _ = Describe("ovs-mirror 1.0.0", func() { testMirrorFunc("1.0.0") })
 
 var testMirrorFunc = func(version string) {
 	Describe("ovs traffic mirroring tests", func() {
@@ -78,7 +79,7 @@ var testMirrorFunc = func(version string) {
 						Eventually(func() error {
 							_, err := clusterApi.ReadFileFromPod(podConsName, "test", "/tcpdump.log")
 							return err
-						}, 120 * time.Second, time.Second).Should(Succeed(), "tcpdump did not start in time");
+						}, 120*time.Second, time.Second).Should(Succeed(), "tcpdump did not start in time")
 
 						clusterApi.CreatePrivilegedPodWithIP(podProd1Name, nadProducerName, bridgeName, cidrPodProd1, "")
 						clusterApi.CreatePrivilegedPodWithIP(podProd2Name, nadProducerName, bridgeName, cidrPodProd2, "")

diff --git a/tests/ovs_test.go b/tests/ovs_test.go
@@ -31,6 +31,7 @@ import (
 var _ = Describe("ovs-cni 0.3.0", func() { testFunc("0.3.0") })
 var _ = Describe("ovs-cni 0.3.1", func() { testFunc("0.3.1") })
 var _ = Describe("ovs-cni 0.4.0", func() { testFunc("0.4.0") })
+var _ = Describe("ovs-cni 1.0.0", func() { testFunc("1.0.0") })
 
 var testFunc = func(version string) {
 	Describe("pod availability tests", func() {