kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request https://github.com/kubernetes/contrib/pull/1215 from mwielgus/cloud-error 

Cluster-autoscaler: cloud config error handling
This commit is contained in:
Piotr Szczesniak 2016-06-15 13:00:31 +02:00 committed by GitHub
parent 44a14de2cf ffbad4c35a
commit a558a80a4f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster-autoscaler/cluster_autoscaler.go
View File

@ -82,17 +82,18 @@ func main() {
// GCE Manager // GCE Manager
var gceManager *gce.GceManager var gceManager *gce.GceManager
var gceError error
if *cloudConfig != "" { if *cloudConfig != "" {
config, err := os.Open(*cloudConfig) config, fileErr := os.Open(*cloudConfig)
if err != nil { if fileErr != nil {
glog.Fatalf("Couldn't open cloud provider configuration %s: %#v", *cloudConfig, err) glog.Fatalf("Couldn't open cloud provider configuration %s: %#v", *cloudConfig, err)
} }
defer config.Close() defer config.Close()
gceManager, err = gce.CreateGceManager(migConfigs, config) gceManager, gceError = gce.CreateGceManager(migConfigs, config)
} else { } else {
gceManager, err = gce.CreateGceManager(migConfigs, nil) gceManager, gceError = gce.CreateGceManager(migConfigs, nil)
} }
if err != nil { if gceError != nil {
glog.Fatalf("Failed to create GCE Manager: %v", err) glog.Fatalf("Failed to create GCE Manager: %v", err)
} }