Merge pull request #66307 from guoshimin/fixnilmap

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix a panic due to assignment to nil map **What this PR does / why we need it**: fix a panic due to assignment to nil map **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note Fixed a panic in the node status update logic when existing node has nil labels. ```

Merge pull request #66307 from guoshimin/fixnilmap
d4ac54ad · Kubernetes Submit Queue · GitHub · b1d97e5b · e8cd28ae · d4ac54ad
Unverified Commit d4ac54ad authored Jul 18, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 0 deletions

kubelet_node_status.go pkg/kubelet/kubelet_node_status.go +3 -0

kubelet_node_status_test.go pkg/kubelet/kubelet_node_status_test.go +27 -0

No files found.
--- a/pkg/kubelet/kubelet_node_status.go
+++ b/pkg/kubelet/kubelet_node_status.go
@@ -162,6 +162,9 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool 
 	}
 	var needsUpdate bool = false
+	if existingNode.Labels == nil {
+		existingNode.Labels = make(map[string]string)
+	}
 	//Set default labels but make sure to not set labels with empty values
 	for _, label := range defaultLabels {
 		if _, hasInitialValue := initialNode.Labels[label]; !hasInitialValue {

--- a/pkg/kubelet/kubelet_node_status_test.go
+++ b/pkg/kubelet/kubelet_node_status_test.go
@@ -1414,6 +1414,33 @@ func TestUpdateDefaultLabels(t *testing.T) {
 				kubeletapis.LabelArch:              "new-arch",
 			},
 		},
+		{
+			name: "not panic when existing node has nil labels",
+			initialNode: &v1.Node{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						kubeletapis.LabelHostname:          "new-hostname",
+						kubeletapis.LabelZoneFailureDomain: "new-zone-failure-domain",
+						kubeletapis.LabelZoneRegion:        "new-zone-region",
+						kubeletapis.LabelInstanceType:      "new-instance-type",
+						kubeletapis.LabelOS:                "new-os",
+						kubeletapis.LabelArch:              "new-arch",
+					},
+				},
+			},
+			existingNode: &v1.Node{
+				ObjectMeta: metav1.ObjectMeta{},
+			},
+			needsUpdate: true,
+			finalLabels: map[string]string{
+				kubeletapis.LabelHostname:          "new-hostname",
+				kubeletapis.LabelZoneFailureDomain: "new-zone-failure-domain",
+				kubeletapis.LabelZoneRegion:        "new-zone-region",
+				kubeletapis.LabelInstanceType:      "new-instance-type",
+				kubeletapis.LabelOS:                "new-os",
+				kubeletapis.LabelArch:              "new-arch",
+			},
+		},
 	}
 	for _, tc := range cases {