From 76cb3924c4d4509c3a788ef8b0ffaee04778ab95 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Mon, 4 Sep 2023 20:22:20 -0700 Subject: [PATCH] Legacy control-plane node labels are no longer used --- cmd/kops-controller/controllers/legacy_node_controller.go | 2 +- cmd/kops-controller/controllers/node_controller.go | 2 +- pkg/nodelabels/builder.go | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kops-controller/controllers/legacy_node_controller.go b/cmd/kops-controller/controllers/legacy_node_controller.go index 06ae7f453a..6b2d02f50c 100644 --- a/cmd/kops-controller/controllers/legacy_node_controller.go +++ b/cmd/kops-controller/controllers/legacy_node_controller.go @@ -136,7 +136,7 @@ func (r *LegacyNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) for k := range node.Labels { // If it is one of our managed labels, "prune" values we don't want to be there switch k { - case nodelabels.RoleLabelMaster16, nodelabels.RoleLabelAPIServer16, nodelabels.RoleLabelNode16, nodelabels.RoleLabelControlPlane20: + case nodelabels.RoleLabelAPIServer16, nodelabels.RoleLabelNode16, nodelabels.RoleLabelControlPlane20: if _, found := labels[k]; !found { deleteLabels[k] = struct{}{} } diff --git a/cmd/kops-controller/controllers/node_controller.go b/cmd/kops-controller/controllers/node_controller.go index f7017fe03a..a6913f724e 100644 --- a/cmd/kops-controller/controllers/node_controller.go +++ b/cmd/kops-controller/controllers/node_controller.go @@ -104,7 +104,7 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl. for k := range node.Labels { // If it is one of our managed labels, "prune" values we don't want to be there switch k { - case nodelabels.RoleLabelMaster16, nodelabels.RoleLabelAPIServer16, nodelabels.RoleLabelNode16, nodelabels.RoleLabelControlPlane20: + case nodelabels.RoleLabelAPIServer16, nodelabels.RoleLabelNode16, nodelabels.RoleLabelControlPlane20: if _, found := labels[k]; !found { deleteLabels[k] = struct{}{} } diff --git a/pkg/nodelabels/builder.go b/pkg/nodelabels/builder.go index 5d88a839ac..427165e5ae 100644 --- a/pkg/nodelabels/builder.go +++ b/pkg/nodelabels/builder.go @@ -25,7 +25,6 @@ import ( ) const ( - RoleLabelMaster16 = "node-role.kubernetes.io/master" RoleLabelAPIServer16 = "node-role.kubernetes.io/api-server" RoleLabelNode16 = "node-role.kubernetes.io/node"