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

chore: deprecate old cilium and hubble addon configs #12848

Merged
merged 5 commits into from Dec 7, 2023
Merged

chore: deprecate old cilium and hubble addon configs #12848

merged 5 commits into from Dec 7, 2023

Conversation

cnvergence
Copy link
Member

@cnvergence cnvergence commented Nov 20, 2023 •
edited

What this PR does / why we need it:
As Cilium is now deployed as a Application #11356, we can start to deprecate old configs from addons

What type of PR is this?

/kind chore

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Deprecate v1.11 and v1.12 Cilium and Hubble KKP Addons, as Cilium CNI is managed by Applications from version 1.13

Documentation:

NONE

@cnvergence
deprecate cilium addon
6140fae 
Signed-off-by: Karol Szwaj <karol@kubermatic.com>
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Nov 20, 2023
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. docs/tbd Denotes a PR that needs documentation (change) that will be done later. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Nov 20, 2023
@cnvergence cnvergence marked this pull request as ready for review November 20, 2023 15:18
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 20, 2023
@cnvergence cnvergence changed the title chore: deprecate cilium and hubble addon chore: deprecate old cilium and hubble addon configs Nov 20, 2023
@cnvergence cnvergence added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 20, 2023
@cnvergence cnvergence self-assigned this Nov 21, 2023
@cnvergence cnvergence added the sig/networking Denotes a PR or issue as being assigned to SIG Networking. label Nov 21, 2023
@embik
Copy link
Member

embik commented Nov 28, 2023

/retest

@embik
Copy link
Member

embik commented Dec 5, 2023

This is not deprecating old versions, it's directly removing them. Please deprecate them by updating

kubermatic/pkg/cni/version.go

Line 49 in f813349

supportedCNIPluginVersions = map[kubermaticv1.CNIPluginType]sets.Set[string]{
and moving versions to deprecatedCNIPluginVersions instead.

@cnvergence
deprecate v1.11 and v1.12
5c43768 
Signed-off-by: Karol Szwaj <karol@kubermatic.com>
@cnvergence
remove hubble addonconfig
7f5a134 
Signed-off-by: Karol Szwaj <karol@kubermatic.com>
@kubermatic-bot kubermatic-bot added the sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. label Dec 5, 2023
embik
embik requested changes Dec 5, 2023
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

Don't remove the manifests for v1.11 and v1.12; we have to deprecate them (as you did with the latest commit) and then remove them in the release after 2.25.

@kubermatic-bot kubermatic-bot removed the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 6, 2023
@kubermatic-bot kubermatic-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 6, 2023
@cnvergence cnvergence closed this Dec 6, 2023
@cnvergence cnvergence reopened this Dec 6, 2023
@cnvergence cnvergence removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 6, 2023
@cnvergence cnvergence requested a review from embik December 6, 2023 10:26
@embik
Copy link
Member

embik commented Dec 6, 2023

Missing a release note, then we are good to go.

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 6, 2023
@cnvergence
Copy link
Member Author

done

embik
embik approved these changes Dec 6, 2023
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: bd3a64ab95d1a30b07f679c9c693aa29c57a23b9

@cnvergence
Copy link
Member Author

ptal @wozniakjan

wozniakjan
wozniakjan approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@wozniakjan wozniakjan left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik, wozniakjan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2023
@kubermatic-bot kubermatic-bot merged commit 8dfae1b into kubermatic:main Dec 7, 2023
19 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.25 milestone Dec 7, 2023
@cnvergence cnvergence deleted the deprecate-cilium-addon branch February 5, 2024 15:22
@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). and removed docs/tbd Denotes a PR that needs documentation (change) that will be done later. labels Mar 12, 2024
@cnvergence cnvergence mentioned this pull request Mar 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wozniakjan wozniakjan wozniakjan approved these changes

@embik embik embik approved these changes

Assignees

@wozniakjan wozniakjan

@embik embik

@cnvergence cnvergence

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. sig/networking Denotes a PR or issue as being assigned to SIG Networking. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
KKP 2.25
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cnvergence @kubermatic-bot @embik @wozniakjan