Skip to content

Commit 0b4d044

Browse files
authored
Merge pull request kubernetes#2081 from neolit123/1.20-rename-master-label-taint
sig-cl/kubeadm: fix markdown issue in "rename master" KEP
2 parents 7ffe8bb + ae205b3 commit 0b4d044

File tree

1 file changed

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

1 file changed

+13
-9
lines changed

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,31 +144,35 @@ of the change.
144144
## Design Details
145145

146146
The process will be broken into multiple stages:
147-
- Primary - 1.20
148-
- Secondary - Minimum deprecation period for GA features is 1 year.
147+
- First - 1.20
148+
- Second - Minimum deprecation period for GA features is 1 year.
149149
Estimated 1.24, but may depend on user feedback.
150-
- Third - one release after Secondary
150+
- Third - one release after Second
151151
- Fourth - one release after Third
152152

153153
### Renaming the "node-role.kubernetes.io/master" Node label
154154

155-
Primary stage:
155+
First stage:
156156
- Introduce the "node-role.kubernetes.io/control-plane" label in parallel to
157157
the "master" label.
158158
- Announce to users that they should adapt to use the new label.
159-
Secondary stage:
159+
160+
Second stage:
160161
- Remove the "master" label and announce it to the users.
161162

162163
### Renaming the "node-role.kubernetes.io/master" Node taint
163164

164-
Primary stage:
165+
First stage:
165166
- Introduce the "node-role.kubernetes.io/control-plane:NoSchedule" toleration
166167
in the CoreDNS Deployment of kubeadm.
167168
- Announce to users that they should do that same for their workloads.
168-
Secondary stage:
169+
170+
Second stage:
169171
- Add the "node-role.kubernetes.io/control-plane:NoSchedule" taint to Nodes.
172+
170173
Third stage:
171174
- Remove the "node-role.kubernetes.io/master:NoSchedule" taint from Nodes.
175+
172176
Fourth stage:
173177
- Remove the "node-role.kubernetes.io/master:NoSchedule" toleration in the CoreDNS
174178
Deployment of kubeadm
@@ -193,13 +197,13 @@ Not applicable.
193197
Downgrades are not supported by kubeadm.
194198

195199
For upgrades:
196-
- During the primary stage new Nodes in the cluster will be added with
200+
- During the first stage new Nodes in the cluster will be added with
197201
the "node-role.kubernetes.io/control-plane" label in parallel to the
198202
"node-role.kubernetes.io/master" label.
199203
The "node-role.kubernetes.io/control-plane:NoSchedule" toleration will
200204
be added to the kubeadm CoreDNS Deployment of kubeadm so that it
201205
tolerates both old and new nodes.
202-
- During the secondary stage the "master" label will be removed from new
206+
- During the second stage the "master" label will be removed from new
203207
Nodes. User infrastructure must only manage the "control-plane" label
204208
at that point. New nodes will also have the
205209
"node-role.kubernetes.io/control-plane:NoSchedule" taint.

0 commit comments

Comments
 (0)