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

Tidy up deprecated options #5158

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Tidy up deprecated options #5158

merged 1 commit into from
Apr 17, 2024

Conversation

luolanzone
Copy link
Contributor

Following options are removed since they have been deprecated for a long time.

enableIPSecTunnel
nplPortRange
multicastInterfaces
multicluster.enable
legacyCRDMirroring

multicluster.enable is deprecated after 1.10 around 5 months ago, but it maybe safe to remove since it's still in alpha stage.

For #5070

@luolanzone luolanzone added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Jun 20, 2023
@luolanzone luolanzone marked this pull request as draft June 20, 2023 07:00
tnqn
tnqn reviewed Jun 20, 2023
View reviewed changes
Copy link
Member

@tnqn tnqn left a comment •
edited

Choose a reason for hiding this comment

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

I would suggest to not make the change until 2.0, because currently all options are uncommented in antrea-config even if they are never changed by users explicitly. There is a risk that if users keep their configmap which is created when creating the cluster and deploying antrea, upgrading to a version that removes these options would fail to start, unless they manually update the configmap.

@luolanzone
Copy link
Contributor Author

Sure, I can add this to milestone 2.0 when it's ready.

@github-actions
Copy link
Contributor

This PR is stale because it has been open 90 days with no activity. Remove stale label or comment, or this will be closed in 90 days

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 19, 2023
@luolanzone luolanzone removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 19, 2023
@github-actions GitHub Actions
Copy link
Contributor

This PR is stale because it has been open 90 days with no activity. Remove stale label or comment, or this will be closed in 90 days

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 19, 2023
@luolanzone luolanzone removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 20, 2023
@luolanzone luolanzone force-pushed the tidy-up-options branch 2 times, most recently from b308e93 to fa9ed9d Compare February 1, 2024 06:11
@luolanzone luolanzone added this to the Antrea v2.0 release milestone Feb 4, 2024
@luolanzone luolanzone marked this pull request as ready for review February 4, 2024 08:56
@luolanzone luolanzone force-pushed the tidy-up-options branch 2 times, most recently from dad8e7d to a2284df Compare March 4, 2024 02:53
antoninbas
antoninbas reviewed Mar 15, 2024
View reviewed changes
docs/api.md Outdated Show resolved Hide resolved
cmd/antrea-agent/options.go
@@ -484,13 +480,6 @@ func (o *Options) setK8sNodeDefaultOptions() {
}

if features.DefaultFeatureGate.Enabled(features.Multicluster) {
if o.config.Multicluster.Enable {
Copy link
Contributor

Choose a reason for hiding this comment

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

we should have had a log message about this being deprecated, but as you pointed out Multicluster is still Alpha so I am fine with this change.

multicluster/apis/multicluster/v1alpha2/clusterset_types.go Outdated Show resolved Hide resolved
@luolanzone
Tidy up deprecated options
6730aeb 
Following options are removed since they have been deprecated
for a long time.

```
enableIPSecTunnel
nplPortRange
multicastInterfaces
multicluster.enable
legacyCRDMirroring
```

Signed-off-by: Lan Luo <luola@vmware.com>
@antoninbas antoninbas added the action/release-note Indicates a PR that should be included in release notes. label Apr 9, 2024
@antoninbas
Copy link
Contributor

/test-all

tnqn
tnqn approved these changes Apr 17, 2024
View reviewed changes
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
Copy link
Member

tnqn commented Apr 17, 2024

Rebased it on main and tested with a legacy ConfigMap that contains the removed options, Pods ran well due to lenient decoding. So it should be quite safe to remove them.

BTW, nplPortRange has been removed by #5943, I will update the commit message when merging.

@tnqn tnqn merged commit 178752a into antrea-io:main Apr 17, 2024
51 of 56 checks passed
@luolanzone luolanzone deleted the tidy-up-options branch April 18, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoninbas antoninbas antoninbas approved these changes

@tnqn tnqn tnqn approved these changes

@jianjuns jianjuns Awaiting requested review from jianjuns

Assignees
No one assigned
Labels
action/release-note Indicates a PR that should be included in release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt.
Projects
None yet
Milestone
Antrea v2.0 release
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@luolanzone @antoninbas @tnqn