github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4311 from kazegusuri/update_nil_label

Browse Source 
kubectl label command crashes when a resource has no labels
This commit is contained in:
Brendan Burns 2015-02-20 15:52:05 -08:00
commit 86a0193f51
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/label.go
View File

@ -160,6 +160,10 @@ func labelFunc(obj runtime.Object, overwrite bool, resourceVersion string, label
} }
} }
if meta.Labels == nil {
meta.Labels = make(map[string]string)
}
for key, value := range labels { for key, value := range labels {
meta.Labels[key] = value meta.Labels[key] = value
} }

11
pkg/kubectl/cmd/label_test.go
View File

@ -230,6 +230,17 @@ func TestLabelFunc(t *testing.T) {
}, },
}, },
}, },
{
obj: &api.Pod{
ObjectMeta: api.ObjectMeta{},
},
labels: map[string]string{"a": "b"},
expected: &api.Pod{
ObjectMeta: api.ObjectMeta{
Labels: map[string]string{"a": "b"},
},
},
},
} }
for _, test := range tests { for _, test := range tests {
out, err := labelFunc(test.obj, test.overwrite, test.version, test.labels, test.remove) out, err := labelFunc(test.obj, test.overwrite, test.version, test.labels, test.remove)