Merge pull request #16 from DataDog/eric.mountain/filter-state-running

getInstanceByNodeName() needs to filter on running state
DataDog · Mar 25, 2020 · 984a3f3 · 984a3f3
2 parents 03c9acf + e950b8b
commit 984a3f3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go
@@ -4343,6 +4343,10 @@ func (c *Cloud) getInstanceByNodeName(nodeName types.NodeName) (*ec2.Instance, e
 		instance, err = c.findInstanceByNodeName(nodeName)
 	} else {
 		instance, err = c.getInstanceByID(string(awsID))
+		// Unless it's running, pretend it was not found
+		if err == nil && *instance.State.Name != "running" {
+			instance = nil
+		}
 	}
 	if err == nil && instance == nil {
 		return nil, cloudprovider.InstanceNotFound