github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
cici37 2021-02-17 16:39:03 -08:00
parent b669f04648
commit 9849079d4e
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ func startNodeIpamControllerWrapper(completedConfig *cloudcontrollerconfig.Compl
nodeIPAMControllerOptions.AddFlags(fs) nodeIPAMControllerOptions.AddFlags(fs)
errors := nodeIPAMControllerOptions.Validate() errors := nodeIPAMControllerOptions.Validate()
if len(errors) > 0 { 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 var nodeIPAMConfig nodeipamconfig.NodeIPAMControllerConfiguration
nodeIPAMControllerOptions.ApplyTo(&nodeIPAMConfig) nodeIPAMControllerOptions.ApplyTo(&nodeIPAMConfig)

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

@ -78,7 +78,6 @@ the cloud specific control loops shipped with Kubernetes.`,
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return err return err
//os.Exit(1)
} }
completedConfig := c.Complete() completedConfig := c.Complete()
@ -88,7 +87,6 @@ the cloud specific control loops shipped with Kubernetes.`,
if err := Run(completedConfig, cloud, controllerInitializers, stopCh); err != nil { if err := Run(completedConfig, cloud, controllerInitializers, stopCh); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return err return err
//os.Exit(1)
} }
return nil return nil
}, },

1
staging/src/k8s.io/cloud-provider/app/testing/testserver.go
View File

@ -89,6 +89,7 @@ func StartTestServer(t Logger, customFlags []string) (result TestServer, err err
cloudInitializer := func(config *config.CompletedConfig) cloudprovider.Interface { cloudInitializer := func(config *config.CompletedConfig) cloudprovider.Interface {
capturedConfig = *config capturedConfig = *config
// send signal to indicate the capturedConfig has been properly set
configDoneCh <- "" configDoneCh <- ""
close(configDoneCh) close(configDoneCh)
cloudConfig := config.ComponentConfig.KubeCloudShared.CloudProvider cloudConfig := config.ComponentConfig.KubeCloudShared.CloudProvider