github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10635 from smarterclayton/cloud_provider_should_err

Browse Source 
Cloud provider should return an error
This commit is contained in:
Vish Kannan
2015-07-23 17:50:45 -07:00
parent c60238921f d8bb4552de
commit 2a5a6b99cb
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/mesos/pkg/controllermanager/controllermanager.go
View File

@@ -117,7 +117,10 @@ func (s *CMServer) Run(_ []string) error {
if s.CloudProvider != mesos.ProviderName {
glog.Fatalf("Only provider %v is supported, you specified %v", mesos.ProviderName, s.CloudProvider)
}
cloud := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
if err != nil {
glog.Fatalf("Cloud provider could not be initialized: %v", err)
}
nodeController := nodecontroller.NewNodeController(cloud, kubeClient, s.RegisterRetryCount,
s.PodEvictionTimeout, nodecontroller.NewPodEvictor(util.NewTokenBucketRateLimiter(s.DeletingPodsQps, s.DeletingPodsBurst)),