Add SnapShotID field in AWSMachineClass (#464)

Author: hardikdr

pkg/apis/machine/types.go

@@ -775,6 +775,18 @@ type AWSEbsBlockDeviceSpec struct {
 	// it is not used in requests to create gp2, st1, sc1, or standard volumes.
 	Iops int64
 
+	// Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer managed
+	// CMK under which the EBS volume is encrypted.
+	//
+	// This parameter is only supported on BlockDeviceMapping objects called by
+	// RunInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html),
+	// RequestSpotFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html),
+	// and RequestSpotInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html).
+	KmsKeyID *string
+
+	// The ID of the snapshot.
+	SnapshotID *string
+
 	// The size of the volume, in GiB.
 	//
 	// Constraints: 1-16384 for General Purpose SSD (gp2), 4-16384 for Provisioned

pkg/apis/machine/v1alpha1/types.go

@@ -850,6 +850,18 @@ type AWSEbsBlockDeviceSpec struct {
 	// it is not used in requests to create gp2, st1, sc1, or standard volumes.
 	Iops int64 `json:"iops,omitempty"`
 
+	// Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer managed
+	// CMK under which the EBS volume is encrypted.
+	//
+	// This parameter is only supported on BlockDeviceMapping objects called by
+	// RunInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html),
+	// RequestSpotFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html),
+	// and RequestSpotInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html).
+	KmsKeyID *string `json:"kmsKeyID,omitempty"`
+
+	// The ID of the snapshot.
+	SnapshotID *string `json:"snapshotID,omitempty"`
+
 	// The size of the volume, in GiB.
 	//
 	// Constraints: 1-16384 for General Purpose SSD (gp2), 4-16384 for Provisioned
@@ -993,7 +1005,7 @@ type AzureOSDisk struct {
 
 type AzureDataDisk struct {
 	Name               string `json:"name,omitempty"`
-	Lun                *int32  `json:"lun,omitempty"`
+	Lun                *int32 `json:"lun,omitempty"`
 	Caching            string `json:"caching,omitempty"`
 	StorageAccountType string `json:"storageAccountType,omitempty"`
 	DiskSizeGB         int32  `json:"diskSizeGB,omitempty"`

pkg/apis/machine/v1alpha1/zz_generated.conversion.go

@@ -183,6 +183,7 @@ func (d *AWSDriver) generateBlockDevices(blockDevices []v1alpha1.AWSBlockDeviceM
 		volumeSize := disk.Ebs.VolumeSize
 		volumeType := disk.Ebs.VolumeType
 		encrypted := disk.Ebs.Encrypted
+		snapshotID := disk.Ebs.SnapshotID
 
 		blkDeviceMapping := ec2.BlockDeviceMapping{
 			DeviceName: aws.String(deviceName),
@@ -199,6 +200,10 @@ func (d *AWSDriver) generateBlockDevices(blockDevices []v1alpha1.AWSBlockDeviceM
 		if volumeType == "io1" {
 			blkDeviceMapping.Ebs.Iops = aws.Int64(disk.Ebs.Iops)
 		}
+
+		if snapshotID != nil {
+			blkDeviceMapping.Ebs.SnapshotId = snapshotID
+		}
 		blkDeviceMappings = append(blkDeviceMappings, &blkDeviceMapping)
 	}