Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ovs cni plugin to support cni version 1.0.0 #313

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Update ovs cni plugin to support cni version 1.0.0 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mirror-consumer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion cmd/mirror-producer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion cmd/plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
3 changes: 2 additions & 1 deletion tests/mirror_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDE kept removing these spaces around "*" LMK if you prefer i edit the file in vim or smthn and remove this change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as it passes the CI it's all right


clusterApi.CreatePrivilegedPodWithIP(podProd1Name, nadProducerName, bridgeName, cidrPodProd1, "")
clusterApi.CreatePrivilegedPodWithIP(podProd2Name, nadProducerName, bridgeName, cidrPodProd2, "")
Expand Down
1 change: 1 addition & 0 deletions tests/ovs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading