Skip to content

Commit

Permalink
Update flags for eksctl drain ng
Browse files Browse the repository at this point in the history
- mirror what `eksctl delete ng` does, i.e.:
  - add functionality to drain multiple nodegroups with `--config-file`
  - and `--include`/`--exclude` filters
    - add `--only-missing` (inverted fitering)
    - add `--approve` (only with `--config-file`)
  • Loading branch information
errordeveloper committed Apr 16, 2019
1 parent 55f7ffa commit 60dc72f
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 23 deletions.
6 changes: 6 additions & 0 deletions pkg/ctl/drain/drain.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ import (
"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
)

var (
plan = true

clusterConfigFile = ""
)

// Command will create the `drain` commands
func Command(g *cmdutils.Grouping) *cobra.Command {
cmd := &cobra.Command{
Expand Down
70 changes: 47 additions & 23 deletions pkg/ctl/drain/nodegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ import (

var (
drainNodeGroupUndo bool

includeNodeGroups []string
excludeNodeGroups []string

drainOnlyMissingNodeGroups bool
)

func drainNodeGroupCmd(g *cmdutils.Grouping) *cobra.Command {
Expand All @@ -28,8 +33,8 @@ func drainNodeGroupCmd(g *cmdutils.Grouping) *cobra.Command {
Use: "nodegroup",
Short: "Cordon and drain a nodegroup",
Aliases: []string{"ng"},
Run: func(_ *cobra.Command, args []string) {
if err := doDrainNodeGroup(p, cfg, ng, cmdutils.GetNameArg(args)); err != nil {
Run: func(cmd *cobra.Command, args []string) {
if err := doDrainNodeGroup(p, cfg, ng, cmdutils.GetNameArg(args), cmd); err != nil {
logger.Critical("%s\n", err.Error())
os.Exit(1)
}
Expand All @@ -41,7 +46,11 @@ func drainNodeGroupCmd(g *cmdutils.Grouping) *cobra.Command {
group.InFlagSet("General", func(fs *pflag.FlagSet) {
fs.StringVar(&cfg.Metadata.Name, "cluster", "", "EKS cluster name")
cmdutils.AddRegionFlag(fs, p)
fs.StringVarP(&ng.Name, "name", "n", "", "Name of the nodegroup to delete (required)")
fs.StringVarP(&ng.Name, "name", "n", "", "Name of the nodegroup to delete")
cmdutils.AddConfigFileFlag(&clusterConfigFile, fs)
cmdutils.AddApproveFlag(&plan, cmd, fs)
cmdutils.AddNodeGroupFilterFlags(&includeNodeGroups, &excludeNodeGroups, fs)
fs.BoolVar(&drainOnlyMissingNodeGroups, "only-missing", false, "Only drain nodegroups that are not defined in the given config file")
fs.BoolVar(&drainNodeGroupUndo, "undo", false, "Uncordone the nodegroup")
})

Expand All @@ -52,33 +61,19 @@ func drainNodeGroupCmd(g *cmdutils.Grouping) *cobra.Command {
return cmd
}

func doDrainNodeGroup(p *api.ProviderConfig, cfg *api.ClusterConfig, ng *api.NodeGroup, nameArg string) error {
ctl := eks.New(p, cfg)
func doDrainNodeGroup(p *api.ProviderConfig, cfg *api.ClusterConfig, ng *api.NodeGroup, nameArg string, cmd *cobra.Command) error {
ngFilter := cmdutils.NewNodeGroupFilter()

if err := api.Register(); err != nil {
if err := cmdutils.NewDeleteNodeGroupLoader(p, cfg, ng, clusterConfigFile, nameArg, cmd, ngFilter, includeNodeGroups, excludeNodeGroups, &plan).Load(); err != nil {
return err
}

ctl := eks.New(p, cfg)

if err := ctl.CheckAuth(); err != nil {
return err
}

if cfg.Metadata.Name == "" {
return cmdutils.ErrMustBeSet("--cluster")
}

if ng.Name != "" && nameArg != "" {
return cmdutils.ErrNameFlagAndArg(ng.Name, nameArg)
}

if nameArg != "" {
ng.Name = nameArg
}

if ng.Name == "" {
return cmdutils.ErrMustBeSet("--name")
}

if err := ctl.GetCredentials(cfg); err != nil {
return errors.Wrapf(err, "getting credentials for cluster %q", cfg.Metadata.Name)
}
Expand All @@ -88,5 +83,34 @@ func doDrainNodeGroup(p *api.ProviderConfig, cfg *api.ClusterConfig, ng *api.Nod
return err
}

return drain.NodeGroup(clientSet, ng, ctl.Provider.WaitTimeout(), drainNodeGroupUndo)
stackManager := ctl.NewStackManager(cfg)

if clusterConfigFile != "" {
logger.Info("comparing %d nodegroups defined in the given config (%q) against remote state", len(cfg.NodeGroups), clusterConfigFile)
if err := ngFilter.SetIncludeOrExcludeMissingFilter(stackManager, drainOnlyMissingNodeGroups, &cfg.NodeGroups); err != nil {
return err
}
}

ngSubset, _ := ngFilter.MatchAll(cfg.NodeGroups)
ngCount := ngSubset.Len()

ngFilter.LogInfo(cfg.NodeGroups)
verb := "drain"
if drainNodeGroupUndo {
verb = "uncordon"
}
cmdutils.LogIntendedAction(plan, "%s %d nodegroups in cluster %q", verb, ngCount, cfg.Metadata.Name)

cmdutils.LogPlanModeWarning(plan && ngCount > 0)

return ngFilter.ForEach(cfg.NodeGroups, func(_ int, ng *api.NodeGroup) error {
if plan {
return nil
}
if err := drain.NodeGroup(clientSet, ng, ctl.Provider.WaitTimeout(), false); err != nil {
return err
}
return nil
})
}

0 comments on commit 60dc72f

Please sign in to comment.