mirror of
https://github.com/k3s-io/k3s.git
synced 2026-05-28 04:34:19 -04:00
feat: remove master role labels (#12395)
Signed-off-by: Caio Torres <caio.torres@suse.com>
This commit is contained in:
parent
3d0e0e2699
commit
729403345b
3 changed files with 0 additions and 7 deletions
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue