From 976cf098dd44beafc2a7759664fb5371a0597ab8 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 27 Oct 2017 10:55:31 -0700 Subject: [PATCH] ccm: move all argument handling to server --- .../app/controllermanager.go | 19 ++++++++++++++++++- .../controller-manager.go | 19 +------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index 5c1e4c78fad..29591b0f00b 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -83,7 +83,24 @@ func resyncPeriod(s *options.CloudControllerManagerServer) func() time.Duration } // Run runs the ExternalCMServer. This should never exit. -func Run(s *options.CloudControllerManagerServer, cloud cloudprovider.Interface) error { +func Run(s *options.CloudControllerManagerServer) error { + if s.CloudProvider == "" { + glog.Errorf("--cloud-provider cannot be empty") + } + + cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile) + if err != nil { + glog.Fatalf("Cloud provider could not be initialized: %v", err) + } + + if cloud.HasClusterID() == false { + if s.AllowUntaggedCloud == true { + glog.Warning("detected a cluster without a ClusterID. A ClusterID will be required in the future. Please tag your cluster to avoid any future issues") + } else { + glog.Fatalf("no ClusterID found. A ClusterID is required for the cloud provider to function properly. This check can be bypassed by setting the allow-untagged-cloud option") + } + } + if c, err := configz.New("componentconfig"); err == nil { c.Set(s.KubeControllerManagerConfiguration) } else { diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index 60bac4ac729..17f33112e8d 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -49,24 +49,7 @@ func main() { verflag.PrintAndExitIfRequested() - if s.CloudProvider == "" { - glog.Errorf("--cloud-provider cannot be empty") - } - - cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile) - if err != nil { - glog.Fatalf("Cloud provider could not be initialized: %v", err) - } - - if cloud.HasClusterID() == false { - if s.AllowUntaggedCloud == true { - glog.Warning("detected a cluster without a ClusterID. A ClusterID will be required in the future. Please tag your cluster to avoid any future issues") - } else { - glog.Fatalf("no ClusterID found. A ClusterID is required for the cloud provider to function properly. This check can be bypassed by setting the allow-untagged-cloud option") - } - } - - if err := app.Run(s, cloud); err != nil { + if err := app.Run(s); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) }