DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle a nil configuration file

Browse source
This commit is contained in:
Nick Sardo 2017-08-15 16:56:51 -07:00
parent 1516493946
commit df659732ff
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
controllers/gce/controller/cluster_manager.go
View file

@ -212,9 +212,20 @@ func (c *ClusterManager) GC(lbNames []string, nodePorts []backends.ServicePort)
} }
func getGCEClient(config io.Reader) *gce.GCECloud { func getGCEClient(config io.Reader) *gce.GCECloud {
allConfig, err := ioutil.ReadAll(config) getConfigReader := func() io.Reader { return nil }
if err != nil {
glog.Fatalf("Error while reading entire config: %v", err) if config != nil {
allConfig, err := ioutil.ReadAll(config)
if err != nil {
glog.Fatalf("Error while reading entire config: %v", err)
}
glog.V(2).Infof("Using cloudprovider config file:\n%v ", string(allConfig))
getConfigReader = func() io.Reader {
return bytes.NewReader(allConfig)
}
} else {
glog.V(2).Infoln("No cloudprovider config file provided. Continuing with default values.")
} }
// Creating the cloud interface involves resolving the metadata server to get // Creating the cloud interface involves resolving the metadata server to get
@ -222,7 +233,7 @@ func getGCEClient(config io.Reader) *gce.GCECloud {
// No errors are thrown. So we need to keep retrying till it works because // No errors are thrown. So we need to keep retrying till it works because
// we know we're on GCE. // we know we're on GCE.
for { for {
cloudInterface, err := cloudprovider.GetCloudProvider("gce", bytes.NewReader(allConfig)) cloudInterface, err := cloudprovider.GetCloudProvider("gce", getConfigReader())
if err == nil { if err == nil {
cloud := cloudInterface.(*gce.GCECloud) cloud := cloudInterface.(*gce.GCECloud)