Rename Agent config option multicluster.enable to enableGateway #4533
Conversation
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
jianjuns
commented
Jan 4, 2023
| return nil | ||
| } | ||
|
|
||
| if !features.DefaultFeatureGate.Enabled(features.Multicluster) { | ||
| return fmt.Errorf("Multicluster can only be enabled when Multicluster feature gate is enabled") | ||
| klog.InfoS("Multicluster feature gate is disabled. Multi-cluster options are ignored") |
There was a problem hiding this comment.
@GraysonWu : I found other features (e.g. NodePortLocal) ignore config options when the feature gate is not enabled, which makes sense to me, and so made this change.
Codecov Report
@@ Coverage Diff @@
## main #4533 +/- ##
==========================================
+ Coverage 66.80% 68.20% +1.40%
==========================================
Files 404 412 +8
Lines 58231 58204 -27
==========================================
+ Hits 38899 39698 +799
+ Misses 16552 15722 -830
- Partials 2780 2784 +4
|
jianjuns
force-pushed
the
multicluster-option
branch
from
db21074
to
7109bc5
Compare
|
/test-multicluster-e2e |
luolanzone
reviewed
Jan 4, 2023
| @@ -333,12 +332,13 @@ multicluster: | |||
| {{- with .Values.multicluster }} | |||
| # Enable Antrea Multi-cluster Gateway to support cross-cluster traffic. | |||
| # This feature is supported only with encap mode. | |||
| enable: {{ .enable }} | |||
| enableGateway: {{ .enableGateway }} | |||
There was a problem hiding this comment.
The config in test-mc.sh need to be updated as well.
https://github.com/antrea-io/antrea/blob/main/ci/jenkins/test-mc.sh#L255
There was a problem hiding this comment.
Updated test-mc.sh. Thanks!
jianjuns
force-pushed
the
multicluster-option
branch
2 times, most recently
from
924769f
to
75aa064
Compare
To be compatible with earlier version deployment manifests, set multicluster.enableGateway to true if multicluster.enable is set to true. Also change the validation logic to ingore Multi-cluster options if the Multicluster feature gate is disabled, to be consistent with other features. Signed-off-by: Jianjun Shen <shenj@vmware.com>
jianjuns
force-pushed
the
multicluster-option
branch
from
75aa064
to
d8782c5
Compare
|
/test-multicluster-e2e |
|
/skip-all |
GraysonWu
pushed a commit
to GraysonWu/antrea
that referenced
this pull request
Jan 27, 2023
…ea-io#4533) To be compatible with earlier version deployment manifests, set multicluster.enableGateway to true if multicluster.enable is set to true. Also change the validation logic to ignore Multi-cluster options if the Multicluster feature gate is disabled, to be consistent with other features. Signed-off-by: Jianjun Shen <shenj@vmware.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To be compatible with earlier version deployment manifests, set multicluster.enableGateway to true if multicluster.enable is set to true.
Also change the validation logic to ignore Multi-cluster options if the Multicluster feature gate is disabled, to be consistent with other features.
Signed-off-by: Jianjun Shen shenj@vmware.com