mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
3948cb8d1b
These three options are the ones from logs.AddFlags which are not deprecated. Therefore it makes sense to make them available also via the configuration file support in the one command which currently supports that (kubelet). Long-term, all commands should use LoggingConfiguration, either with a configuration file (as in kubelet) or via flags (kube-scheduler, kube-apiserver, kube-controller-manager). Short-term, both approaches have to be supported. As the majority of the commands only use logs.AddFlags, that function by default continues to register the flags and only leaves that to Options.AddFlags when explicitly requested. A drive-by bug fix is done for log flushing: the periodic flushing called klog.Flush and therefore missed explicit flushing of the newer logr backend. This bug was never present in any release Kubernetes and therefore the fix is not submitted in a separate PR.
89 lines
3.0 KiB
Go
89 lines
3.0 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package options
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/pflag"
|
|
|
|
// libs that provide registration functions
|
|
"k8s.io/component-base/logs"
|
|
"k8s.io/component-base/version/verflag"
|
|
|
|
// ensure libs have a chance to globally register their flags
|
|
_ "k8s.io/kubernetes/pkg/credentialprovider/azure"
|
|
_ "k8s.io/kubernetes/pkg/credentialprovider/gcp"
|
|
)
|
|
|
|
// AddGlobalFlags explicitly registers flags that libraries (glog, verflag, etc.) register
|
|
// against the global flagsets from "flag" and "github.com/spf13/pflag".
|
|
// We do this in order to prevent unwanted flags from leaking into the Kubelet's flagset.
|
|
func AddGlobalFlags(fs *pflag.FlagSet) {
|
|
addCadvisorFlags(fs)
|
|
addCredentialProviderFlags(fs)
|
|
verflag.AddFlags(fs)
|
|
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
|
|
}
|
|
|
|
// normalize replaces underscores with hyphens
|
|
// we should always use hyphens instead of underscores when registering kubelet flags
|
|
func normalize(s string) string {
|
|
return strings.Replace(s, "_", "-", -1)
|
|
}
|
|
|
|
// register adds a flag to local that targets the Value associated with the Flag named globalName in global
|
|
func register(global *flag.FlagSet, local *pflag.FlagSet, globalName string) {
|
|
if f := global.Lookup(globalName); f != nil {
|
|
pflagFlag := pflag.PFlagFromGoFlag(f)
|
|
pflagFlag.Name = normalize(pflagFlag.Name)
|
|
local.AddFlag(pflagFlag)
|
|
} else {
|
|
panic(fmt.Sprintf("failed to find flag in global flagset (flag): %s", globalName))
|
|
}
|
|
}
|
|
|
|
// pflagRegister adds a flag to local that targets the Value associated with the Flag named globalName in global
|
|
func pflagRegister(global, local *pflag.FlagSet, globalName string) {
|
|
if f := global.Lookup(globalName); f != nil {
|
|
f.Name = normalize(f.Name)
|
|
local.AddFlag(f)
|
|
} else {
|
|
panic(fmt.Sprintf("failed to find flag in global flagset (pflag): %s", globalName))
|
|
}
|
|
}
|
|
|
|
// registerDeprecated registers the flag with register, and then marks it deprecated
|
|
func registerDeprecated(global *flag.FlagSet, local *pflag.FlagSet, globalName, deprecated string) {
|
|
register(global, local, globalName)
|
|
local.Lookup(normalize(globalName)).Deprecated = deprecated
|
|
}
|
|
|
|
// addCredentialProviderFlags adds flags from k8s.io/kubernetes/pkg/credentialprovider
|
|
func addCredentialProviderFlags(fs *pflag.FlagSet) {
|
|
// lookup flags in global flag set and re-register the values with our flagset
|
|
global := pflag.CommandLine
|
|
local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
|
|
|
|
addLegacyCloudProviderCredentialProviderFlags(global, local)
|
|
|
|
fs.AddFlagSet(local)
|
|
}
|