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.

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

Promote Egress API to v1beta1 #5180

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Conversation

wenqiq
Copy link
Contributor

@wenqiq wenqiq commented Jun 27, 2023

Promote Egress API to v1beta1

@wenqiq
Copy link
Contributor Author

wenqiq commented Jun 28, 2023

Some e2e test cases failed, seems not related to this change.
--- FAIL: TestBatchCreatePods https://github.com/antrea-io/antrea/actions/runs/5396462521/jobs/9800222909
--- FAIL: TestAntreaPolicy/TestGroupDefaultDENY/Case=ACNPPriorityOverrideDefaultDeny https://github.com/antrea-io/antrea/actions/runs/5396462521/jobs/9800223145

@luolanzone luolanzone added api-review Categorizes an issue or PR as actively needing an API review. action/release-note Indicates a PR that should be included in release notes. labels Jun 28, 2023
@luolanzone luolanzone added this to the Antrea v1.13 release milestone Jul 4, 2023
build/charts/antrea/crds/egress.yaml Outdated Show resolved Hide resolved
docs/api.md Outdated Show resolved Hide resolved
docs/api.md Outdated
| `ClusterGroup` | v1alpha2 | v1.0.0 | v1.1.0 | v1.12.0 [^1] |
| `Egress` | v1alpha2 | v1.0.0 | v1.13.0 | v2.0.0 |
Copy link
Contributor

Choose a reason for hiding this comment

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

If we follow the K8s deprecation policy, we may not be able to remove it in v2.0.0 considering Egress feature gate is already beta, @antoninbas @tnqn any comment?

@luolanzone
Copy link
Contributor

@wenqiq please resolve conflicts.

@wenqiq wenqiq force-pushed the egress-api-promotion branch 4 times, most recently from 8baf969 to 75860af Compare July 20, 2023 04:03
docs/api.md Outdated Show resolved Hide resolved
docs/api.md Outdated Show resolved Hide resolved
build/charts/antrea/crds/egress.yaml Outdated Show resolved Hide resolved
Comment on lines 248 to 812
type AppliedTo struct {
// Select Pods matched by this selector. If set with NamespaceSelector,
// Pods are matched from Namespaces matched by the NamespaceSelector;
// otherwise, Pods are matched from all Namespaces.
// +optional
PodSelector *metav1.LabelSelector `json:"podSelector,omitempty"`
// Select all Pods from Namespaces matched by this selector. If set with
// PodSelector, Pods are matched from Namespaces matched by the
// NamespaceSelector.
// +optional
NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"`
// Groups is the set of ClusterGroup names.
// +optional
Groups []string `json:"groups,omitempty"`
}
Copy link
Member

Choose a reason for hiding this comment

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

This struct is shared with NetworkPolicy which contains more fields. Perhaps #5186 should be merged first as it contains the complete version of the struct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will rebase after this PR is merged.

@tnqn
Copy link
Member

tnqn commented Jul 25, 2023

NetworkPolicy API upgrade has been merged, this PR can rebase on it.

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

There are many failing checks, please check.

