Remove not existing labels check

kubernetes · Jun 8, 2017 · 5a1587f · 5a1587f
1 parent 1b9c444
commit 5a1587f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD
@@ -174,6 +174,7 @@ go_test(
         "//pkg/apis/componentconfig:go_default_library",
         "//pkg/capabilities:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
+        "//pkg/kubelet/apis:go_default_library",
         "//pkg/kubelet/cadvisor/testing:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/config:go_default_library",

diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go
@@ -159,7 +159,7 @@ func (kl *Kubelet) tryRegisterWithApiServer(node *v1.Node) bool {
 	return false
 }
 
-//updateDefaultLabels will set the default labels on the node
+// updateDefaultLabels will set the default labels on the node
 func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool {
 	defaultLabels := []string{
 		kubeletapis.LabelHostname,
@@ -170,11 +170,6 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool
 		kubeletapis.LabelArch,
 	}
 
-	if existingNode.Labels == nil {
-		existingNode.Labels = initialNode.Labels
-		return true
-	}
-
 	var needsUpdate bool = false
 	//Set default labels but make sure to not set labels with empty values
 	for _, label := range defaultLabels {