Merge pull request #4116 from parryjacob/4112-allow-remove-unknown

Ignore "unknown instance" error when rm instance
docker · Jun 2, 2017 · 4c51397 · 4c51397
2 parents d889abc + fc0fe0e
commit 4c51397
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -950,6 +950,12 @@ func (d *Driver) terminate() error {
 	_, err := d.getClient().TerminateInstances(&ec2.TerminateInstancesInput{
 		InstanceIds: []*string{&d.InstanceId},
 	})
+
+	if strings.HasPrefix(err.Error(), "unknown instance") {
+		log.Warn("Remote instance does not exist, proceeding with removing local reference")
+		return nil
+	}
+
 	if err != nil {
 		return fmt.Errorf("unable to terminate instance: %s", err)
 	}