Add a toggle for Multi-cluster Pod-to-Pod connectivity #4605

hjiajing · 2023-02-07T00:58:10Z

Add a toggle for Multi-cluster Pod-to-Pod connectivity in antrea-agent configuration. The Pod-to-Pod connectivity feature will be enabled when the toggle is set true and Pod CIDRs are provided in the Antrea Multi-cluster configuration.

codecov · 2023-02-07T01:14:14Z

Codecov Report

Merging #4605 (4b57014) into main (9df5a81) will increase coverage by 1.03%.
The diff coverage is 90.00%.

❗ Current head 4b57014 differs from pull request most recent head 7cf1a3f. Consider uploading reports for the commit 7cf1a3f to get more accurate results

@@            Coverage Diff             @@
##             main    #4605      +/-   ##
==========================================
+ Coverage   68.67%   69.70%   +1.03%     
==========================================
  Files         400      412      +12     
  Lines       59450    58332    -1118     
==========================================
- Hits        40828    40662     -166     
+ Misses      15804    14893     -911     
+ Partials     2818     2777      -41

Flag	Coverage Δ		*Carryforward flag
e2e-tests	`62.01% <ø> (+23.67%)`	⬆️
integration-tests	`34.61% <ø> (+0.08%)`	⬆️	Carriedforward from 7cf1a3f
kind-e2e-tests	`47.42% <0.00%> (+6.43%)`	⬆️	Carriedforward from 7cf1a3f
unit-tests	`59.74% <90.00%> (-0.03%)`	⬇️	Carriedforward from 7cf1a3f

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files	Coverage Δ
cmd/antrea-agent/agent.go	`0.00% <0.00%> (ø)`
pkg/agent/util/net.go	`58.17% <ø> (+10.06%)`	⬆️
pkg/apiserver/handlers/webhook/convert_crd.go	`3.97% <ø> (+0.05%)`	⬆️
pkg/ovs/ovsconfig/default_windows.go	`100.00% <ø> (ø)`
pkg/ovs/ovsconfig/ovs_client.go	`64.64% <ø> (-2.07%)`	⬇️
pkg/ovs/ovsctl/ovsctl_others.go	`52.63% <ø> (-1.22%)`	⬇️
pkg/agent/multicluster/mc_route_controller.go	`56.31% <100.00%> (+0.75%)`	⬆️
...g/agent/apiserver/handlers/addressgroup/handler.go	`5.00% <0.00%> (-35.00%)`	⬇️
...gent/controller/noderoute/node_route_controller.go	`56.79% <0.00%> (-11.65%)`	⬇️
pkg/agent/controller/egress/egress_controller.go	`75.27% <0.00%> (-9.96%)`	⬇️
... and 93 more

luolanzone · 2023-02-07T06:45:18Z

@hjiajing please fix github check failure.

hjiajing · 2023-02-07T07:40:27Z

@luolanzone Thanks for the reminder. The Go / Verify docs and spelling failed because I didn't generate a new helm chart README.md. It works well now.

I think another PR will face the same problem, I'll fix it, too.

jianjuns · 2023-02-08T01:07:49Z

docs/multicluster/user-guide.md

-ConfigMap `antrea-mc-controller-config` of each member cluster like the example
-below. Note, **Pod CIDRs must not overlap among clusters to enable cross-cluster
+within a ClusterSet. To enable this feature, the cluster's Pod CIDRs must be set
+in ConfigMap `antrea-mc-controller-config` of each member cluster and make sure


Probably use passive voice for both to consistent: "and multicluster.enablePodToPodConnectivity must be set to true in the `antrea-agent' configuration"

Changed to passive voice.

Then we should remove "make sure" too.

docs/multicluster/user-guide.md

build/charts/antrea/README.md

pkg/agent/multicluster/mc_route_controller.go

luolanzone · 2023-02-08T08:57:56Z

docs/multicluster/user-guide.md

-below. Note, **Pod CIDRs must not overlap among clusters to enable cross-cluster
+within a ClusterSet. To enable this feature, the cluster's Pod CIDRs must be set
+in ConfigMap `antrea-mc-controller-config` of each member cluster and make sure
+that `enablePodToPodConnectivity` is set to `true` in antrea-agent ConfigMap.


Suggested change

that `enablePodToPodConnectivity` is set to `true` in antrea-agent ConfigMap.

