From b9ea207ff7a127f73134ac73b821c395ccc15a6f Mon Sep 17 00:00:00 2001 From: wangyx1992 Date: Fri, 23 Apr 2021 11:38:28 +0800 Subject: [PATCH] cleanup: omit redundant nil check around loop in apiserver Signed-off-by: wangyx1992 --- cmd/kube-apiserver/app/server.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 8c9e28069cd..0ec831c9562 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -669,18 +669,17 @@ func Complete(s *options.ServerRunOptions) (completedServerRunOptions, error) { } } - if s.APIEnablement.RuntimeConfig != nil { - for key, value := range s.APIEnablement.RuntimeConfig { - if key == "v1" || strings.HasPrefix(key, "v1/") || - key == "api/v1" || strings.HasPrefix(key, "api/v1/") { - delete(s.APIEnablement.RuntimeConfig, key) - s.APIEnablement.RuntimeConfig["/v1"] = value - } - if key == "api/legacy" { - delete(s.APIEnablement.RuntimeConfig, key) - } + for key, value := range s.APIEnablement.RuntimeConfig { + if key == "v1" || strings.HasPrefix(key, "v1/") || + key == "api/v1" || strings.HasPrefix(key, "api/v1/") { + delete(s.APIEnablement.RuntimeConfig, key) + s.APIEnablement.RuntimeConfig["/v1"] = value + } + if key == "api/legacy" { + delete(s.APIEnablement.RuntimeConfig, key) } } + options.ServerRunOptions = s return options, nil }