Skip to content

Commit 9597bcc

Browse files
authored
Update cluster deletion logic (#2271)
1 parent 3da40c0 commit 9597bcc

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

cli/cmd/cluster.go

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -475,22 +475,11 @@ var _clusterDownCmd = &cobra.Command{
475475
errors.PrintError(err)
476476
fmt.Println()
477477
} else {
478-
state := clusterstate.GetClusterState(stacks)
479-
if err := clusterstate.AssertClusterState(stacks, state, clusterstate.StateClusterDoesntExist); err != nil {
480-
awsClient.DeleteQueuesWithPrefix(clusterconfig.SQSNamePrefix(accessConfig.ClusterName))
481-
awsClient.DeletePolicy(clusterconfig.DefaultPolicyARN(accountID, accessConfig.ClusterName, accessConfig.Region))
482-
if !_flagClusterDownKeepAWSResources {
483-
volumes, err := listPVCVolumesForCluster(awsClient, accessConfig.ClusterName)
484-
if err == nil {
485-
for _, volume := range volumes {
486-
awsClient.DeleteVolume(*volume.VolumeId)
487-
}
488-
}
489-
}
478+
if clusterstate.GetClusterState(stacks) == clusterstate.StateClusterDoesntExist {
479+
fmt.Println("cluster doesn't exist ✓")
480+
} else {
490481
fmt.Println("✓")
491482
clusterExists = true
492-
} else {
493-
fmt.Println("already deleted ✓")
494483
}
495484
}
496485

0 commit comments

Comments
 (0)