From 9849079d4eeed380499e71355808fa540e57c2e3 Mon Sep 17 00:00:00 2001 From: cici37 Date: Wed, 17 Feb 2021 16:39:03 -0800 Subject: [PATCH] Address review comments --- cmd/cloud-controller-manager/nodeipamcontroller.go | 2 +- staging/src/k8s.io/cloud-provider/app/controllermanager.go | 2 -- staging/src/k8s.io/cloud-provider/app/testing/testserver.go | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/cloud-controller-manager/nodeipamcontroller.go b/cmd/cloud-controller-manager/nodeipamcontroller.go index 3d6d928db60..a39c40458cd 100644 --- a/cmd/cloud-controller-manager/nodeipamcontroller.go +++ b/cmd/cloud-controller-manager/nodeipamcontroller.go @@ -55,7 +55,7 @@ func startNodeIpamControllerWrapper(completedConfig *cloudcontrollerconfig.Compl nodeIPAMControllerOptions.AddFlags(fs) errors := nodeIPAMControllerOptions.Validate() if len(errors) > 0 { - klog.Fatal("NodeIPAM controller values are not properly.") + klog.Fatal("NodeIPAM controller values are not properly set.") } var nodeIPAMConfig nodeipamconfig.NodeIPAMControllerConfiguration nodeIPAMControllerOptions.ApplyTo(&nodeIPAMConfig) diff --git a/staging/src/k8s.io/cloud-provider/app/controllermanager.go b/staging/src/k8s.io/cloud-provider/app/controllermanager.go index 6e09069889d..66da8a259f0 100644 --- a/staging/src/k8s.io/cloud-provider/app/controllermanager.go +++ b/staging/src/k8s.io/cloud-provider/app/controllermanager.go @@ -78,7 +78,6 @@ the cloud specific control loops shipped with Kubernetes.`, if err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) return err - //os.Exit(1) } completedConfig := c.Complete() @@ -88,7 +87,6 @@ the cloud specific control loops shipped with Kubernetes.`, if err := Run(completedConfig, cloud, controllerInitializers, stopCh); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) return err - //os.Exit(1) } return nil }, diff --git a/staging/src/k8s.io/cloud-provider/app/testing/testserver.go b/staging/src/k8s.io/cloud-provider/app/testing/testserver.go index 1a5f2669c8f..cb5923a5f42 100644 --- a/staging/src/k8s.io/cloud-provider/app/testing/testserver.go +++ b/staging/src/k8s.io/cloud-provider/app/testing/testserver.go @@ -89,6 +89,7 @@ func StartTestServer(t Logger, customFlags []string) (result TestServer, err err cloudInitializer := func(config *config.CompletedConfig) cloudprovider.Interface { capturedConfig = *config + // send signal to indicate the capturedConfig has been properly set configDoneCh <- "" close(configDoneCh) cloudConfig := config.ComponentConfig.KubeCloudShared.CloudProvider