diff --git a/cmd/eksctl/delete.go b/cmd/eksctl/delete.go index e538fc3c8e..16d142f37e 100644 --- a/cmd/eksctl/delete.go +++ b/cmd/eksctl/delete.go @@ -14,10 +14,6 @@ import ( "github.com/weaveworks/eksctl/pkg/utils/kubeconfig" ) -var ( - waitDelete bool -) - func deleteCmd() *cobra.Command { cmd := &cobra.Command{ Use: "delete", @@ -55,8 +51,6 @@ func deleteClusterCmd() *cobra.Command { fs.StringVarP(&cfg.Region, "region", "r", "", "AWS region") fs.StringVarP(&cfg.Profile, "profile", "p", "", "AWS credentials profile to use (overrides the AWS_PROFILE environment variable)") - fs.BoolVarP(&waitDelete, "wait", "w", false, "Wait for deletion of all resources before exiting") - fs.DurationVar(&cfg.WaitTimeout, "timeout", api.DefaultWaitTimeout, "max wait time in any polling operations") return cmd @@ -99,28 +93,15 @@ func doDeleteCluster(cfg *api.ClusterConfig, name string) error { stackManager := ctl.NewStackManager() - if waitDelete { - handleIfError(stackManager.WaitDeleteNodeGroup(), "node group") - } else { - handleIfError(stackManager.DeleteNodeGroup(), "node group") - } - - var clusterErr bool - if waitDelete { - clusterErr = handleIfError(stackManager.WaitDeleteCluster(), "cluster") - } else { - clusterErr = handleIfError(stackManager.DeleteCluster(), "cluster") - } - - if clusterErr { + handleIfError(stackManager.WaitDeleteNodeGroup(), "node group") + if handleIfError(stackManager.DeleteCluster(), "cluster") { if handleIfError(ctl.DeprecatedDeleteControlPlane(), "control plane") { - handleIfError(stackManager.DeprecatedDeleteStackControlPlane(waitDelete), "stack control plane") + handleIfError(stackManager.DeprecatedDeleteStackControlPlane(), "stack control plane") } } - - handleIfError(stackManager.DeprecatedDeleteStackServiceRole(waitDelete), "node group") - handleIfError(stackManager.DeprecatedDeleteStackVPC(waitDelete), "stack VPC") - handleIfError(stackManager.DeprecatedDeleteStackDefaultNodeGroup(waitDelete), "default node group") + handleIfError(stackManager.DeprecatedDeleteStackServiceRole(), "node group") + handleIfError(stackManager.DeprecatedDeleteStackVPC(), "stack VPC") + handleIfError(stackManager.DeprecatedDeleteStackDefaultNodeGroup(), "default node group") ctl.MaybeDeletePublicSSHKey() diff --git a/humans.txt b/humans.txt index 77a7bb7bc4..830d58ccd7 100644 --- a/humans.txt +++ b/humans.txt @@ -22,7 +22,6 @@ Kirsten Schumy @kschumy Karinna Iniguez @karinnainiguez Michael Seiwald @mseiwald Anton Gruebel @gruebel -Bryan Peterson @lazyshot /* Thanks */ diff --git a/pkg/cfn/manager/cluster.go b/pkg/cfn/manager/cluster.go index 7037b40f27..474896fa9b 100644 --- a/pkg/cfn/manager/cluster.go +++ b/pkg/cfn/manager/cluster.go @@ -27,8 +27,3 @@ func (c *StackCollection) DeleteCluster() error { _, err := c.DeleteStack(c.makeClusterStackName()) return err } - -// WaitDeleteCluster waits till the cluster is deleted -func (c *StackCollection) WaitDeleteCluster() error { - return c.WaitDeleteStack(c.makeClusterStackName()) -} diff --git a/pkg/cfn/manager/deprecated.go b/pkg/cfn/manager/deprecated.go index 2b1a239d58..316f162533 100644 --- a/pkg/cfn/manager/deprecated.go +++ b/pkg/cfn/manager/deprecated.go @@ -1,57 +1,25 @@ package manager // DeprecatedDeleteStackVPC deletes the VPC stack -func (c *StackCollection) DeprecatedDeleteStackVPC(wait bool) error { - var err error - stackName := "EKS-" + c.spec.ClusterName + "-VPC" - - if wait { - err = c.WaitDeleteStack(stackName) - } else { - _, err = c.DeleteStack(stackName) - } - +func (c *StackCollection) DeprecatedDeleteStackVPC() error { + _, err := c.DeleteStack("EKS-" + c.spec.ClusterName + "-VPC") return err } // DeprecatedDeleteStackServiceRole deletes the service role stack -func (c *StackCollection) DeprecatedDeleteStackServiceRole(wait bool) error { - var err error - stackName := "EKS-" + c.spec.ClusterName + "-ServiceRole" - - if wait { - err = c.WaitDeleteStack(stackName) - } else { - _, err = c.DeleteStack(stackName) - } - +func (c *StackCollection) DeprecatedDeleteStackServiceRole() error { + _, err := c.DeleteStack("EKS-" + c.spec.ClusterName + "-ServiceRole") return err } // DeprecatedDeleteStackDefaultNodeGroup deletes the default node group stack -func (c *StackCollection) DeprecatedDeleteStackDefaultNodeGroup(wait bool) error { - var err error - stackName := "EKS-" + c.spec.ClusterName + "-DefaultNodeGroup" - - if wait { - err = c.WaitDeleteStack(stackName) - } else { - _, err = c.DeleteStack(stackName) - } - +func (c *StackCollection) DeprecatedDeleteStackDefaultNodeGroup() error { + _, err := c.DeleteStack("EKS-" + c.spec.ClusterName + "-DefaultNodeGroup") return err } // DeprecatedDeleteStackControlPlane deletes the control plane stack -func (c *StackCollection) DeprecatedDeleteStackControlPlane(wait bool) error { - var err error - stackName := "EKS-" + c.spec.ClusterName + "-ControlPlane" - - if wait { - err = c.WaitDeleteStack(stackName) - } else { - _, err = c.DeleteStack(stackName) - } - +func (c *StackCollection) DeprecatedDeleteStackControlPlane() error { + _, err := c.DeleteStack("EKS-" + c.spec.ClusterName + "-ControlPlane") return err }