Fix tolerations for Kubernetes 1.24 #3731
Merged
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
tnqn
previously approved these changes
May 5, 2022
There was a problem hiding this comment.
LGTM
kubeadm v1.24.0 will add both taints for control-plane Nodes and it seems to be a bug. But adding both tolerations has no side effects.
It seems an intended change: https://github.com/kubernetes/kubernetes/blame/master/CHANGELOG/CHANGELOG-1.24.md#L330
For new clusters, both the old taint node-role.kubernetes.io/master:NoSchedule and new taint node-role.kubernetes.io/control-plane:NoSchedule will be added to control plane nodes.
Codecov Report
@@ Coverage Diff @@
## main #3731 +/- ##
==========================================
- Coverage 64.60% 63.95% -0.65%
==========================================
Files 278 278
Lines 39640 39753 +113
==========================================
- Hits 25608 25426 -182
- Misses 12043 12370 +327
+ Partials 1989 1957 -32
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
@xliuxu could you resolve conflicts? |
xliuxu
force-pushed
the
1.24_e2e_label_taints_fix
branch
2 times, most recently
from
55165d1
to
9384991
Compare
xliuxu
changed the title
|
@xliuxu could you also update tolerations of antrea-controller? antrea/build/charts/antrea/values.yaml Lines 203 to 205 in 4a3b76c Otherwise antrea-controller will never be scheduled to control-plane node. The title may need adjustment after that. |
xliuxu
force-pushed
the
1.24_e2e_label_taints_fix
branch
3 times, most recently
from
9384991
to
db794a1
Compare
xliuxu
changed the title
|
@tnqn Done. Thanks! |
tnqn
reviewed
May 6, 2022
build/charts/antrea/values.yaml
Outdated
| @@ -203,6 +203,9 @@ controller: | |||
| # Allow it to schedule onto master nodes. | |||
| - key: node-role.kubernetes.io/master | |||
| effect: NoSchedule | |||
| # Control-plane taint since Kubernetes >= 1.24. | |||
There was a problem hiding this comment.
Suggested change
| # Control-plane taint since Kubernetes >= 1.24. | |
| # Control-plane taint since Kubernetes 1.24. |
or
Suggested change
| # Control-plane taint since Kubernetes >= 1.24. | |
| # Control-plane taint for Kubernetes >= 1.24. |
xliuxu
force-pushed
the
1.24_e2e_label_taints_fix
branch
from
db794a1
to
38523b7
Compare
|
/test-all |
The taints for control-plane Nodes are changed for cluster version >= 1.24. Add a new toleration for Pods running on control-plane Nodes to make sure they can be scheduled. Signed-off-by: Xu Liu <[email protected]>
xliuxu
force-pushed
the
1.24_e2e_label_taints_fix
branch
from
38523b7
to
4399c2b
Compare
|
/test-all |
tnqn
approved these changes
May 6, 2022
tnqn
added
action/release-note
|
@xliuxu could you please backport this PR to release 1.5 and 1.6? |
This was referenced May 7, 2022
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.
The taints and labels for control-plane Nodes will be changed for
cluster version >= 1.24.
kubeadm v1.24.0 will add both taints for control-plane Nodes and
it seems to be a bug. But adding both tolerations has no side effects.
Signed-off-by: Xu Liu [email protected]