Merge pull request #4383 from nikimanoledaki/scale-ng-name-bug

Scale managed nodegroup with --name flag

pkg/actions/nodegroup/scale.go

@@ -16,7 +16,7 @@ import (
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
 
-func (m *Manager) Scale(ng *api.NodeGroup) error {
+func (m *Manager) Scale(ng *api.NodeGroupBase) error {
 	logger.Info("scaling nodegroup %q in cluster %s", ng.Name, m.cfg.Metadata.Name)
 
 	nodegroupStackInfos, err := m.stackManager.DescribeNodeGroupStacksAndResources()
@@ -48,7 +48,7 @@ func (m *Manager) Scale(ng *api.NodeGroup) error {
 	return nil
 }
 
-func (m *Manager) scaleUnmanagedNodeGroup(ng *api.NodeGroup, stackInfo manager.StackInfo) error {
+func (m *Manager) scaleUnmanagedNodeGroup(ng *api.NodeGroupBase, stackInfo manager.StackInfo) error {
 	asgName := ""
 	for _, resource := range stackInfo.Resources {
 		if *resource.LogicalResourceId == "NodeGroup" {
@@ -86,7 +86,7 @@ func (m *Manager) scaleUnmanagedNodeGroup(ng *api.NodeGroup, stackInfo manager.S
 	return nil
 }
 
-func (m *Manager) scaleManagedNodeGroup(ng *api.NodeGroup) error {
+func (m *Manager) scaleManagedNodeGroup(ng *api.NodeGroupBase) error {
 	scalingConfig := &eks.NodegroupScalingConfig{}
 
 	if ng.MaxSize != nil {

pkg/actions/nodegroup/scale_test.go

@@ -26,7 +26,7 @@ var _ = Describe("Scale", func() {
 		clusterName, ngName string
 		p                   *mockprovider.MockProvider
 		cfg                 *api.ClusterConfig
-		ng                  *api.NodeGroup
+		ng                  *api.NodeGroupBase
 		m                   *nodegroup.Manager
 		fakeStackManager    *fakes.FakeStackManager
 	)
@@ -37,13 +37,11 @@ var _ = Describe("Scale", func() {
 		cfg = api.NewClusterConfig()
 		cfg.Metadata.Name = clusterName
 
-		ng = &api.NodeGroup{
-			NodeGroupBase: &api.NodeGroupBase{
-				Name: ngName,
-				ScalingConfig: &api.ScalingConfig{
-					MinSize:         aws.Int(1),
-					DesiredCapacity: aws.Int(3),
-				},
+		ng = &api.NodeGroupBase{
+			Name: ngName,
+			ScalingConfig: &api.ScalingConfig{
+				MinSize:         aws.Int(1),
+				DesiredCapacity: aws.Int(3),
 			},
 		}
 		m = nodegroup.New(cfg, &eks.ClusterProvider{Provider: p}, nil)

pkg/apis/eksctl.io/v1alpha5/nodegroups.go

@@ -1,5 +1,7 @@
 package v1alpha5
 
+import "fmt"
+
 // HasInstanceType returns whether some node in the group fulfils the type check
 func HasInstanceType(nodeGroup *NodeGroup, hasType func(string) bool) bool {
 	if hasType(nodeGroup.InstanceType) {
@@ -44,14 +46,28 @@ func ClusterHasInstanceType(cfg *ClusterConfig, hasType func(string) bool) bool
 	return false
 }
 
-// HasNodegroup returns true if this clusterConfig contains a managed or un-managed nodegroup with the given name
-func (c *ClusterConfig) FindNodegroup(name string) *NodeGroup {
+// FindNodegroup checks if the clusterConfig contains a nodegroup with the given name
+func (c *ClusterConfig) FindNodegroup(name string) (*NodeGroupBase, error) {
+	var foundNg []*NodeGroupBase
 	for _, ng := range c.NodeGroups {
 		if name == ng.NameString() {
-			return ng
+			foundNg = append(foundNg, ng.NodeGroupBase)
 		}
 	}
-	return nil
+
+	for _, ng := range c.ManagedNodeGroups {
+		if name == ng.NameString() {
+			foundNg = append(foundNg, ng.NodeGroupBase)
+		}
+	}
+
+	if len(foundNg) == 0 {
+		return nil, fmt.Errorf("nodegroup %s not found in config file", name)
+	} else if len(foundNg) > 1 {
+		return nil, fmt.Errorf("found more than 1 nodegroup with name %s", name)
+	}
+
+	return foundNg[0], nil
 }
 
 // GetAllNodeGroupNames collects and returns names for both managed and unmanaged nodegroups

pkg/ctl/cmdutils/scale.go

@@ -7,7 +7,7 @@ import (
 )
 
 // NewScaleNodeGroupLoader will load config or use flags for 'eksctl scale nodegroup'
-func NewScaleNodeGroupLoader(cmd *Cmd, ng *api.NodeGroup) ClusterConfigLoader {
+func NewScaleNodeGroupLoader(cmd *Cmd, ng *api.NodeGroupBase) ClusterConfigLoader {
 	l := newCommonClusterConfigLoader(cmd)
 
 	l.flagsIncompatibleWithConfigFile.Insert(
@@ -22,9 +22,9 @@ func NewScaleNodeGroupLoader(cmd *Cmd, ng *api.NodeGroup) ClusterConfigLoader {
 			return err
 		}
 
-		loadedNG := l.ClusterConfig.FindNodegroup(ng.Name)
-		if loadedNG == nil {
-			return fmt.Errorf("node group %s not found", ng.Name)
+		loadedNG, err := l.ClusterConfig.FindNodegroup(ng.Name)
+		if err != nil {
+			return err
 		}
 
 		if err := validateNumberOfNodes(loadedNG); err != nil {
@@ -54,7 +54,7 @@ func NewScaleNodeGroupLoader(cmd *Cmd, ng *api.NodeGroup) ClusterConfigLoader {
 	return l
 }
 
-func validateNameArgument(cmd *Cmd, ng *api.NodeGroup) error {
+func validateNameArgument(cmd *Cmd, ng *api.NodeGroupBase) error {
 	if ng.Name != "" && cmd.NameArg != "" {
 		return ErrFlagAndArg("--name", ng.Name, cmd.NameArg)
 	}
@@ -70,7 +70,7 @@ func validateNameArgument(cmd *Cmd, ng *api.NodeGroup) error {
 	return nil
 }
 
-func validateNumberOfNodes(ng *api.NodeGroup) error {
+func validateNumberOfNodes(ng *api.NodeGroupBase) error {
 	if ng.ScalingConfig == nil {
 		ng.ScalingConfig = &api.ScalingConfig{}
 	}
@@ -103,7 +103,7 @@ func validateNumberOfNodes(ng *api.NodeGroup) error {
 }
 
 //only 1 of desired/min/max has to be set on the cli
-func validateNumberOfNodesCLI(ng *api.NodeGroup) error {
+func validateNumberOfNodesCLI(ng *api.NodeGroupBase) error {
 	if ng.ScalingConfig == nil {
 		ng.ScalingConfig = &api.ScalingConfig{}
 	}

pkg/ctl/cmdutils/scale_test.go

@@ -43,7 +43,7 @@ var _ = Describe("scale node group config file loader", func() {
 				NameArg:           params.name,
 			}
 
-			ng := api.NewNodeGroup()
+			ng := api.NewNodeGroup().BaseNodeGroup()
 			err := NewScaleNodeGroupLoader(cmd, ng).Load()
 			if params.err != nil {
 				Expect(err).To(HaveOccurred())
@@ -60,7 +60,7 @@ var _ = Describe("scale node group config file loader", func() {
 		}),
 		Entry("no node group matched", scaleNodeGroupCase{
 			name: "123123",
-			err:  fmt.Errorf("node group 123123 not found"),
+			err:  fmt.Errorf("nodegroup 123123 not found in config file"),
 		}),
 		Entry("with no desired capacity", scaleNodeGroupCase{
 			name: "ng-no-desired-capacity",
@@ -101,7 +101,7 @@ var _ = Describe("scale node group config file loader", func() {
 				NameArg:        params.name,
 			}
 
-			ng := api.NewNodeGroup()
+			ng := api.NewNodeGroup().BaseNodeGroup()
 			ng.MinSize = params.minSize
 			ng.MaxSize = params.maxSize
 			ng.DesiredCapacity = params.desiredSize
@@ -166,4 +166,39 @@ var _ = Describe("scale node group config file loader", func() {
 			err:  fmt.Errorf("at least one of minimum, maximum and desired nodes must be set"),
 		}),
 	)
+
+	Describe("for managed nodegroups", func() {
+		Context("when using a config file", func() {
+			It("setting --name finds that individual nodegroup", func() {
+				ngName := "mng-ng"
+				ng := &api.NodeGroupBase{
+					Name: ngName,
+					ScalingConfig: &api.ScalingConfig{
+						DesiredCapacity: aws.Int(2),
+					},
+				}
+
+				config := api.NewClusterConfig()
+				config.Metadata.Name = "test-cluster"
+				config.ManagedNodeGroups = []*api.ManagedNodeGroup{
+					{
+						NodeGroupBase: &api.NodeGroupBase{
+							Name: ngName,
+							ScalingConfig: &api.ScalingConfig{
+								DesiredCapacity: aws.Int(2),
+							},
+						},
+					},
+				}
+				cmd := &Cmd{
+					CobraCommand:   newCmd(),
+					ClusterConfig:  config,
+					ProviderConfig: api.ProviderConfig{},
+				}
+
+				err := NewScaleNodeGroupLoader(cmd, ng).Load()
+				Expect(err).NotTo(HaveOccurred())
+			})
+		})
+	})
 })

pkg/ctl/scale/nodegroup.go

@@ -11,14 +11,14 @@ import (
 )
 
 func scaleNodeGroupCmd(cmd *cmdutils.Cmd) {
-	scaleNodeGroupWithRunFunc(cmd, func(cmd *cmdutils.Cmd, ng *api.NodeGroup) error {
+	scaleNodeGroupWithRunFunc(cmd, func(cmd *cmdutils.Cmd, ng *api.NodeGroupBase) error {
 		return doScaleNodeGroup(cmd, ng)
 	})
 }
 
-func scaleNodeGroupWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.Cmd, ng *api.NodeGroup) error) {
+func scaleNodeGroupWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.Cmd, ng *api.NodeGroupBase) error) {
 	cfg := api.NewClusterConfig()
-	ng := cfg.NewNodeGroup()
+	ng := cfg.NewNodeGroup().BaseNodeGroup()
 	cmd.ClusterConfig = cfg
 
 	cmd.SetDescription("nodegroup", "Scale a nodegroup", "", "ng")
@@ -56,7 +56,7 @@ func scaleNodeGroupWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.Cmd
 	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
-func doScaleNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup) error {
+func doScaleNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroupBase) error {
 	if err := cmdutils.NewScaleNodeGroupLoader(cmd, ng).Load(); err != nil {
 		return err
 	}

pkg/ctl/scale/nodegroup_test.go

@@ -13,12 +13,12 @@ import (
 
 var _ = Describe("scale", func() {
 	Describe("nodegroup", func() {
-		DescribeTable("create cluster successfully",
+		DescribeTable("scales  a nodegroup successfully",
 			func(args ...string) {
 				cmd := newMockEmptyCmd(args...)
 				count := 0
 				cmdutils.AddResourceCmd(cmdutils.NewGrouping(), cmd.parentCmd, func(cmd *cmdutils.Cmd) {
-					scaleNodeGroupWithRunFunc(cmd, func(cmd *cmdutils.Cmd, ng *v1alpha5.NodeGroup) error {
+					scaleNodeGroupWithRunFunc(cmd, func(cmd *cmdutils.Cmd, ng *v1alpha5.NodeGroupBase) error {
 						if len(ng.Name) != 0 {
 							Expect(ng.Name).To(Or(Equal("nodeGroup"), Equal("")))
 						} else {