From 27d617a4c94bd7d6e2a5dcdfa5d332aac91f488c Mon Sep 17 00:00:00 2001 From: adrianc Date: Mon, 3 Jun 2024 13:30:04 +0300 Subject: [PATCH] Update ovs cni plugin to support cni version 1.0.0 Signed-off-by: adrianc --- cmd/mirror-consumer/main.go | 2 +- cmd/mirror-producer/main.go | 2 +- cmd/plugin/main.go | 2 +- tests/mirror_test.go | 3 ++- tests/ovs_test.go | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/mirror-consumer/main.go b/cmd/mirror-consumer/main.go index 3edd4918b..edf8ffdf5 100644 --- 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 index 7a52c3ab9..f6a7e3eff 100644 --- 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 index 50c9efd91..fa8b69d67 100644 --- 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 index 2fa2e20a1..ee30ddf59 100644 --- 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 index f1889fa09..cbce3aebe 100644 --- 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() {