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

helm: Add node-role.kubernetes.io/control-plane key #22893

Merged
merged 1 commit into from
Jan 2, 2023
Merged

helm: Add node-role.kubernetes.io/control-plane key #22893

merged 1 commit into from
Jan 2, 2023

Conversation

my-git9
Copy link
Contributor

@my-git9 my-git9 commented Dec 30, 2022 •
edited
Loading

node-role.kubernetes.io/master has been deprecated from 1.20, and replaced by node-role.kubernetes.io/control-plane.

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md
image

@my-git9
fix: add new key for tolerations for deprecated key
4eae9d3 
Signed-off-by: xin.li <xin.li@daocloud.io>
@my-git9 my-git9 requested review from a team as code owners December 30, 2022 06:26
@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 Dec 30, 2022
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Dec 30, 2022
@sayboras sayboras added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Dec 30, 2022
@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 Dec 30, 2022
@sayboras sayboras added the area/helm Impacts helm charts and user deployment experience label Dec 30, 2022
@sayboras sayboras changed the title fix: add node-role.kubernetes.io/control-plane key helm: Add node-role.kubernetes.io/control-plane key Dec 30, 2022
sayboras
sayboras approved these changes Dec 30, 2022
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

One small comment as per below, thanks for your contribution.

install/kubernetes/cilium/values.yaml Show resolved Hide resolved
sayboras added a commit to sayboras/cilium that referenced this pull request Dec 30, 2022
@sayboras
k8s: Add node-role.kubernetes.io/control-plane taint
4f4ac96 
This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: cilium#22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras mentioned this pull request Dec 30, 2022
Merged
@sayboras sayboras added the needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch label Dec 30, 2022
@sayboras
Copy link
Member

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 30, 2022
@pchaigno pchaigno merged commit c7806c6 into cilium:master Jan 2, 2023
@aditighag aditighag mentioned this pull request Jan 9, 2023
Merged
@aditighag aditighag added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Jan 9, 2023
@my-git9 my-git9 deleted the fix/deprecatedtag branch January 10, 2023 01:51
aditighag pushed a commit that referenced this pull request Jan 10, 2023
@sayboras @aditighag
k8s: Add node-role.kubernetes.io/control-plane taint
d7fc290 
This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: #22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@aditighag aditighag added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Jan 10, 2023
aanm pushed a commit that referenced this pull request Jan 18, 2023
@sayboras @aanm
k8s: Add node-role.kubernetes.io/control-plane taint
3e44d14 
[ upstream commit d7fc290 ]

This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: #22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
aanm pushed a commit that referenced this pull request Jan 18, 2023
@sayboras @aanm
k8s: Add node-role.kubernetes.io/control-plane taint
ff77c0c 
[ upstream commit d7fc290 ]

This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: #22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
ldelossa pushed a commit that referenced this pull request Jan 18, 2023
@sayboras @ldelossa
k8s: Add node-role.kubernetes.io/control-plane taint
83066a4 
[ upstream commit d7fc290 ]

This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: #22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
@joestringer joestringer mentioned this pull request Jan 24, 2023
Merged
YutaroHayakawa pushed a commit to YutaroHayakawa/cilium that referenced this pull request Mar 17, 2023
@sayboras @michi-covalent
k8s: Add node-role.kubernetes.io/control-plane taint
8210a7b 
[ upstream commit d7fc290 ]

This new node-role.kubernetes.io/control-plane taint replaced old one
node-role.kubernetes.io/master, mainly for promoting inclusive language.
From k8s 1.26+ onward, the old taint is no longer working.

Related docs: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#removed
Relates: cilium#22893

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sayboras sayboras sayboras approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. 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.

None yet
4 participants
@my-git9 @sayboras @pchaigno @aditighag