github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 04:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18427 from mesosphere/sttts-cloud-provider-npe

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-09 08:45:06 -08:00
parent 5b24758f84 60ce27cb50
commit 56cd501598
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudprovider/providers/mesos/client.go
View File

@@ -91,13 +91,19 @@ func (c *stateCache) cachedState(ctx context.Context) (*mesosState, error) {
// clusterName returns the cached Mesos cluster name.
func (c *stateCache) clusterName(ctx context.Context) (string, error) {
cached, err := c.cachedState(ctx)
return cached.clusterName, err
if err != nil {
return "", err
}
return cached.clusterName, nil
}
// nodes returns the cached list of slave nodes.
func (c *stateCache) nodes(ctx context.Context) (map[string]*slaveNode, error) {
cached, err := c.cachedState(ctx)
return cached.nodes, err
if err != nil {
return nil, err
}
return cached.nodes, nil
}
func newMesosClient(