@@ -23,6 +23,8 @@ import (
"testing"
"time"

_ "github.com/golang/mock/mockgen/model"
Copy link
Member

Choose a reason for hiding this comment

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

why is it required?

@wenqiq
Copy link
Contributor Author

wenqiq commented Jul 25, 2023

/test-all

@wenqiq
Copy link
Contributor Author

wenqiq commented Jul 26, 2023

/test-e2e

@wenqiq
Copy link
Contributor Author

wenqiq commented Jul 26, 2023

=== RUN   TestL7NetworkPolicy/HTTP
=== RUN   TestL7NetworkPolicy/HTTP/Ingress
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-path-hostname
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-any-path
=== RUN   TestL7NetworkPolicy/HTTP/Egress
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-path-hostname
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-any-path
=== RUN   TestL7NetworkPolicy/TLS
    l7networkpolicy_test.go:122: Creating ANNP test-l7-tls-allow-sni-google
    l7networkpolicy_test.go:122: Creating ANNP test-l7-tls-allow-sni-facebook
    l7networkpolicy_test.go:174: 
        	Error Trace:	/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:174
        	            				/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:322
        	            				/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:61
        	Error:      	Received unexpected error:
        	            	command terminated with exit code 1
        	Test:       	TestL7NetworkPolicy/TLS
I0726 02:25:19.559981    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:19.638406    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-mcvwt'
I0726 02:25:19.895082    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:19.990680    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-txq6q'
I0726 02:25:20.249281    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:20.318942    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-wwj7v'
=== CONT  TestL7NetworkPolicy
    fixtures.go:317: Exporting test logs to '/home/runner/work/antrea/antrea/log/TestL7NetworkPolicy/beforeTeardown.Jul26-02-25-33'
    fixtures.go:488: Deleting 'testl7networkpolicy-fsoidztp' K8s Namespace
I0726 02:25:36.691274    8448 framework.go:737] Deleting Namespace testl7networkpolicy-fsoidztp took 8.669341ms
--- FAIL: TestL7NetworkPolicy (92.05s)
    --- PASS: TestL7NetworkPolicy/HTTP (25.83s)
        --- PASS: TestL7NetworkPolicy/HTTP/Ingress (8.87s)
        --- PASS: TestL7NetworkPolicy/HTTP/Egress (8.93s)
    --- FAIL: TestL7NetworkPolicy/TLS (30.75s)

https://github.com/antrea-io/antrea/actions/runs/5653493868/job/15345762746?pr=5180

@hongliangl
Copy link
Contributor

=== RUN   TestL7NetworkPolicy/HTTP
=== RUN   TestL7NetworkPolicy/HTTP/Ingress
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-path-hostname
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-any-path
=== RUN   TestL7NetworkPolicy/HTTP/Egress
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-path-hostname
    l7networkpolicy_test.go:122: Creating ANNP test-l7-http-allow-any-path
=== RUN   TestL7NetworkPolicy/TLS
    l7networkpolicy_test.go:122: Creating ANNP test-l7-tls-allow-sni-google
    l7networkpolicy_test.go:122: Creating ANNP test-l7-tls-allow-sni-facebook
    l7networkpolicy_test.go:174: 
        	Error Trace:	/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:174
        	            				/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:322
        	            				/home/runner/work/antrea/antrea/test/e2e/l7networkpolicy_test.go:61
        	Error:      	Received unexpected error:
        	            	command terminated with exit code 1
        	Test:       	TestL7NetworkPolicy/TLS
I0726 02:25:19.559981    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:19.638406    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-mcvwt'
I0726 02:25:19.895082    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:19.990680    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-txq6q'
I0726 02:25:20.249281    8448 framework.go:2553] Sending SIGINT to 'antrea-agent-coverage'
I0726 02:25:20.318942    8448 framework.go:2559] Copying coverage files from Pod 'antrea-agent-wwj7v'
=== CONT  TestL7NetworkPolicy
    fixtures.go:317: Exporting test logs to '/home/runner/work/antrea/antrea/log/TestL7NetworkPolicy/beforeTeardown.Jul26-02-25-33'
    fixtures.go:488: Deleting 'testl7networkpolicy-fsoidztp' K8s Namespace
I0726 02:25:36.691274    8448 framework.go:737] Deleting Namespace testl7networkpolicy-fsoidztp took 8.669341ms
--- FAIL: TestL7NetworkPolicy (92.05s)
    --- PASS: TestL7NetworkPolicy/HTTP (25.83s)
        --- PASS: TestL7NetworkPolicy/HTTP/Ingress (8.87s)
        --- PASS: TestL7NetworkPolicy/HTTP/Egress (8.93s)
    --- FAIL: TestL7NetworkPolicy/TLS (30.75s)

https://github.com/antrea-io/antrea/actions/runs/5653493868/job/15345762746?pr=5180

The failure of test is not introduced by your PR.

@tnqn
Copy link
Member

tnqn commented Jul 26, 2023

/test-all

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn tnqn merged commit 876d81b into antrea-io:main Jul 26, 2023
@wenqiq wenqiq deleted the egress-api-promotion branch July 26, 2023 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/release-note Indicates a PR that should be included in release notes. api-review Categorizes an issue or PR as actively needing an API review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants