Skip to content

Commit fa74d48

Browse files
authored
feat(deployer/eksctl): allow deleting nodegroupds with --down, skip draining nodegroups option (#636)
* Allow deleting nodegroupds with --down * Skip draining as default when deleting nodegroups * nit: added args directly in execute command call
1 parent 023e56b commit fa74d48

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

internal/deployers/eksctl/down.go

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
package eksctl
22

33
import (
4+
"fmt"
5+
46
"github.com/aws/aws-k8s-tester/internal/util"
57
"k8s.io/klog"
68
)
79

810
func (d *deployer) Down() error {
9-
klog.Infof("deleting cluster %s", d.commonOptions.RunID())
10-
err := util.ExecuteCommand("eksctl", "delete", "cluster", "--name", d.commonOptions.RunID(), "--wait")
11-
if err != nil {
12-
return err
11+
d.initClusterName()
12+
13+
var err error
14+
15+
if d.DeployTarget == "nodegroup" {
16+
klog.Infof("deleting nodegroup %s from cluster %s", d.NodegroupName, d.clusterName)
17+
err = util.ExecuteCommand("eksctl", "delete", "nodegroup", "--cluster", d.clusterName, "--name", d.NodegroupName, "--drain=false", "--wait")
18+
if err != nil {
19+
return fmt.Errorf("failed to delete nodegroup: %v", err)
20+
}
21+
klog.Infof("Successfully deleted nodegroup: %s from cluster: %s", d.NodegroupName, d.clusterName)
22+
} else if d.DeployTarget == "cluster" {
23+
klog.Infof("deleting cluster %s", d.clusterName)
24+
err = util.ExecuteCommand("eksctl", "delete", "cluster", "--name", d.clusterName, "--wait")
25+
if err != nil {
26+
return fmt.Errorf("failed to delete cluster: %v", err)
27+
}
28+
klog.Infof("Successfully deleted cluster: %s", d.clusterName)
29+
} else {
30+
return fmt.Errorf("Unsupported deploy target: %s, supported options: `cluster`, `nodegroup`.", d.DeployTarget)
1331
}
14-
klog.Infof("deleted cluster: %s", d.commonOptions.RunID())
1532
return nil
1633
}

0 commit comments

Comments
 (0)