that `enablePodToPodConnectivity` is set to `true` in ConfigMap `antrea-config`.

I suggest to use "in the antrea-agent configuration". I know we usually say ConfigMap for MC Controller configuration in this doc, but I think we usually do not say Antrea ConfigMap for agent/controller configuration in other docs. Technically, we can pass configuration to controllers/agent without a ConfigMap.

If we still want to use "ConfigMap", then we should at least say "ConfigMap in the Antrea deployment manifest" to be clear.

luolanzone · 2023-02-08T09:00:56Z

docs/multicluster/user-guide.md

+antrea-controller.conf: |
+  featureGates:
+...
+Multicluster: true
+...
+multicluster:
+  enablePodToPodConnectivity: true


The format is incorrect, please add necessary empty spaces.

Yes, I double-checked then found that once I push code, the IDE will format the Markdown file automatically with a wrong format. I enabled the feature now.

pkg/config/agent/config.go

jianjuns · 2023-02-08T17:30:06Z

docs/multicluster/user-guide.md

-ConfigMap `antrea-mc-controller-config` of each member cluster like the example
-below. Note, **Pod CIDRs must not overlap among clusters to enable cross-cluster
+within a ClusterSet. To enable this feature, the cluster's Pod CIDRs must be set
+in ConfigMap `antrea-mc-controller-config` of each member cluster and make sure


Then we should remove "make sure" too.

jianjuns · 2023-02-08T17:34:37Z

docs/multicluster/user-guide.md

-below. Note, **Pod CIDRs must not overlap among clusters to enable cross-cluster
+within a ClusterSet. To enable this feature, the cluster's Pod CIDRs must be set
+in ConfigMap `antrea-mc-controller-config` of each member cluster and make sure
+that `enablePodToPodConnectivity` is set to `true` in antrea-agent ConfigMap.


I suggest to use "in the antrea-agent configuration". I know we usually say ConfigMap for MC Controller configuration in this doc, but I think we usually do not say Antrea ConfigMap for agent/controller configuration in other docs. Technically, we can pass configuration to controllers/agent without a ConfigMap.

If we still want to use "ConfigMap", then we should at least say "ConfigMap in the Antrea deployment manifest" to be clear.

jianjuns · 2023-02-08T17:38:09Z

pkg/config/agent/config.go

