Skip to content

Commit 099b482

Browse files
authored
Merge pull request kubernetes#2138 from neolit123/1.20-rename-master-label-taint
sig-cluster-lifecycle/kubeadm: add ADR link to kubeadm master rename KEP
2 parents be43039 + adcb53f commit 099b482

File tree

1 file changed

+4
-1
lines changed
  • keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint

1 file changed

+4
-1
lines changed

keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ This taint key should also be renamed to "node-role.kubernetes.io/control-plane"
7171
The Kubernetes project is moving away from wording that is considered offensive.
7272
A new working group [WG Naming](https://git.k8s.io/community/wg-naming) was created
7373
to track this work, and the word "master" was declared as offensive.
74+
[A proposal](http://git.k8s.io/community/wg-naming/recommendations/master-control-plane.md)
75+
was formalized for replacing the word "master" with "control plane".
7476
This means it should be removed from source code, documentation, and user-facing
75-
configuration from all Kubernetes projects.
77+
configuration from Kubernetes and its sub-projects.
7678

7779
### Goals
7880

@@ -293,6 +295,7 @@ Not applicable.
293295

294296
- 2020-10-03 - initial provisional KEP created
295297
- 2020-10-05 - KEP marked as implementable
298+
- 2020-11-09 - added link to "master-control-plane.md" ADR
296299

297300
## Drawbacks
298301

0 commit comments

Comments
 (0)