From 52bab024af652a8247e5395ea74354adbf93399f Mon Sep 17 00:00:00 2001 From: cici37 Date: Thu, 21 Jan 2021 12:47:45 -0800 Subject: [PATCH] Separate func --- cmd/cloud-controller-manager/main.go | 2 +- staging/src/k8s.io/cloud-provider/app/controllermanager.go | 7 +------ staging/src/k8s.io/cloud-provider/sample/basic_main.go | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd/cloud-controller-manager/main.go b/cmd/cloud-controller-manager/main.go index e5373b1e7ca..f9ff9a57080 100644 --- a/cmd/cloud-controller-manager/main.go +++ b/cmd/cloud-controller-manager/main.go @@ -71,7 +71,7 @@ func main() { // If you do not need additional controller, please ignore. 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 // utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the diff --git a/staging/src/k8s.io/cloud-provider/app/controllermanager.go b/staging/src/k8s.io/cloud-provider/app/controllermanager.go index 58c93bd80e9..513d12213fd 100644 --- a/staging/src/k8s.io/cloud-provider/app/controllermanager.go +++ b/staging/src/k8s.io/cloud-provider/app/controllermanager.go @@ -64,7 +64,7 @@ const ( ) // 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{ Use: "cloud-controller-manager", @@ -72,11 +72,6 @@ func NewCloudControllerManagerCommand(cloudProviderName string, s *options.Cloud the cloud specific control loops shipped with Kubernetes.`, Run: func(cmd *cobra.Command, args []string) { verflag.PrintAndExitIfRequested() - - cloudProviderFlag := cmd.Flags().Lookup("cloud-provider") - if cloudProviderFlag.Value.String() == "" { - cloudProviderFlag.Value.Set(cloudProviderName) - } cliflag.PrintFlags(cmd.Flags()) c, err := s.Config(ControllerNames(initFuncConstructor), ControllersDisabledByDefault.List()) diff --git a/staging/src/k8s.io/cloud-provider/sample/basic_main.go b/staging/src/k8s.io/cloud-provider/sample/basic_main.go index 50592eb85ca..3bda02e55e9 100644 --- a/staging/src/k8s.io/cloud-provider/sample/basic_main.go +++ b/staging/src/k8s.io/cloud-provider/sample/basic_main.go @@ -54,7 +54,7 @@ func main() { 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 // utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the