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.

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

[promtail] Tolerate node-role.kubernetes.io/control-plane:NoSchedule taints #418

Merged
merged 1 commit into from Jun 7, 2021
Merged

[promtail] Tolerate node-role.kubernetes.io/control-plane:NoSchedule taints #418

merged 1 commit into from Jun 7, 2021

Conversation

ekeih
Copy link
Contributor

@ekeih ekeih commented Apr 30, 2021

The Kubernetes project is moving away from offensive wording and as part
of this KEP-2067 was accepted to replace the
node-role.kubernetes.io/master:NoSchedule taint with
node-role.kubernetes.io/control-plane:NoSchedule.

To be compatible with clusters that already use the new taint this pull
request adds an additional toleration for it. This change can't really
break existing setups because we continue to tolerate the old taint as
well.

Additional links:

Signed-off-by: Max Rosin git@hackrid.de

…taints

The Kubernetes project is moving away from offensive wording and as part
of this KEP-2067 was accepted to replace the
`node-role.kubernetes.io/master:NoSchedule` taint with
`node-role.kubernetes.io/control-plane:NoSchedule`.

To be compatible with clusters that already use the new taint this pull
request adds an additional toleration for it. This change can't really
break existing setups because we continue to tolerate the old taint as
well.

Additional links:
- https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint/README.md
- kubernetes/enhancements#2067
- kubernetes/kubeadm#2200

Signed-off-by: Max Rosin <git@hackrid.de>
@ekeih
Copy link
Contributor Author

ekeih commented Jun 1, 2021

Solved the merge conflict and ran helm-docs.

Copy link
Collaborator

@Whyeasy Whyeasy left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Whyeasy Whyeasy merged commit 7b86095 into grafana:main Jun 7, 2021
@ekeih ekeih deleted the promtail-tolerate-control-plane-taint branch July 2, 2021 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants