From 3a4c028f44ad4cef872330ea288bcd9f1155a42d Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Sun, 2 Jul 2023 22:07:59 +0100 Subject: [PATCH] chore(node/util): add scheduler.alpha.kubernetes.io/preferAvoidPods and node-role.kubernetes.io/master to deprecatedNodeLabels --- pkg/api/node/util.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/api/node/util.go b/pkg/api/node/util.go index fcc6dba4145..a82b5ab6071 100644 --- a/pkg/api/node/util.go +++ b/pkg/api/node/util.go @@ -26,11 +26,13 @@ import ( ) var deprecatedNodeLabels = map[string]string{ - `beta.kubernetes.io/arch`: `deprecated since v1.14; use "kubernetes.io/arch" instead`, - `beta.kubernetes.io/os`: `deprecated since v1.14; use "kubernetes.io/os" instead`, - `failure-domain.beta.kubernetes.io/region`: `deprecated since v1.17; use "topology.kubernetes.io/region" instead`, - `failure-domain.beta.kubernetes.io/zone`: `deprecated since v1.17; use "topology.kubernetes.io/zone" instead`, - `beta.kubernetes.io/instance-type`: `deprecated since v1.17; use "node.kubernetes.io/instance-type" instead`, + `beta.kubernetes.io/arch`: `deprecated since v1.14; use "kubernetes.io/arch" instead`, + `beta.kubernetes.io/os`: `deprecated since v1.14; use "kubernetes.io/os" instead`, + `failure-domain.beta.kubernetes.io/region`: `deprecated since v1.17; use "topology.kubernetes.io/region" instead`, + `failure-domain.beta.kubernetes.io/zone`: `deprecated since v1.17; use "topology.kubernetes.io/zone" instead`, + `beta.kubernetes.io/instance-type`: `deprecated since v1.17; use "node.kubernetes.io/instance-type" instead`, + `scheduler.alpha.kubernetes.io/preferAvoidPods`: `deprecated since v1.17; use Taints and Tolerations instead`, + `node-role.kubernetes.io/master`: `use "node-role.kubernetes.io/control-plane" instead`, } // GetNodeLabelDeprecatedMessage returns the message for the deprecated node label