Merge pull request #64697 from sttts/sttts-fuzzer-no-empty-label-keys

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>. apimachinery: do not fuzz ObjectMeta.{Labels/Annotation} with empty keys Fixes flaking `TestReplicationControllerConversion`.

Merge pull request #64697 from sttts/sttts-fuzzer-no-empty-label-keys
16c58044 · Kubernetes Submit Queue · GitHub · 86ae84b1 · 808bd370 · 16c58044
Unverified Commit 16c58044 authored Jun 04, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

fuzzer.go ...ng/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go +4 -0

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go
@@ -200,9 +200,13 @@ func v1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} {

 			if len(j.Labels) == 0 {
 				j.Labels = nil
+			} else {
+				delete(j.Labels, "")
 			}
 			if len(j.Annotations) == 0 {
 				j.Annotations = nil
+			} else {
+				delete(j.Annotations, "")
 			}
 			if len(j.OwnerReferences) == 0 {
 				j.OwnerReferences = nil