Merge pull request #29841 from mfojtik/fix-label-selector

Automatic merge from submit-queue Do not re-initialize the output on label selector conversion This conversion will always kill whatever is passed in the output. @kargakis @deads2k PTAL  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29841)

Merge pull request #29841 from mfojtik/fix-label-selector
47342520 · Kubernetes Submit Queue · GitHub · c97b7632 · e220f95d · 47342520
Commit 47342520 authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

conversion.go pkg/api/conversion.go +3 -0

No files found.
--- a/pkg/api/conversion.go
+++ b/pkg/api/conversion.go
@@ -234,6 +234,9 @@ func Convert_resource_Quantity_To_resource_Quantity(in *resource.Quantity, out *
 }

 func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *unversioned.LabelSelector, s conversion.Scope) error {
+	if in == nil {
+		return nil
+	}
 	out = new(unversioned.LabelSelector)
 	for labelKey, labelValue := range *in {
 		utillabels.AddLabelToSelector(out, labelKey, labelValue)