Use default token when tokenUrl not specified

piosz · piosz · commit f00e43a720f9 · 2016-06-15T14:28:33.000+02:00
diff --git a/cluster-autoscaler/utils/gce/gce.go b/cluster-autoscaler/utils/gce/gce.go
@@ -59,10 +59,11 @@ func CreateGceManager(migs []*config.MigConfig, configReader io.Reader) (*GceMan
 			return nil, err
 		}
 		if cfg.Global.TokenURL == "" {
-			return nil, fmt.Errorf("TokenURL not specified")
+			glog.Warning("Empty tokenUrl in cloud config")
+		} else {
+			glog.Infof("Using TokenSource from config %#v", tokenSource)
+			tokenSource = provider_gce.NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)
 		}
-		glog.Infof("Using TokenSource from config %#v", tokenSource)
-		tokenSource = provider_gce.NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)
 	} else {
 		glog.Infof("Using default TokenSource %#v", tokenSource)
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,11 @@ func CreateGceManager(migs []config.MigConfig, configReader io.Reader) (GceMan`
`59`	`59`	`return nil, err`
`60`	`60`	`}`
`61`	`61`	`if cfg.Global.TokenURL == "" {`
`62`		`- return nil, fmt.Errorf("TokenURL not specified")`
	`62`	`+ glog.Warning("Empty tokenUrl in cloud config")`
	`63`	`+ } else {`
	`64`	`+ glog.Infof("Using TokenSource from config %#v", tokenSource)`
	`65`	`+ tokenSource = provider_gce.NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)`
`63`	`66`	`}`
`64`		`- glog.Infof("Using TokenSource from config %#v", tokenSource)`
`65`		`- tokenSource = provider_gce.NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)`
`66`	`67`	`} else {`
`67`	`68`	`glog.Infof("Using default TokenSource %#v", tokenSource)`
`68`	`69`	`}`