github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Separate func

Browse Source
This commit is contained in:
cici37 2021-01-21 12:47:45 -08:00
parent 7b0a6db097
commit 52bab024af
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloud-controller-manager/main.go
View File

@ -71,7 +71,7 @@ func main() {
// If you do not need additional controller, please ignore. // If you do not need additional controller, please ignore.
controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper
command := app.NewCloudControllerManagerCommand(cloudProviderName, ccmOptions, cloudInitializer, controllerInitializers) command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, controllerInitializers)
// 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

7
staging/src/k8s.io/cloud-provider/app/controllermanager.go
View File

@ -64,7 +64,7 @@ const (
) )
// NewCloudControllerManagerCommand creates a *cobra.Command object with default parameters // NewCloudControllerManagerCommand creates a *cobra.Command object with default parameters
func NewCloudControllerManagerCommand(cloudProviderName string, s *options.CloudControllerManagerOptions, cloudInitializer InitCloudFunc, initFuncConstructor map[string]InitFuncConstructor) *cobra.Command { func NewCloudControllerManagerCommand(s *options.CloudControllerManagerOptions, cloudInitializer InitCloudFunc, initFuncConstructor map[string]InitFuncConstructor) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "cloud-controller-manager", Use: "cloud-controller-manager",
@ -72,11 +72,6 @@ func NewCloudControllerManagerCommand(cloudProviderName string, s *options.Cloud
the cloud specific control loops shipped with Kubernetes.`, the cloud specific control loops shipped with Kubernetes.`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()
cloudProviderFlag := cmd.Flags().Lookup("cloud-provider")
if cloudProviderFlag.Value.String() == "" {
cloudProviderFlag.Value.Set(cloudProviderName)
}
cliflag.PrintFlags(cmd.Flags()) cliflag.PrintFlags(cmd.Flags())
c, err := s.Config(ControllerNames(initFuncConstructor), ControllersDisabledByDefault.List()) c, err := s.Config(ControllerNames(initFuncConstructor), ControllersDisabledByDefault.List())

2
staging/src/k8s.io/cloud-provider/sample/basic_main.go
View File

@ -54,7 +54,7 @@ func main() {
klog.Fatalf("unable to initialize command options: %v", err) klog.Fatalf("unable to initialize command options: %v", err)
} }
command := app.NewCloudControllerManagerCommand(sampleCloudProviderName, ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors) command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors)
// 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