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

Jump to bottom

Automated cherry pick of #4543 and #4562 #4555

Merged
merged 2 commits into from
Jan 20, 2023
Merged

Automated cherry pick of #4543 and #4562 #4555

merged 2 commits into from
Jan 20, 2023

Conversation

luolanzone
Copy link
Contributor

@luolanzone luolanzone commented Jan 13, 2023 •
edited
Loading

Cherry pick of #4543 and #4562 on release-1.10.

#4543: Update YAMLs and docs about Multi-cluster NetworkPolicy
#4562: Change ANP/ACNP toService.scope to enum

For details on the cherry pick process, see the cherry pick requests page.

@luolanzone luolanzone added the kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release label Jan 13, 2023
@luolanzone luolanzone force-pushed the automated-cherry-pick-of-#4543-upstream-release-1.10 branch from 365ac35 to 0a6629e Compare January 13, 2023 03:54
@luolanzone
Copy link
Contributor Author

@jianjuns A user is trying to follow the guide in v1.10 to try MC NP, but the scope field clusterSet we provided in the sample is incorrect, so better to back-port this as earlier as possible.

@luolanzone
Copy link
Contributor Author

/test-multicluster-e2e

@codecov
Copy link

codecov bot commented Jan 13, 2023 •
edited
Loading

Codecov Report

Merging #4555 (d510cb6) into release-1.10 (2d3afe8) will increase coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-1.10    #4555      +/-   ##
================================================
+ Coverage         68.05%   68.22%   +0.16%     
================================================
  Files               404      416      +12     
  Lines             58231    58284      +53     
================================================
+ Hits              39631    39763     +132     
+ Misses            15841    15765      -76     
+ Partials           2759     2756       -3
Flag Coverage Δ
e2e-tests 61.47% <ø> (?)
integration-tests 34.60% <ø> (+0.02%) ⬆️
kind-e2e-tests 47.23% <ø> (-0.02%) ⬇️
unit-tests 56.77% <ø> (-0.04%) ⬇️
Impacted Files Coverage Δ
...nt/apiserver/handlers/serviceexternalip/handler.go 29.62% <0.00%> (-22.23%) ⬇️
pkg/ipfix/ipfix_process.go 81.25% <0.00%> (-18.75%) ⬇️
pkg/agent/proxy/topology.go 72.72% <0.00%> (-9.10%) ⬇️
pkg/agent/consistenthash/consistenthash.go 93.75% <0.00%> (-3.75%) ⬇️
pkg/agent/cniserver/server.go 75.15% <0.00%> (-3.24%) ⬇️
pkg/agent/memberlist/cluster.go 75.92% <0.00%> (-2.47%) ⬇️
...catesigningrequest/ipsec_csr_signing_controller.go 61.65% <0.00%> (-2.46%) ⬇️
pkg/controller/ipam/antrea_ipam_controller.go 76.25% <0.00%> (-2.01%) ⬇️
.../flowexporter/connections/conntrack_connections.go 79.52% <0.00%> (-1.91%) ⬇️
pkg/ipam/ipallocator/allocator.go 88.14% <0.00%> (-1.55%) ⬇️
... and 50 more

@luolanzone luolanzone force-pushed the automated-cherry-pick-of-#4543-upstream-release-1.10 branch from 0a6629e to d42edb3 Compare January 13, 2023 05:27
@luolanzone
Copy link
Contributor Author

/test-multicluster-e2e

luolanzone
luolanzone commented Jan 17, 2023
View reviewed changes
docs/multicluster/user-guide.md
@@ -689,7 +599,7 @@ spec:
toServices:
- name: secured-service # an exported Multi-cluster Service
namespace: svcNamespace
scope: clusterSet
scope: ClusterSet
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 got an issue report from a user, seems only clusterSet works for toServices, and ClusterSet won't take any affect. I take a quick look at the code, the field is string without enum value. @GraysonWu @Dyanngg could you take a look? I believe we need another fix before we merge this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Let us change to enum and backport the fix to 1.10.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. PR #4562 opened.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The new commit has been cherry-picked in this PR. @jianjuns could you take a look again? thanks.

@luolanzone luolanzone mentioned this pull request Jan 17, 2023
Merged
@luolanzone
Copy link
Contributor Author

/test-multicluster-e2e

@luolanzone luolanzone changed the title Automated cherry pick of #4543: Update YAMLs and docs about Multi-cluster NetworkPolicy Automated cherry pick of #4543 and #4562 Jan 20, 2023
@jianjuns
Copy link
Contributor

/skip-all

@jianjuns jianjuns merged commit 7b522eb into antrea-io:release-1.10 Jan 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GraysonWu GraysonWu GraysonWu left review comments

@jianjuns jianjuns jianjuns approved these changes

@Dyanngg Dyanngg Awaiting requested review from Dyanngg

Assignees
No one assigned
Labels
kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@luolanzone @jianjuns @GraysonWu