@@ -144,31 +144,35 @@ of the change.
144
144
## Design Details
145
145
146
146
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.
149
149
Estimated 1.24, but may depend on user feedback.
150
- - Third - one release after Secondary
150
+ - Third - one release after Second
151
151
- Fourth - one release after Third
152
152
153
153
### Renaming the "node-role.kubernetes.io/master" Node label
154
154
155
- Primary stage:
155
+ First stage:
156
156
- Introduce the "node-role.kubernetes.io/control-plane" label in parallel to
157
157
the "master" label.
158
158
- Announce to users that they should adapt to use the new label.
159
- Secondary stage:
159
+
160
+ Second stage:
160
161
- Remove the "master" label and announce it to the users.
161
162
162
163
### Renaming the "node-role.kubernetes.io/master" Node taint
163
164
164
- Primary stage:
165
+ First stage:
165
166
- Introduce the "node-role.kubernetes.io/control-plane: NoSchedule " toleration
166
167
in the CoreDNS Deployment of kubeadm.
167
168
- Announce to users that they should do that same for their workloads.
168
- Secondary stage:
169
+
170
+ Second stage:
169
171
- Add the "node-role.kubernetes.io/control-plane: NoSchedule " taint to Nodes.
172
+
170
173
Third stage:
171
174
- Remove the "node-role.kubernetes.io/master: NoSchedule " taint from Nodes.
175
+
172
176
Fourth stage:
173
177
- Remove the "node-role.kubernetes.io/master: NoSchedule " toleration in the CoreDNS
174
178
Deployment of kubeadm
@@ -193,13 +197,13 @@ Not applicable.
193
197
Downgrades are not supported by kubeadm.
194
198
195
199
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
197
201
the "node-role.kubernetes.io/control-plane" label in parallel to the
198
202
"node-role.kubernetes.io/master" label.
199
203
The "node-role.kubernetes.io/control-plane: NoSchedule " toleration will
200
204
be added to the kubeadm CoreDNS Deployment of kubeadm so that it
201
205
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
203
207
Nodes. User infrastructure must only manage the "control-plane" label
204
208
at that point. New nodes will also have the
205
209
"node-role.kubernetes.io/control-plane: NoSchedule " taint.
0 commit comments