kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15874 from johngmyers/no-master-label 

Legacy control-plane node labels are no longer used
This commit is contained in:
Kubernetes Prow Robot 2023-09-04 23:05:49 -07:00 committed by GitHub
parent 92c0f48e33 76cb3924c4
commit 14c0b647db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops-controller/controllers/legacy_node_controller.go
View File

@ -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{}{}
}

2
cmd/kops-controller/controllers/node_controller.go
View File

@ -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{}{}
}

1
pkg/nodelabels/builder.go
View File

@ -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"