Skip to content

Remove deprecated v2alpha1 CiliumNodeConfig CRD#44739

Open
HadrienPatte wants to merge 4 commits intomainfrom
pr/HadrienPatte/v2alpha1
Open

Remove deprecated v2alpha1 CiliumNodeConfig CRD#44739
HadrienPatte wants to merge 4 commits intomainfrom
pr/HadrienPatte/v2alpha1

Conversation

@HadrienPatte
Copy link
Copy Markdown
Member

@HadrienPatte HadrienPatte commented Mar 11, 2026 •
edited
Loading

Remove v2alpha1 CiliumNodeConfig that was promoted to v2 in cilium 1.16.

Closes #40110
Related: #31982

Question for reviewers: do we need a mention in the 1.20 upgrade notes or is the release note from this PR sufficient? (v2alpha1 CiliumNodeConfig has been advertised as deprecated since 1.16) update: Added a note in the upgrade notes

Remove deprecated `v2alpha1` `CiliumNodeConfig` API that was promoted to `v2` in cilium 1.16.

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 11, 2026
@github-actions github-actions bot added the cilium-cli This PR contains changes related with cilium-cli label Mar 11, 2026
@HadrienPatte HadrienPatte force-pushed the pr/HadrienPatte/v2alpha1 branch 2 times, most recently from 0311bc8 to 5170032 Compare March 11, 2026 22:00
@HadrienPatte
Copy link
Copy Markdown
Member Author

HadrienPatte commented Mar 11, 2026

/test

@HadrienPatte HadrienPatte changed the title Remove v2alpha1 CiliumNodeConfig Remove deprecated v2alpha1 CiliumNodeConfig CRD Mar 11, 2026
@HadrienPatte HadrienPatte marked this pull request as ready for review March 11, 2026 23:21
@HadrienPatte HadrienPatte requested review from a team as code owners March 11, 2026 23:21
@joamaki
Copy link
Copy Markdown
Contributor

joamaki commented Mar 12, 2026

Question for reviewers: do we need a mention in the 1.20 upgrade notes or is the release note from this PR sufficient? (v2alpha1 CiliumNodeConfig has been advertised as deprecated since 1.16)

Even though it's been deprecated for so long I'd still add a note in upgrade notes that this has finally been removed.

asauber
asauber approved these changes Mar 16, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@asauber asauber left a comment

Choose a reason for hiding this comment

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

I would second adding a note to the Cilium upgrade instructions.

Also, in the future, let's make sure to add a deprecation warning for the API via kubebuilder, which wasn't done in this case.

harsimran-pabla
harsimran-pabla requested changes Mar 16, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@harsimran-pabla harsimran-pabla left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, pls update CRD schema version.

As Jussi and Andrew suggested, let's add removal of this CRD in upgrade notes and add appropriate release-note in this PR as per contributing guide.

@harsimran-pabla harsimran-pabla added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Mar 16, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 16, 2026
@HadrienPatte
option/resolver: Remove v2alpha1 CiliumNodeConfig reading
40a1f3f 
The `v2alpha1` `CiliumNodeConfig` was deprecated in v1.16. Drop
`readNodeConfigsv2alpha1`, `readNodeConfigsAllVersions`, and the
corresponding test coverage. `ReadConfigSource` now reads only from the
`v2` API.

Signed-off-by: Hadrien Patte <[email protected]>
@HadrienPatte
k8s: Drop v2alpha1 version from CiliumNodeConfig CRD
cf05df8 
Remove the deprecated `v2alpha1` served version from the
ciliumnodeconfigs CRD manifest and remove the connectivity test warning
suppression for the deprecation log line that the apiserver emitted for
`v2alpha1` requests.

Signed-off-by: Hadrien Patte <[email protected]>
@HadrienPatte
cilium-cli: Migrate CiliumNodeConfig client from v2alpha1 to v2
1ba2b4e 
Update `ListCiliumNodeConfigs` and its interface and test stub to use
`CiliumV2().CiliumNodeConfigs()` instead of `CiliumV2alpha1()`.

Signed-off-by: Hadrien Patte <[email protected]>
@HadrienPatte
k8s: Remove v2alpha1 CiliumNodeConfig type and generated code
a152df5 
Delete the `v2alpha1` `CiliumNodeConfig` type definition, unregister it
from the scheme and delete associated generated code.

Signed-off-by: Hadrien Patte <[email protected]>
@HadrienPatte HadrienPatte force-pushed the pr/HadrienPatte/v2alpha1 branch from 5170032 to a152df5 Compare March 23, 2026 10:16
@HadrienPatte HadrienPatte requested a review from a team as a code owner March 23, 2026 10:16
@HadrienPatte
Copy link
Copy Markdown
Member Author

HadrienPatte commented Mar 23, 2026

Even though it's been deprecated for so long I'd still add a note in upgrade notes that this has finally been removed.

Done

Also, in the future, let's make sure to add a deprecation warning for the API via kubebuilder, which wasn't done in this case.

I believe that was the case here:

cilium/pkg/k8s/apis/cilium.io/v2alpha1/cnc_types.go

Line 14 in 0a4de7b

//+kubebuilder:deprecatedversion:warning="cilium.io/v2alpha1 CiliumNodeConfig will be deprecated in cilium v1.16; use cilium.io/v2 CiliumNodeConfig"

Thanks, pls update CRD schema version.

Thanks, updated the version

@HadrienPatte
Copy link
Copy Markdown
Member Author

HadrienPatte commented Mar 23, 2026

/test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joamaki joamaki joamaki approved these changes

@asauber asauber asauber approved these changes

@hemanthmalla hemanthmalla Awaiting requested review from hemanthmalla hemanthmalla is a code owner automatically assigned from cilium/docs-structure

@harsimran-pabla harsimran-pabla Awaiting requested review from harsimran-pabla

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

cilium-cli This PR contains changes related with cilium-cli release-note/minor This PR changes functionality that users may find relevant to operating Cilium.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove CiliumNodeConfig v2alpha1 in v1.20

4 participants

@HadrienPatte @joamaki @asauber @harsimran-pabla