Revert 1653 cluster label (#1711)

* Revert "add more e2e regional coverage (#1709)" This reverts commit fdca019. * Revert "Added cluster name to node labels (#1653)" This reverts commit 13cf61f.
Azure · Nov 4, 2017 · 0d53182 · 0d53182
1 parent fdca019
commit 0d53182
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/parts/kubernetesagentcustomdata.yml b/parts/kubernetesagentcustomdata.yml
@@ -108,7 +108,7 @@ write_files:
     DOCKER_OPTS=
     CUSTOM_CMD=/bin/true
     KUBELET_REGISTER_SCHEDULABLE=true
-    KUBELET_NODE_LABELS={{GetAgentKubernetesLabels . "',variables('resourceGroup'),'"}}
+    KUBELET_NODE_LABELS={{ GetKubernetesLabels . }}
     KUBELET_POD_INFRA_CONTAINER_IMAGE={{WrapAsVariable "kubernetesPodInfraContainerSpec"}}
     KUBELET_NODE_STATUS_UPDATE_FREQUENCY={{WrapAsVariable "kubernetesNodeStatusUpdateFrequency"}}
     KUBE_CTRL_MGR_NODE_MONITOR_GRACE_PERIOD={{WrapAsVariable "kubernetesCtrlMgrNodeMonitorGracePeriod"}}

diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml
@@ -201,7 +201,7 @@ write_files:
     KUBELET_NETWORK_PLUGIN=
     KUBELET_MAX_PODS=110
     DOCKER_OPTS=
-    KUBELET_NODE_LABELS={{GetMasterKubernetesLabels "',variables('resourceGroup'),'"}}
+    KUBELET_NODE_LABELS=kubernetes.io/role=master
     KUBELET_POD_INFRA_CONTAINER_IMAGE={{WrapAsVariable "kubernetesPodInfraContainerSpec"}}
     KUBELET_NODE_STATUS_UPDATE_FREQUENCY={{WrapAsVariable "kubernetesNodeStatusUpdateFrequency"}}
     KUBE_CTRL_MGR_NODE_MONITOR_GRACE_PERIOD={{WrapAsVariable "kubernetesCtrlMgrNodeMonitorGracePeriod"}}

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -756,16 +756,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			constraint, _ := semver.NewConstraint("~" + version)
 			return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes && constraint.Check(orchestratorVersion)
 		},
-		"GetMasterKubernetesLabels": func(rg string) string {
+		"GetKubernetesLabels": func(profile *api.AgentPoolProfile) string {
 			var buf bytes.Buffer
-			buf.WriteString(fmt.Sprintf("kubernetes.azure.com/cluster=%s", rg))
-			buf.WriteString(",kubernetes.io/role=master")
-			return buf.String()
-		},
-		"GetAgentKubernetesLabels": func(profile *api.AgentPoolProfile, rg string) string {
-			var buf bytes.Buffer
-			buf.WriteString(fmt.Sprintf("kubernetes.azure.com/cluster=%s", rg))
-			buf.WriteString(fmt.Sprintf(",kubernetes.io/role=agent,agentpool=%s", profile.Name))
+			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))