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

Merge pull request #31618 from sjenning/fix-externalid-error

Browse Source 
Automatic merge from submit-queue

return cloudprovider.InstanceNotFound for Instance interface ExternalID()

Fixes #31615 

@kubernetes/rh-cluster-infra @ncdc @anguslees
This commit is contained in:
Kubernetes Submit Queue
2016-09-11 23:28:12 -07:00
committed by GitHub
parent 8a77e3fdb7 bde3966699
commit fe08d0ad0f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cloudprovider/providers/openstack/openstack_instances.go
View File

@@ -136,6 +136,9 @@ func (i *Instances) NodeAddresses(name string) ([]api.NodeAddress, error) {
func (i *Instances) ExternalID(name string) (string, error) { func (i *Instances) ExternalID(name string) (string, error) {
srv, err := getServerByName(i.compute, name) srv, err := getServerByName(i.compute, name)
if err != nil { if err != nil {
if err == ErrNotFound {
return "", cloudprovider.InstanceNotFound
}
return "", err return "", err
} }
return srv.ID, nil return srv.ID, nil