github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Suppress registering GCE LB provider flag if missing on CommandLine.

Browse Source 
Fixes an issue with GCE-specific parameters breaking out-of-tree cloud
providers that do not host the flag in question.
This commit is contained in:
Timo Reimann 2019-04-15 21:06:04 +02:00
parent 252484705a
commit 16c150c15d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/cloud-controller-manager/app/controllermanager.go
View File

@ -18,6 +18,7 @@ package app
import (
"context"
"flag"
"fmt"
"net/http"
"os"
@ -86,9 +87,12 @@ the cloud specific control loops shipped with Kubernetes.`,
namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List())
verflag.AddFlags(namedFlagSets.FlagSet("global"))
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name())
// hoist this flag from the global flagset to preserve the commandline until
// the gce cloudprovider is removed.
globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs")
if flag.CommandLine.Lookup("cloud-provider-gce-lb-src-cidrs") != nil {
// hoist this flag from the global flagset to preserve the commandline until
// the gce cloudprovider is removed.
globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs")
}
for _, f := range namedFlagSets.FlagSets {
fs.AddFlagSet(f)
}