Add more command line params - timeout and volume-iops

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Author: dims

pkg/resource/cluster/cluster.go

@@ -9,6 +9,13 @@ import (
 )
 
 func NewResource() *resource.Resource {
+	resManager := &eksctl.ResourceManager{
+		Resource: "cluster",
+		ConfigTemplate: &template.TextTemplate{
+			Template: eksctl.EksctlHeader + EksctlTemplate + nodegroup.EksctlTemplate,
+		},
+		DeleteFlags: []string{"--disable-nodegroup-eviction"},
+	}
 	res := &resource.Resource{
 		Command: cmd.Command{
 			Name:        "cluster",
@@ -17,19 +24,11 @@ func NewResource() *resource.Resource {
 			CreateArgs:  []string{"NAME"},
 			Args:        []string{"NAME"},
 		},
-
-		Getter: &Getter{},
-
-		Manager: &eksctl.ResourceManager{
-			Resource: "cluster",
-			ConfigTemplate: &template.TextTemplate{
-				Template: eksctl.EksctlHeader + EksctlTemplate + nodegroup.EksctlTemplate,
-			},
-			DeleteFlags: []string{"--disable-nodegroup-eviction"},
-		},
+		Getter:  &Getter{},
+		Manager: resManager,
 	}
 
-	return addOptions(res)
+	return addOptions(res, resManager)
 }
 
 const EksctlTemplate = `

pkg/resource/cluster/options.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"os"
 	"strings"
+	"time"
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
@@ -15,6 +16,7 @@ import (
 	"github.com/awslabs/eksdemo/pkg/application/storage/ebs_csi"
 	"github.com/awslabs/eksdemo/pkg/aws"
 	"github.com/awslabs/eksdemo/pkg/cmd"
+	"github.com/awslabs/eksdemo/pkg/eksctl"
 	"github.com/awslabs/eksdemo/pkg/kubernetes"
 	"github.com/awslabs/eksdemo/pkg/resource"
 	"github.com/awslabs/eksdemo/pkg/resource/cloudformation_stack"
@@ -46,9 +48,10 @@ type ClusterOptions struct {
 	appsForIrsa  []*application.Application
 	IrsaTemplate *template.TextTemplate
 	IrsaRoles    []*resource.Resource
+	Timeout      time.Duration
 }
 
-func addOptions(res *resource.Resource) *resource.Resource {
+func addOptions(res *resource.Resource, resMgr *eksctl.ResourceManager) *resource.Resource {
 	ngOptions, ngFlags, _ := nodegroup.NewOptions()
 
 	options := &ClusterOptions{
@@ -175,7 +178,7 @@ func addOptions(res *resource.Resource) *resource.Resource {
 			CommandFlag: cmd.CommandFlag{
 				Name:        "vpc-cidr",
 				Description: "CIDR to use for EKS Cluster VPC",
-				Validate: func(cmd *cobra.Command, args []string) error {
+				Validate: func(_ *cobra.Command, _ []string) error {
 					_, _, err := net.ParseCIDR(options.VpcCidr)
 					if err != nil {
 						return fmt.Errorf("failed parsing --vpc-cidr, %w", err)
@@ -199,6 +202,20 @@ func addOptions(res *resource.Resource) *resource.Resource {
 			},
 			Option: &options.Addons,
 		},
+		&cmd.DurationFlag{
+			CommandFlag: cmd.CommandFlag{
+				Name:        "timeout",
+				Description: "maximum waiting time for any long-running operation",
+				Validate: func(_ *cobra.Command, _ []string) error {
+					if options.Timeout.Seconds() > 0 {
+						resMgr.CreateFlags = append(resMgr.CreateFlags,
+							fmt.Sprintf("--timeout=%s", options.Timeout.String()))
+					}
+					return nil
+				},
+			},
+			Option: &options.Timeout,
+		},
 	}
 
 	res.CreateFlags = append(ngFlags, flags...)

pkg/resource/nodegroup/options.go

@@ -47,6 +47,7 @@ type NodegroupOptions struct {
 	SpotvCPUs        int
 	SpotMemory       int
 	Taints           []Taint
+	VolumeIOPS       int
 	VolumeSize       int
 	VolumeType       string
 
@@ -122,6 +123,21 @@ func NewOptions() (options *NodegroupOptions, createFlags, updateFlags cmd.Flags
 			},
 			Option: &options.VolumeType,
 		},
+		&cmd.IntFlag{
+			CommandFlag: cmd.CommandFlag{
+				Name:        "volume-iops",
+				Description: "IOPS for io1/io2 volumes",
+				Validate: func(_ *cobra.Command, _ []string) error {
+					if options.VolumeType == "io1" || options.VolumeType == "io2" {
+						if options.VolumeIOPS < 100 || options.VolumeIOPS > 64000 {
+							return fmt.Errorf("IOPS must be between 100 and 64000")
+						}
+					}
+					return nil
+				},
+			},
+			Option: &options.VolumeIOPS,
+		},
 		&cmd.IntFlag{
 			CommandFlag: cmd.CommandFlag{
 				Name:        "nodes",