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

Merge pull request #12711 from justinsb/add_apiserver_label_without_featureflag 

Populate api-server role label on node
This commit is contained in:
Kubernetes Prow Robot 2021-11-12 20:50:46 -08:00 committed by GitHub
parent 12c8f39198 be298f48a5
commit f052ac0e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/nodelabels/builder.go
View File

@ -60,7 +60,11 @@ func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) m
if nodeLabels == nil { if nodeLabels == nil {
nodeLabels = make(map[string]string) nodeLabels = make(map[string]string)
} }
if featureflag.APIServerNodes.Enabled() { // Note: featureflag is not available here - we're in kops-controller.
// We keep the featureflag as a placeholder to change the logic;
// when we drop the featureflag we should just always include the label, even for
// full control-plane nodes.
if isAPIServer || featureflag.APIServerNodes.Enabled() {
nodeLabels[RoleLabelAPIServer16] = "" nodeLabels[RoleLabelAPIServer16] = ""
} }
nodeLabels[RoleLabelName15] = RoleAPIServerLabelValue15 nodeLabels[RoleLabelName15] = RoleAPIServerLabelValue15