@@ -292,6 +292,9 @@ type MulticlusterConfig struct {
 	// Enable Multi-cluster NetworkPolicy which allows Antrea-native policy ingress rules to select peers
 	// from all clusters in a ClusterSet.
 	EnableStretchedNetworkPolicy bool `yaml:"enableStretchedNetworkPolicy,omitempty"`
+	// Enable Multi-cluster Pod to Pod Connectivity which allows one Pod access another Pod in other member
+	// clusters directly. It also requires the Pod CIDRs in Multi-cluster configuration.


"This feature also requires Pod CIDRs to be provided in the Multi-cluster Controller configuration"

luolanzone · 2023-02-13T01:50:44Z

@hjiajing please help to resolve the manifest conflicts. thanks.

luolanzone · 2023-02-13T01:54:45Z

docs/multicluster/user-guide.md

-below. Note, **Pod CIDRs must not overlap among clusters to enable cross-cluster
+within a ClusterSet. To enable this feature, the cluster's Pod CIDRs must be set
+in ConfigMap `antrea-mc-controller-config` of each member cluster and
+`multicluster.enablePodToPodConnectivity` must be set to `true` in the `antrea-agent`


I suppose we should highlight this toggle is introduced from v1.11? @jianjuns any suggestion?

I feel it is not important. But if we want, no harm to add the information either.

hjiajing · 2023-02-13T02:06:55Z

@luolanzone Thanks for the reminder, regenerated the manifest and resolved the conflict now.

jianjuns · 2023-02-14T01:03:54Z

/test-e2e
/test-networkpolicy

jianjuns · 2023-02-15T23:23:35Z

@hjiajing : some tests have been pending for long, and some (e.g. multicluster-e2e) are not shown on the PR. Please re-push the commit, and make sure the required tests are passed.

Signed-off-by: hujiajing <hjiajing@vmware.com>

hjiajing · 2023-02-16T01:07:05Z

@jianjuns Thanks for the reminder, pe-pushed now.

hjiajing · 2023-02-16T01:07:11Z

/test-e2e
/test-networkpolicy

jianjuns · 2023-02-16T01:10:56Z

/test-all

jianjuns · 2023-02-16T18:19:38Z

/test-e2e
/test-multicluster-e2e

jianjuns · 2023-02-16T21:19:22Z

/test-multicluster-e2e

luolanzone added the area/multi-cluster Issues or PRs related to multi cluster. label Feb 7, 2023

hjiajing force-pushed the pod2pod-toggle branch from 259c89b to 863505f Compare February 7, 2023 07:28

hjiajing force-pushed the pod2pod-toggle branch from 863505f to db90739 Compare February 7, 2023 07:50

hjiajing requested a review from jianjuns February 7, 2023 13:47

jianjuns reviewed Feb 8, 2023

View reviewed changes

hjiajing force-pushed the pod2pod-toggle branch from db90739 to 00c9f66 Compare February 8, 2023 06:15

luolanzone reviewed Feb 8, 2023

View reviewed changes

jianjuns reviewed Feb 8, 2023

View reviewed changes

hjiajing force-pushed the pod2pod-toggle branch from 00c9f66 to 85d5853 Compare February 9, 2023 05:27

jianjuns previously approved these changes Feb 9, 2023

View reviewed changes

luolanzone reviewed Feb 13, 2023

View reviewed changes

hjiajing dismissed jianjuns’s stale review via ee18aa2 February 13, 2023 02:05

hjiajing force-pushed the pod2pod-toggle branch from 85d5853 to ee18aa2 Compare February 13, 2023 02:05

Add toggle for Multi-cluster Pod-to-Pod connectivity

7cf1a3f

Signed-off-by: hujiajing <hjiajing@vmware.com>

hjiajing force-pushed the pod2pod-toggle branch from ee18aa2 to 7cf1a3f Compare February 16, 2023 01:06

jianjuns approved these changes Feb 16, 2023

View reviewed changes

jianjuns merged commit cf90cfa into antrea-io:main Feb 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a toggle for Multi-cluster Pod-to-Pod connectivity #4605

Add a toggle for Multi-cluster Pod-to-Pod connectivity #4605

hjiajing commented Feb 7, 2023

codecov bot commented Feb 7, 2023 •

edited

Loading

luolanzone commented Feb 7, 2023

hjiajing commented Feb 7, 2023

jianjuns Feb 8, 2023

hjiajing Feb 8, 2023

jianjuns Feb 8, 2023

hjiajing Feb 9, 2023

luolanzone Feb 8, 2023

jianjuns Feb 8, 2023

hjiajing Feb 9, 2023

luolanzone Feb 8, 2023

hjiajing Feb 9, 2023

jianjuns Feb 8, 2023

jianjuns Feb 8, 2023

jianjuns Feb 8, 2023

hjiajing Feb 9, 2023

luolanzone commented Feb 13, 2023

luolanzone Feb 13, 2023

jianjuns Feb 15, 2023

hjiajing commented Feb 13, 2023

jianjuns commented Feb 14, 2023

jianjuns commented Feb 15, 2023

hjiajing commented Feb 16, 2023

hjiajing commented Feb 16, 2023

jianjuns commented Feb 16, 2023

jianjuns commented Feb 16, 2023

jianjuns commented Feb 16, 2023

	that `enablePodToPodConnectivity` is set to `true` in antrea-agent ConfigMap.
	that `enablePodToPodConnectivity` is set to `true` in ConfigMap `antrea-config`.

Add a toggle for Multi-cluster Pod-to-Pod connectivity #4605

Add a toggle for Multi-cluster Pod-to-Pod connectivity #4605

Conversation

hjiajing commented Feb 7, 2023

codecov bot commented Feb 7, 2023 • edited Loading

Codecov Report

luolanzone commented Feb 7, 2023

hjiajing commented Feb 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luolanzone commented Feb 13, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hjiajing commented Feb 13, 2023

jianjuns commented Feb 14, 2023

jianjuns commented Feb 15, 2023

hjiajing commented Feb 16, 2023

hjiajing commented Feb 16, 2023

jianjuns commented Feb 16, 2023

jianjuns commented Feb 16, 2023

jianjuns commented Feb 16, 2023

codecov bot commented Feb 7, 2023 •

edited

Loading