Merge pull request #68000 from zetaab/removerun

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. backport https://github.com/kubernetes/cloud-provider-openstack/pull/43 Backporting https://github.com/kubernetes/cloud-provider-openstack/pull/43 @dims @FengyunPan2 ```release-note NONE ```

Merge pull request #68000 from zetaab/removerun
6ea8e3d6 · Kubernetes Submit Queue · GitHub · 11387279 · c4ff3d05 · 6ea8e3d6
Unverified Commit 6ea8e3d6 authored Aug 29, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

openstack_instances.go pkg/cloudprovider/providers/openstack/openstack_instances.go +2 -7

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_instances.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go
@@ -106,7 +106,7 @@ func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID st
 	return addresses, nil
 }

-// InstanceExistsByProviderID returns true if the instance with the given provider id still exists and is running.
+// InstanceExistsByProviderID returns true if the instance with the given provider id still exist.
 // If false is returned with no error, the instance will be immediately deleted by the cloud controller manager.
 func (i *Instances) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) {
 	instanceID, err := instanceIDFromProviderID(providerID)
@@ -114,7 +114,7 @@ func (i *Instances) InstanceExistsByProviderID(ctx context.Context, providerID s
 		return false, err
 	}

-	server, err := servers.Get(i.compute, instanceID).Extract()
+	_, err = servers.Get(i.compute, instanceID).Extract()
 	if err != nil {
 		if isNotFound(err) {
 			return false, nil
@@ -122,11 +122,6 @@ func (i *Instances) InstanceExistsByProviderID(ctx context.Context, providerID s
 		return false, err
 	}

-	if server.Status != "ACTIVE" {
-		glog.Warningf("the instance %s is not active", instanceID)
-		return false, nil
-	}
-
 	return true, nil
 }