Remove the pod reference in v1beta1 AddressGroup #1586
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -157,27 +157,43 @@ func TestDifferentNamedPorts(t *testing.T) { | |
| t.Fatalf("Error when setting up test: %v", err) | ||
| } | ||
| defer teardownTest(t, data) | ||
| checkFn, cleanupFn := data.setupDifferentNamedPorts(t) | ||
| defer cleanupFn() | ||
| checkFn() | ||
| } | ||
|
|
||
| func (data *TestData) setupDifferentNamedPorts(t *testing.T) (checkFn func(), cleanupFn func()) { | ||
| var success bool | ||
| var cleanupFuncs []func() | ||
| cleanupFn = func() { | ||
| for i := len(cleanupFuncs) - 1; i >= 0; i-- { | ||
| cleanupFuncs[i]() | ||
| } | ||
| } | ||
| // Call cleanupFn only if the function fails. In case of success, we will call cleanupFn in callers. | ||
| defer func() { | ||
| if !success { | ||
| cleanupFn() | ||
| } | ||
| }() | ||
|
|
||
| server0Port := 80 | ||
| server0Name, server0IPs, cleanupFunc := createAndWaitForPod(t, data, func(name string, nodeName string) error { | ||
| return data.createServerPod(name, "http", server0Port, false) | ||
| }, "test-server-", "") | ||
| cleanupFuncs = append(cleanupFuncs, cleanupFunc) | ||
|
|
||
| server1Port := 8080 | ||
| server1Name, server1IPs, cleanupFunc := createAndWaitForPod(t, data, func(name string, nodeName string) error { | ||
| return data.createServerPod(name, "http", server1Port, false) | ||
| }, "test-server-", "") | ||
| cleanupFuncs = append(cleanupFuncs, cleanupFunc) | ||
|
|
||
| client0Name, _, cleanupFunc := createAndWaitForPod(t, data, data.createBusyboxPodOnNode, "test-client-", "") | ||
| cleanupFuncs = append(cleanupFuncs, cleanupFunc) | ||
|
|
||
| client1Name, _, cleanupFunc := createAndWaitForPod(t, data, data.createBusyboxPodOnNode, "test-client-", "") | ||
| cleanupFuncs = append(cleanupFuncs, cleanupFunc) | ||
|
|
||
| preCheckFunc := func(server0IP, server1IP string) { | ||
| // Both clients can connect to both servers. | ||
|
|
@@ -201,8 +217,14 @@ func (data *TestData) testDifferentNamedPorts(t *testing.T) { | |
|
|
||
| // Create NetworkPolicy rule. | ||
| spec := &networkingv1.NetworkPolicySpec{ | ||
| // Apply to two server Pods. | ||
| PodSelector: metav1.LabelSelector{MatchExpressions: []metav1.LabelSelectorRequirement{ | ||
| { | ||
| Key: "antrea-e2e", | ||
| Operator: metav1.LabelSelectorOpIn, | ||
| Values: []string{server0Name, server1Name}, | ||
| }, | ||
| }}, | ||
| // Allow client0 to access named port: "http". | ||
| Ingress: []networkingv1.NetworkPolicyIngressRule{{ | ||
| Ports: []networkingv1.NetworkPolicyPort{{ | ||
|
|
@@ -217,15 +239,16 @@ func (data *TestData) testDifferentNamedPorts(t *testing.T) { | |
| }, | ||
| }}, | ||
| } | ||
| np, err := data.createNetworkPolicy(randName("test-networkpolicy-allow-client0-to-http"), spec) | ||
| if err != nil { | ||
| t.Fatalf("Error when creating network policy: %v", err) | ||
| } | ||
| cleanupFuncs = append(cleanupFuncs, func() { | ||
| if err = data.deleteNetworkpolicy(np); err != nil { | ||
| t.Fatalf("Error when deleting network policy: %v", err) | ||
| } | ||
| }) | ||
| time.Sleep(networkPolicyDelay) | ||
|
There was a problem hiding this comment. Not sure if it's changing the podSelector to "MatchExpressions" caused the networkpolicy takes a little more time to realize. The test now has a chance to fail without the sleep, I can confirm it's not because of the conversion function change as it also failed when I just changed the test code in this PR: https://github.com/vmware-tanzu/antrea/runs/1431829031?check_suite_focus=true |
||
|
|
||
| npCheck := func(server0IP, server1IP string) { | ||
| // client0 can connect to both servers. | ||
|
|
@@ -244,15 +267,18 @@ func (data *TestData) testDifferentNamedPorts(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| checkFn = func() { | ||
| // NetworkPolicy check. | ||
| if clusterInfo.podV4NetworkCIDR != "" { | ||
| npCheck(server0IPs.ipv4.String(), server1IPs.ipv4.String()) | ||
| } | ||
|
|
||
| if clusterInfo.podV6NetworkCIDR != "" { | ||
| npCheck(server0IPs.ipv6.String(), server1IPs.ipv6.String()) | ||
| } | ||
| } | ||
| success = true | ||
| return | ||
| } | ||
|
|
||
| func TestDefaultDenyEgressPolicy(t *testing.T) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW, is there any advantage to having conversion functions for non resources registered to the schema? I understand why
Convert_controlplane_AddressGroup_To_v1beta1_AddressGroupneeds to be registered, but it seems conversion functions for non resources will only be called indirectly by other conversion functions. Is it for auto-generated conversion functions?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question, I wondered this as well, haven't found answer so blindly followed what K8s code does.
I can take a look what it would affect later and see if we could remove them. Created #1616 to track it.