Refactor draining all nodegroups

eksctl-io · Sep 14, 2021 · 07146bf · 07146bf
1 parent 4643e74
commit 07146bf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/pkg/actions/cluster/delete.go b/pkg/actions/cluster/delete.go
@@ -165,13 +165,14 @@ func drainAllNodegroups(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, stackM
 	}
 
 	for _, s := range allStacks {
-		if s.Type != api.NodeGroupTypeManaged {
+		if s.Type == api.NodeGroupTypeUnmanaged {
 			if err := cmdutils.PopulateNodegroupFromStack(s.Type, s.NodeGroupName, cfg); err != nil {
 				return err
 			}
 		}
 	}
 
+	logger.Info("will drain %d unmanaged nodegroup(s) in cluster %q", len(cfg.NodeGroups), cfg.Metadata.Name)
 	nodeGroupManager := nodegroup.New(cfg, ctl, clientSet)
 	plan, disableEviction := false, false
 	if err := nodeGroupManager.Drain(cmdutils.ToKubeNodeGroups(cfg), plan, ctl.Provider.WaitTimeout(), disableEviction); err != nil {

diff --git a/pkg/actions/nodegroup/drain.go b/pkg/actions/nodegroup/drain.go
@@ -5,13 +5,10 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/eks"
 
-	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
 	"github.com/weaveworks/eksctl/pkg/drain"
 )
 
 func (m *Manager) Drain(nodeGroups []eks.KubeNodeGroup, plan bool, maxGracePeriod time.Duration, disableEviction bool) error {
-	cmdutils.LogIntendedAction(plan, "drain %d nodegroup(s) in cluster %q", len(nodeGroups), m.cfg.Metadata.Name)
-
 	if !plan {
 		for _, n := range nodeGroups {
 			nodeGroupDrainer := drain.NewNodeGroupDrainer(m.clientSet, n, m.ctl.Provider.WaitTimeout(), maxGracePeriod, false, disableEviction)

diff --git a/pkg/ctl/cmdutils/nodegroup.go b/pkg/ctl/cmdutils/nodegroup.go
@@ -32,30 +32,24 @@ func PopulateNodegroup(stackManager manager.StackManager, name string, cfg *api.
 func PopulateNodegroupFromStack(nodeGroupType api.NodeGroupType, nodeGroupName string, cfg *api.ClusterConfig) error {
 	switch nodeGroupType {
 	case api.NodeGroupTypeUnmanaged:
-		cfg.NodeGroups = []*api.NodeGroup{
-			{
-				NodeGroupBase: &api.NodeGroupBase{
-					Name: nodeGroupName,
-				},
+		cfg.NodeGroups = append(cfg.NodeGroups, &api.NodeGroup{
+			NodeGroupBase: &api.NodeGroupBase{
+				Name: nodeGroupName,
 			},
-		}
+		})
 	case api.NodeGroupTypeManaged:
-		cfg.ManagedNodeGroups = []*api.ManagedNodeGroup{
-			{
-				NodeGroupBase: &api.NodeGroupBase{
-					Name: nodeGroupName,
-				},
+		cfg.ManagedNodeGroups = append(cfg.ManagedNodeGroups, &api.ManagedNodeGroup{
+			NodeGroupBase: &api.NodeGroupBase{
+				Name: nodeGroupName,
 			},
-		}
+		})
 	case api.NodeGroupTypeUnowned:
-		cfg.ManagedNodeGroups = []*api.ManagedNodeGroup{
-			{
-				NodeGroupBase: &api.NodeGroupBase{
-					Name: nodeGroupName,
-				},
-				Unowned: true,
+		cfg.ManagedNodeGroups = append(cfg.ManagedNodeGroups, &api.ManagedNodeGroup{
+			NodeGroupBase: &api.NodeGroupBase{
+				Name: nodeGroupName,
 			},
-		}
+			Unowned: true,
+		})
 	}
 	return nil
 }
diff --git a/pkg/ctl/delete/nodegroup.go b/pkg/ctl/delete/nodegroup.go
@@ -120,6 +120,7 @@ func doDeleteNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, updateAuthConfigMap
 
 	nodeGroupManager := nodegroup.New(cfg, ctl, clientSet)
 	if deleteNodeGroupDrain {
+		cmdutils.LogIntendedAction(cmd.Plan, "drain %d nodegroup(s) in cluster %q", len(allNodeGroups), cfg.Metadata.Name)
 		err := nodeGroupManager.Drain(allNodeGroups, cmd.Plan, maxGracePeriod, disableEviction)
 		if err != nil {
 			logger.Warning("error occurred during drain, to skip drain use '--drain=false' flag")