From 3a4c028f44ad4cef872330ea288bcd9f1155a42d Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Sun, 2 Jul 2023 22:07:59 +0100 Subject: [PATCH 1/4] 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 From 759abae3712b89c745a46e0d047562354daa476e Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Sun, 2 Jul 2023 22:11:44 +0100 Subject: [PATCH 2/4] chore(node/util): fix message --- pkg/api/node/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/node/util.go b/pkg/api/node/util.go index a82b5ab6071..77d6b109fd9 100644 --- a/pkg/api/node/util.go +++ b/pkg/api/node/util.go @@ -31,7 +31,7 @@ var deprecatedNodeLabels = map[string]string{ `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`, + `scheduler.alpha.kubernetes.io/preferAvoidPods`: `deprecated since v1.22; use Taints and Tolerations instead`, `node-role.kubernetes.io/master`: `use "node-role.kubernetes.io/control-plane" instead`, } From 1062079fe6df6f51303d4ddd90eca9783116a841 Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Sun, 2 Jul 2023 22:17:45 +0100 Subject: [PATCH 3/4] chore(node/util): add app.kubernetes.io/created-by --- pkg/api/node/util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/api/node/util.go b/pkg/api/node/util.go index 77d6b109fd9..02b4cc49d9f 100644 --- a/pkg/api/node/util.go +++ b/pkg/api/node/util.go @@ -31,6 +31,7 @@ var deprecatedNodeLabels = map[string]string{ `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`, + `app.kubernetes.io/created-by`: `deprecated since v1.19`, `scheduler.alpha.kubernetes.io/preferAvoidPods`: `deprecated since v1.22; use Taints and Tolerations instead`, `node-role.kubernetes.io/master`: `use "node-role.kubernetes.io/control-plane" instead`, } From 7e596ca15fc118bf880ffbefece7084cb28604f5 Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Tue, 4 Jul 2023 21:16:42 +0100 Subject: [PATCH 4/4] fix(node/util): change 1.19 -> 1.9 --- pkg/api/node/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/node/util.go b/pkg/api/node/util.go index 02b4cc49d9f..daf5ee0cf62 100644 --- a/pkg/api/node/util.go +++ b/pkg/api/node/util.go @@ -31,7 +31,7 @@ var deprecatedNodeLabels = map[string]string{ `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`, - `app.kubernetes.io/created-by`: `deprecated since v1.19`, + `app.kubernetes.io/created-by`: `deprecated since v1.9`, `scheduler.alpha.kubernetes.io/preferAvoidPods`: `deprecated since v1.22; use Taints and Tolerations instead`, `node-role.kubernetes.io/master`: `use "node-role.kubernetes.io/control-plane" instead`, }