From 729403345bd0c0487283cccce2c3c1bbbb558b90 Mon Sep 17 00:00:00 2001 From: Caio Torres Date: Wed, 28 May 2025 16:41:35 -0300 Subject: [PATCH] feat: remove master role labels (#12395) Signed-off-by: Caio Torres --- pkg/cloudprovider/servicelb.go | 5 ----- pkg/server/server.go | 1 - pkg/util/labels.go | 1 - 3 files changed, 7 deletions(-) diff --git a/pkg/cloudprovider/servicelb.go b/pkg/cloudprovider/servicelb.go index 76bbb634a44..cd574eacbbb 100644 --- a/pkg/cloudprovider/servicelb.go +++ b/pkg/cloudprovider/servicelb.go @@ -489,11 +489,6 @@ func (k *k3s) newDaemonSet(svc *core.Service) (*apps.DaemonSet, error) { AutomountServiceAccountToken: utilsptr.To(false), SecurityContext: securityContext, Tolerations: []core.Toleration{ - { - Key: util.MasterRoleLabelKey, - Operator: "Exists", - Effect: "NoSchedule", - }, { Key: util.ControlPlaneRoleLabelKey, Operator: "Exists", diff --git a/pkg/server/server.go b/pkg/server/server.go index 13d5a56e098..911572218a3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -563,7 +563,6 @@ func setNodeLabelsAndAnnotations(ctx context.Context, nodes v1.NodeClient, confi v, ok := node.Labels[util.ControlPlaneRoleLabelKey] if !ok || v != "true" { node.Labels[util.ControlPlaneRoleLabelKey] = "true" - node.Labels[util.MasterRoleLabelKey] = "true" } if config.ControlConfig.EncryptSecrets { diff --git a/pkg/util/labels.go b/pkg/util/labels.go index 2978da844f4..308ce694602 100644 --- a/pkg/util/labels.go +++ b/pkg/util/labels.go @@ -1,7 +1,6 @@ package util const ( - MasterRoleLabelKey = "node-role.kubernetes.io/master" ControlPlaneRoleLabelKey = "node-role.kubernetes.io/control-plane" ETCDRoleLabelKey = "node-role.kubernetes.io/etcd" )