Merge pull request #63417 from smarterclayton/map_string

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>. FlagMaps may be nil (prior to being initialized) Do not panic if they haven't been set yet. Fixes: #64090

Merge pull request #63417 from smarterclayton/map_string
4c227ab8 · Kubernetes Submit Queue · GitHub · ac58ee4c · ccec4c50 · 4c227ab8
Unverified Commit 4c227ab8 authored May 24, 2018 by Kubernetes Submit Queue Committed by GitHub May 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

map_string_bool.go ...ing/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go +3 -0

map_string_string.go ...g/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go +3 -0

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go
@@ -39,6 +39,9 @@ func NewMapStringBool(m *map[string]bool) *MapStringBool {
 // String implements github.com/spf13/pflag.Value
 func (m *MapStringBool) String() string {
+	if m == nil || m.Map == nil {
+		return ""
+	}
 	pairs := []string{}
 	for k, v := range *m.Map {
 		pairs = append(pairs, fmt.Sprintf("%s=%t", k, v))

--- a/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go
@@ -50,6 +50,9 @@ func NewMapStringStringNoSplit(m *map[string]string) *MapStringString {
 // String implements github.com/spf13/pflag.Value
 func (m *MapStringString) String() string {
+	if m == nil || m.Map == nil {
+		return ""
+	}
 	pairs := []string{}
 	for k, v := range *m.Map {
 		pairs = append(pairs, fmt.Sprintf("%s=%s", k, v))