Merge pull request #17670 from hakman/skip-os-shutdown

k8s-ci-robot · web-flow · commit 17c167a572ef · 2025-10-14T01:17:41.000-07:00
aws: Bypass the graceful OS shutdown process on cluster deletion
diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go
@@ -336,7 +336,8 @@ func DeleteInstances(cloud fi.Cloud, t []*resources.Resource) error {
 
 		klog.Infof("Terminating %d EC2 instances", len(ids))
 		request := &ec2.TerminateInstancesInput{
-			InstanceIds: ids,
+			InstanceIds:    ids,
+			SkipOsShutdown: aws.Bool(true),
 		}
 		ids = []string{}
 		_, err := c.EC2().TerminateInstances(ctx, request)

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,8 @@ func DeleteInstances(cloud fi.Cloud, t []*resources.Resource) error {`
`336`	`336`
`337`	`337`	`klog.Infof("Terminating %d EC2 instances", len(ids))`
`338`	`338`	`request := &ec2.TerminateInstancesInput{`
`339`		`- InstanceIds: ids,`
	`339`	`+ InstanceIds: ids,`
	`340`	`+ SkipOsShutdown: aws.Bool(true),`
`340`	`341`	`}`
`341`	`342`	`ids = []string{}`
`342`	`343`	`_, err := c.EC2().TerminateInstances(ctx, request)`