github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76627 from timoreimann/handle-missing-gce-lb-flag-gracefully 

Suppress registering GCE LB provider flag if missing on CommandLine.
k3s-v1.15.3
Kubernetes Prow Robot 2019-05-03 21:01:39 -07:00 committed by GitHub
parent c3ebf67c63 16c150c15d
commit e1fa195451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ( import (
"context" "context"
"flag"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -86,9 +87,12 @@ the cloud specific control loops shipped with Kubernetes.`,
namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List()) namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List())
verflag.AddFlags(namedFlagSets.FlagSet("global")) verflag.AddFlags(namedFlagSets.FlagSet("global"))
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name()) globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name())
// hoist this flag from the global flagset to preserve the commandline until
// the gce cloudprovider is removed. if flag.CommandLine.Lookup("cloud-provider-gce-lb-src-cidrs") != nil {
globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs") // 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 { for _, f := range namedFlagSets.FlagSets {
fs.AddFlagSet(f) fs.AddFlagSet(f)
} }