From 65835368d547f2869478016c84f94937cf523afa Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 3 May 2018 22:11:55 -0400 Subject: [PATCH] UPSTREAM: 63417: Panic when map string bool flag has no value --- .../src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go | 3 +++ .../src/k8s.io/apiserver/pkg/util/flag/map_string_string.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go index 46ed43836f22..c757234ccd3d 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_bool.go +++ b/vendor/k8s.io/kubernetes/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.Map == nil { + return "" + } pairs := []string{} for k, v := range *m.Map { pairs = append(pairs, fmt.Sprintf("%s=%t", k, v)) diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go index 48468a8dd68f..1de591ec1c20 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag/map_string_string.go @@ -38,6 +38,9 @@ func NewMapStringString(m *map[string]string) *MapStringString { // String implements github.com/spf13/pflag.Value func (m *MapStringString) String() string { + if m.Map == nil { + return "" + } pairs := []string{} for k, v := range *m.Map { pairs = append(pairs, fmt.Sprintf("%s=%s", k, v))