Defer removal of legacy node labels

kubernetes · May 14, 2021 · 0c1d3b0 · 0c1d3b0
1 parent b9382b5
commit 0c1d3b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/releases/1.21-NOTES.md b/docs/releases/1.21-NOTES.md
@@ -48,7 +48,7 @@ See the [warm pool](https://kops.sigs.k8s.io/instance_groups/#warmpool-aws-only)
 
 * The [manifest based cluster autoscaler addon](https://github.com/kubernetes/kops/tree/master/addons/cluster-autoscaler) has been deprecated in favour of a configurable addon.
 
-* The `node-role.kubernetes.io/master` and `kubernetes.io/role` labels are deprecated and will be removed from control plane nodes in kOps 1.22
+* The `node-role.kubernetes.io/master` and `kubernetes.io/role` labels are deprecated and might be removed from control plane nodes in kOps 1.23.
 
 * Due to lack of maintainers, the Aliyun/Alibaba Cloud support has been deprecated. The current implementation will be left as-is until the implementation needs updates or otherwise becomes incompatible. At that point, it will be removed. We very much welcome anyone willing to contribute to this cloud provider.
 

diff --git a/docs/releases/1.22-NOTES.md b/docs/releases/1.22-NOTES.md
@@ -12,8 +12,6 @@ This is a document to gather the release notes prior to the release.
 
 * The legacy location for downloads `s3://https://kubeupv2.s3.amazonaws.com/kops/` has been deprecated and will not be used for new releases. The new canonical downloads location is `https://artifacts.k8s.io/binaries/kops/`.
 
-* [TODO] The `node-role.kubernetes.io/master` and `kubernetes.io/role` labels [will be] removed from control plane nodes.
-
 # Required Actions
 
 # Deprecations
@@ -24,6 +22,8 @@ This is a document to gather the release notes prior to the release.
 
 * The [manifest based cluster autoscaler addon](https://github.com/kubernetes/kops/tree/master/addons/cluster-autoscaler) has been deprecated in favour of a configurable addon.
 
+* The `node-role.kubernetes.io/master` and `kubernetes.io/role` labels are deprecated and might be removed from control plane nodes in kOps 1.23.
+
 * Due to lack of maintainers, the Aliyun/Alibaba Cloud support has been deprecated. The current implementation will be left as-is until the implementation needs updates or otherwise becomes incompatible. At that point, it will be removed. We very much welcome anyone willing to contribute to this cloud provider.
 
 # Full change list since 1.21.0 release