Merge pull request kubernetes#6776 from MathieuMailhos/fix_6770

Carry Provisioned IOPS to Terraform and CloudFormation templates
kellanburket · Apr 15, 2019 · 0b3db24 · 0b3db24
2 parents 2e6c191 + b7c3da2
commit 0b3db24
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
@@ -427,6 +427,7 @@ type terraformBlockDevice struct {
 	// For root
 	VolumeType *string `json:"volume_type,omitempty"`
 	VolumeSize *int64  `json:"volume_size,omitempty"`
+	Iops       *int64  `json:"iops,omitempty"`
 	// Encryption
 	Encrypted *bool `json:"encrypted,omitempty"`
 	// Termination
@@ -493,6 +494,7 @@ func (_ *LaunchConfiguration) RenderTerraform(t *terraform.TerraformTarget, a, e
 				tf.RootBlockDevice = &terraformBlockDevice{
 					VolumeType:          bdm.EbsVolumeType,
 					VolumeSize:          bdm.EbsVolumeSize,
+					Iops:                bdm.EbsVolumeIops,
 					DeleteOnTermination: fi.Bool(true),
 				}
 			}
@@ -576,6 +578,7 @@ type cloudformationBlockDevice struct {
 type cloudformationBlockDeviceEBS struct {
 	VolumeType          *string `json:"VolumeType,omitempty"`
 	VolumeSize          *int64  `json:"VolumeSize,omitempty"`
+	Iops                *int64  `json:"Iops,omitempty"`
 	DeleteOnTermination *bool   `json:"DeleteOnTermination,omitempty"`
 	Encrypted           *bool   `json:"Encrypted,omitempty"`
 }
@@ -645,6 +648,7 @@ func (_ *LaunchConfiguration) RenderCloudformation(t *cloudformation.Cloudformat
 					Ebs: &cloudformationBlockDeviceEBS{
 						VolumeType:          bdm.EbsVolumeType,
 						VolumeSize:          bdm.EbsVolumeSize,
+						Iops:                bdm.EbsVolumeIops,
 						DeleteOnTermination: fi.Bool(true),
 					},
 				}