Dont list and terminate ASG-managed EC2 instances

rifelpet · Jan 5, 2024 · 336f5af · 336f5af
1 parent 1202209
commit 336f5af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go
@@ -63,7 +63,6 @@ func ListResourcesAWS(cloud awsup.AWSCloud, clusterInfo resources.ClusterInfo) (
 	listFunctions := []listFn{
 		// EC2
 		ListAutoScalingGroups,
-		ListInstances,
 		ListKeypairs,
 		ListSecurityGroups,
 		ListVolumes,
@@ -88,6 +87,12 @@ func ListResourcesAWS(cloud awsup.AWSCloud, clusterInfo resources.ClusterInfo) (
 		ListEventBridgeRules,
 	}
 
+	if clusterInfo.UsesKarpenter {
+		// ASG deletion cascades to their instances
+		// Only karpenter-enabled clusters have instances not in ASGs
+		listFunctions = append(listFunctions, ListInstances)
+	}
+
 	if !dns.IsGossipClusterName(clusterName) && !clusterUsesNoneDNS {
 		// Route 53
 		listFunctions = append(listFunctions, ListRoute53Records)

diff --git a/pkg/resources/clusterinfo.go b/pkg/resources/clusterinfo.go
@@ -17,8 +17,9 @@ limitations under the License.
 package resources
 
 type ClusterInfo struct {
-	Name        string
-	UsesNoneDNS bool
+	Name          string
+	UsesNoneDNS   bool
+	UsesKarpenter bool
 	// Azure specific
 	AzureResourceGroupName   string
 	AzureResourceGroupShared bool

diff --git a/pkg/resources/ops/collector.go b/pkg/resources/ops/collector.go
@@ -41,8 +41,9 @@ import (
 // ListResources collects the resources from the specified cloud
 func ListResources(cloud fi.Cloud, cluster *kops.Cluster) (map[string]*resources.Resource, error) {
 	clusterInfo := resources.ClusterInfo{
-		Name:        cluster.Name,
-		UsesNoneDNS: cluster.UsesNoneDNS(),
+		Name:          cluster.Name,
+		UsesNoneDNS:   cluster.UsesNoneDNS(),
+		UsesKarpenter: cluster.Spec.Karpenter != nil && cluster.Spec.Karpenter.Enabled,
 	}
 
 	switch cloud.ProviderID() {