mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
*-controller-manager: fix missing global flags for --help
This commit is contained in:
parent
1431aeb45d
commit
10dd5d6631
@ -25,20 +25,22 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"k8s.io/klog"
|
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
"k8s.io/apiserver/pkg/server"
|
"k8s.io/apiserver/pkg/server"
|
||||||
"k8s.io/apiserver/pkg/server/healthz"
|
"k8s.io/apiserver/pkg/server/healthz"
|
||||||
apiserverflag "k8s.io/apiserver/pkg/util/flag"
|
apiserverflag "k8s.io/apiserver/pkg/util/flag"
|
||||||
|
"k8s.io/apiserver/pkg/util/globalflag"
|
||||||
"k8s.io/client-go/kubernetes"
|
"k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/client-go/tools/leaderelection"
|
"k8s.io/client-go/tools/leaderelection"
|
||||||
"k8s.io/client-go/tools/leaderelection/resourcelock"
|
"k8s.io/client-go/tools/leaderelection/resourcelock"
|
||||||
cloudprovider "k8s.io/cloud-provider"
|
cloudprovider "k8s.io/cloud-provider"
|
||||||
|
"k8s.io/klog"
|
||||||
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
|
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
|
||||||
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
|
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
|
||||||
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
|
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
|
||||||
|
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
|
||||||
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
|
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
|
||||||
routecontroller "k8s.io/kubernetes/pkg/controller/route"
|
routecontroller "k8s.io/kubernetes/pkg/controller/route"
|
||||||
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
|
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
|
||||||
@ -86,6 +88,9 @@ the cloud specific control loops shipped with Kubernetes.`,
|
|||||||
|
|
||||||
fs := cmd.Flags()
|
fs := cmd.Flags()
|
||||||
namedFlagSets := s.Flags()
|
namedFlagSets := s.Flags()
|
||||||
|
verflag.AddFlags(namedFlagSets.FlagSet("global"))
|
||||||
|
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name())
|
||||||
|
cmoptions.AddCustomGlobalFlags(namedFlagSets.FlagSet("generic"))
|
||||||
for _, f := range namedFlagSets.FlagSets {
|
for _, f := range namedFlagSets.FlagSets {
|
||||||
fs.AddFlagSet(f)
|
fs.AddFlagSet(f)
|
||||||
}
|
}
|
||||||
|
@ -20,13 +20,11 @@ limitations under the License.
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
goflag "flag"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
utilflag "k8s.io/apiserver/pkg/util/flag"
|
|
||||||
"k8s.io/apiserver/pkg/util/logs"
|
"k8s.io/apiserver/pkg/util/logs"
|
||||||
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
|
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
|
||||||
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
|
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
|
||||||
@ -34,8 +32,6 @@ import (
|
|||||||
// implementing an out-of-tree cloud-provider.
|
// implementing an out-of-tree cloud-provider.
|
||||||
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
|
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
|
||||||
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
|
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
|
||||||
|
|
||||||
"github.com/spf13/pflag"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@ -46,8 +42,6 @@ func main() {
|
|||||||
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
||||||
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
||||||
// normalize func and add the go flag set by hand.
|
// normalize func and add the go flag set by hand.
|
||||||
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
|
|
||||||
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
|
|
||||||
// utilflag.InitFlags()
|
// utilflag.InitFlags()
|
||||||
logs.InitLogs()
|
logs.InitLogs()
|
||||||
defer logs.FlushLogs()
|
defer logs.FlushLogs()
|
||||||
|
@ -30,7 +30,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"k8s.io/klog"
|
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
@ -41,6 +40,7 @@ import (
|
|||||||
"k8s.io/apiserver/pkg/server/healthz"
|
"k8s.io/apiserver/pkg/server/healthz"
|
||||||
"k8s.io/apiserver/pkg/server/mux"
|
"k8s.io/apiserver/pkg/server/mux"
|
||||||
apiserverflag "k8s.io/apiserver/pkg/util/flag"
|
apiserverflag "k8s.io/apiserver/pkg/util/flag"
|
||||||
|
"k8s.io/apiserver/pkg/util/globalflag"
|
||||||
cacheddiscovery "k8s.io/client-go/discovery/cached"
|
cacheddiscovery "k8s.io/client-go/discovery/cached"
|
||||||
"k8s.io/client-go/informers"
|
"k8s.io/client-go/informers"
|
||||||
restclient "k8s.io/client-go/rest"
|
restclient "k8s.io/client-go/rest"
|
||||||
@ -49,7 +49,9 @@ import (
|
|||||||
"k8s.io/client-go/tools/leaderelection/resourcelock"
|
"k8s.io/client-go/tools/leaderelection/resourcelock"
|
||||||
certutil "k8s.io/client-go/util/cert"
|
certutil "k8s.io/client-go/util/cert"
|
||||||
cloudprovider "k8s.io/cloud-provider"
|
cloudprovider "k8s.io/cloud-provider"
|
||||||
|
"k8s.io/klog"
|
||||||
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
|
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
|
||||||
|
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
|
||||||
"k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
|
"k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
|
||||||
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
|
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
|
||||||
"k8s.io/kubernetes/pkg/controller"
|
"k8s.io/kubernetes/pkg/controller"
|
||||||
@ -112,6 +114,9 @@ controller, and serviceaccounts controller.`,
|
|||||||
|
|
||||||
fs := cmd.Flags()
|
fs := cmd.Flags()
|
||||||
namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List())
|
namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List())
|
||||||
|
verflag.AddFlags(namedFlagSets.FlagSet("global"))
|
||||||
|
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name())
|
||||||
|
cmoptions.AddCustomGlobalFlags(namedFlagSets.FlagSet("generic"))
|
||||||
for _, f := range namedFlagSets.FlagSets {
|
for _, f := range namedFlagSets.FlagSets {
|
||||||
fs.AddFlagSet(f)
|
fs.AddFlagSet(f)
|
||||||
}
|
}
|
||||||
|
@ -21,15 +21,11 @@ limitations under the License.
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
goflag "flag"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/pflag"
|
|
||||||
|
|
||||||
utilflag "k8s.io/apiserver/pkg/util/flag"
|
|
||||||
"k8s.io/apiserver/pkg/util/logs"
|
"k8s.io/apiserver/pkg/util/logs"
|
||||||
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
|
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
|
||||||
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
|
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
|
||||||
@ -46,8 +42,6 @@ func main() {
|
|||||||
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
||||||
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
||||||
// normalize func and add the go flag set by hand.
|
// normalize func and add the go flag set by hand.
|
||||||
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
|
|
||||||
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
|
|
||||||
// utilflag.InitFlags()
|
// utilflag.InitFlags()
|
||||||
logs.InitLogs()
|
logs.InitLogs()
|
||||||
defer logs.FlushLogs()
|
defer logs.FlushLogs()
|
||||||
|
@ -19,7 +19,6 @@ package globalflag
|
|||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
@ -28,7 +27,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// AddGlobalFlags explicitly registers flags that libraries (klog, verflag, etc.) register
|
// AddGlobalFlags explicitly registers flags that libraries (klog, verflag, etc.) register
|
||||||
// against the global flagsets from "flag" and "github.com/spf13/pflag".
|
// against the global flagsets from "flag" and "k8s.io/klog".
|
||||||
// We do this in order to prevent unwanted flags from leaking into the component's flagset.
|
// We do this in order to prevent unwanted flags from leaking into the component's flagset.
|
||||||
func AddGlobalFlags(fs *pflag.FlagSet, name string) {
|
func AddGlobalFlags(fs *pflag.FlagSet, name string) {
|
||||||
addGlogFlags(fs)
|
addGlogFlags(fs)
|
||||||
@ -39,21 +38,16 @@ func AddGlobalFlags(fs *pflag.FlagSet, name string) {
|
|||||||
|
|
||||||
// addGlogFlags explicitly registers flags that klog libraries(k8s.io/klog) register.
|
// addGlogFlags explicitly registers flags that klog libraries(k8s.io/klog) register.
|
||||||
func addGlogFlags(fs *pflag.FlagSet) {
|
func addGlogFlags(fs *pflag.FlagSet) {
|
||||||
// lookup flags in global flag set and re-register the values with our flagset
|
// lookup flags of klog libraries in global flag set and re-register the values with our flagset
|
||||||
global := flag.CommandLine
|
Register(fs, "logtostderr")
|
||||||
local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
|
Register(fs, "alsologtostderr")
|
||||||
|
Register(fs, "v")
|
||||||
register(global, local, "logtostderr")
|
Register(fs, "skip_headers")
|
||||||
register(global, local, "alsologtostderr")
|
Register(fs, "stderrthreshold")
|
||||||
register(global, local, "v")
|
Register(fs, "vmodule")
|
||||||
register(global, local, "skip_headers")
|
Register(fs, "log_backtrace_at")
|
||||||
register(global, local, "stderrthreshold")
|
Register(fs, "log_dir")
|
||||||
register(global, local, "vmodule")
|
Register(fs, "log_file")
|
||||||
register(global, local, "log_backtrace_at")
|
|
||||||
register(global, local, "log_dir")
|
|
||||||
register(global, local, "log_file")
|
|
||||||
|
|
||||||
fs.AddFlagSet(local)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// normalize replaces underscores with hyphens
|
// normalize replaces underscores with hyphens
|
||||||
@ -62,9 +56,9 @@ func normalize(s string) string {
|
|||||||
return strings.Replace(s, "_", "-", -1)
|
return strings.Replace(s, "_", "-", -1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// register adds a flag to local that targets the Value associated with the Flag named globalName in global
|
// Register adds a flag to local that targets the Value associated with the Flag named globalName in flag.CommandLine.
|
||||||
func register(global *flag.FlagSet, local *pflag.FlagSet, globalName string) {
|
func Register(local *pflag.FlagSet, globalName string) {
|
||||||
if f := global.Lookup(globalName); f != nil {
|
if f := flag.CommandLine.Lookup(globalName); f != nil {
|
||||||
pflagFlag := pflag.PFlagFromGoFlag(f)
|
pflagFlag := pflag.PFlagFromGoFlag(f)
|
||||||
pflagFlag.Name = normalize(pflagFlag.Name)
|
pflagFlag.Name = normalize(pflagFlag.Name)
|
||||||
local.AddFlag(pflagFlag)
|
local.AddFlag(pflagFlag)
|
||||||
|
Loading…
Reference in New Issue
Block a user