Skip to content

K
k3s
Unverified Commit e1fa1954 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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

Suppress registering GCE LB provider flag if missing on CommandLine.
parents c3ebf67c 16c150c1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
cmd/cloud-controller-manager/app/controllermanager.go
View file @ e1fa1954
...@@ -18,6 +18,7 @@ package app ...@@ -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.`, ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment