From 1be751ca61032eefbe5584b92abd94b97d5ec865 Mon Sep 17 00:00:00 2001 From: Lachlan Evenson Date: Mon, 8 Oct 2018 20:44:28 -0700 Subject: [PATCH] Update node-labels to 1.6+ standard --- pkg/acsengine/template_generator.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/acsengine/template_generator.go b/pkg/acsengine/template_generator.go index b60920e4ad..87b5b39436 100644 --- a/pkg/acsengine/template_generator.go +++ b/pkg/acsengine/template_generator.go @@ -222,12 +222,14 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat "GetMasterKubernetesLabels": func(rg string) string { var buf bytes.Buffer buf.WriteString("kubernetes.io/role=master") + buf.WriteString(",node-role.kubernetes.io/master=") buf.WriteString(fmt.Sprintf(",kubernetes.azure.com/cluster=%s", rg)) return buf.String() }, "GetAgentKubernetesLabels": func(profile *api.AgentPoolProfile, rg string) string { var buf bytes.Buffer - buf.WriteString(fmt.Sprintf("kubernetes.io/role=agent,agentpool=%s", profile.Name)) + buf.WriteString("node-role.kubernetes.io/agent=") + buf.WriteString(fmt.Sprintf(",kubernetes.io/role=agent,agentpool=%s", profile.Name)) if profile.StorageProfile == api.ManagedDisks { storagetier, _ := getStorageAccountType(profile.VMSize) buf.WriteString(fmt.Sprintf(",storageprofile=managed,storagetier=%s", storagetier))