Additional volume options

api/v1alpha1/instancegroup_types.go

@@ -187,14 +187,18 @@ type EKSConfiguration struct {
 
 type UserDataStage struct {
 	Name  string `json:"name,omitempty"`
-	Stage string `json:"stage,omitempty"`
-	Data  string `json:"data,omitempty"`
+	Stage string `json:"stage"`
+	Data  string `json:"data"`
 }
 
 type NodeVolume struct {
-	Name string `json:"name,omitempty"`
-	Type string `json:"type,omitempty"`
-	Size int64  `json:"size,omitempty"`
+	Name                string `json:"name"`
+	Type                string `json:"type"`
+	Size                int64  `json:"size"`
+	Iops                int64  `json:"iops,omitempty"`
+	DeleteOnTermination *bool  `json:"deleteOnTermination,omitempty"`
+	Encrypted           *bool  `json:"encrypted,omitempty"`
+	SnapshotID          string `json:"snapshotId,omitempty"`
 }
 type EKSFargateSpec struct {
 	ClusterName         string                `json:"clusterName"`
@@ -313,6 +317,21 @@ func (c *EKSConfiguration) Validate() error {
 	if common.StringEmpty(c.KeyPairName) {
 		return errors.Errorf("validation failed, 'keyPair' is a required parameter")
 	}
+
+	for _, v := range c.Volumes {
+		if !common.ContainsEqualFold(awsprovider.AllowedVolumeTypes, v.Type) {
+			return errors.Errorf("validation failed, volume type '%v' is unsuppoeted", v.Type)
+		}
+		if v.SnapshotID != "" {
+			if v.Size > 0 {
+				return errors.Errorf("validation failed, 'volume.snapshotId' and 'volume.size' are mutually exclusive")
+			}
+		}
+		if v.Iops != 0 && v.Iops < 100 {
+			return errors.Errorf("validation failed, volume IOPS must be min 100")
+		}
+	}
+
 	if len(c.Volumes) == 0 {
 		c.Volumes = []NodeVolume{
 			{

config/crd/bases/instancemgr.keikoproj.io_instancegroups.yaml

@@ -158,18 +158,34 @@ spec:
                             type: string
                           stage:
                             type: string
+                        required:
+                        - data
+                        - stage
                         type: object
                       type: array
                     volumes:
                       items:
                         properties:
+                          deleteOnTermination:
+                            type: boolean
+                          encrypted:
+                            type: boolean
+                          iops:
+                            format: int64
+                            type: integer
                           name:
                             type: string
                           size:
                             format: int64
                             type: integer
+                          snapshotId:
+                            type: string
                           type:
                             type: string
+                        required:
+                        - name
+                        - size
+                        - type
                         type: object
                       type: array
                   type: object

controllers/providers/aws/aws.go

@@ -96,6 +96,8 @@ var (
 		"GroupTotalInstances",
 		"GroupTotalCapacity",
 	}
+
+	AllowedVolumeTypes = []string{"gp2", "io1", "sc1", "st1"}
 )
 
 const (
@@ -151,15 +153,32 @@ func (w *AwsWorker) InstanceProfileExist(name string) (*iam.InstanceProfile, boo
 	return out.InstanceProfile, true
 }
 
-func (w *AwsWorker) GetBasicBlockDevice(name, volType string, volSize int64) *autoscaling.BlockDeviceMapping {
-	return &autoscaling.BlockDeviceMapping{
+func (w *AwsWorker) GetBasicBlockDevice(name, volType, snapshot string, volSize, iops int64, delete, encrypt *bool) *autoscaling.BlockDeviceMapping {
+	device := &autoscaling.BlockDeviceMapping{
 		DeviceName: aws.String(name),
 		Ebs: &autoscaling.Ebs{
-			VolumeSize:          aws.Int64(volSize),
-			VolumeType:          aws.String(volType),
-			DeleteOnTermination: aws.Bool(true),
+			VolumeType: aws.String(volType),
 		},
 	}
+	if delete != nil {
+		device.Ebs.DeleteOnTermination = delete
+	} else {
+		device.Ebs.DeleteOnTermination = aws.Bool(true)
+	}
+	if encrypt != nil {
+		device.Ebs.Encrypted = encrypt
+	}
+	if iops != 0 {
+		device.Ebs.Iops = aws.Int64(iops)
+	}
+	if volSize != 0 {
+		device.Ebs.VolumeSize = aws.Int64(volSize)
+	}
+	if !common.StringEmpty(snapshot) {
+		device.Ebs.SnapshotId = aws.String(snapshot)
+	}
+
+	return device
 }
 
 func (w *AwsWorker) CreateLaunchConfig(input *autoscaling.CreateLaunchConfigurationInput) error {

controllers/provisioners/eks/helpers.go

@@ -177,7 +177,7 @@ func (ctx *EksInstanceGroupContext) GetBlockDeviceList() []*autoscaling.BlockDev
 
 	customVolumes := configuration.GetVolumes()
 	for _, v := range customVolumes {
-		devices = append(devices, ctx.AwsWorker.GetBasicBlockDevice(v.Name, v.Type, v.Size))
+		devices = append(devices, ctx.AwsWorker.GetBasicBlockDevice(v.Name, v.Type, v.SnapshotID, v.Size, v.Iops, v.DeleteOnTermination, v.Encrypted))
 	}
 
 	return devices

controllers/provisioners/eks/update_test.go

@@ -321,7 +321,7 @@ func TestLaunchConfigurationDrifted(t *testing.T) {
 	keyDrift.KeyName = aws.String("some-key")
 	usrDrift.UserData = aws.String("some-userdata")
 	devDrift.BlockDeviceMappings = []*autoscaling.BlockDeviceMapping{
-		w.GetBasicBlockDevice("some-device", "some-type", 0),
+		w.GetBasicBlockDevice("some-device", "some-type", "", 32, 0, nil, nil),
 	}
 
 	tests := []struct {

docs/EKS.md

@@ -98,8 +98,8 @@ spec:
     configuration:
       userData:
       - name: <string> : name of the stage
-        stage: <string> : represents the stage of the script, allowed values are PreBootstrap, PostBootstrap
-        data: <string> : represents the script payload to inject
+        stage: <string> : represents the stage of the script, allowed values are PreBootstrap, PostBootstrap (required)
+        data: <string> : represents the script payload to inject (required)
 ```
 
 ### NodeVolume
@@ -112,9 +112,13 @@ spec:
   eks:
     configuration:
       volumes:
-      - name: <string> : represents the device name, e.g. /dev/xvda
-        type: <string> : represents the type of volume, must be one of supported types "standard", "io1", "gp2", "st1", "sc1".
-        size: <int64> : represents a volume size in gigabytes
+      - name: <string> : represents the device name, e.g. /dev/xvda (required)
+        type: <string> : represents the type of volume, must be one of supported types "standard", "io1", "gp2", "st1", "sc1" (required)
+        size: <int64> : represents a volume size in gigabytes, cannot be used with snapshotId
+        snapshotId : <string> : represents a snapshot ID to use, cannot be used with size
+        iops: <int64> : represents number of IOPS to provision volume with (min 100)
+        deleteOnTermination : <bool> : delete the EBS volume when the instance is terminated (defaults to true)
+        encrypted: <bool> : encrypt the EBS volume with a KMS key
 ```
 
 ### Taint