diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index 764054488a..b41a12f192 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -63,10 +63,10 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error { return fmt.Errorf("this case should not get hit, kops.Role not found %s", ig.Spec.Role) } } - volumeType := fi.StringValue(ig.Spec.RootVolumeType) + volumeType := fi.StringValue(ig.Spec.RootVolumeType) volumeIops := fi.Int32Value(ig.Spec.RootVolumeIops) - switch volumeType { + switch volumeType { case "io1": if volumeIops == 0 { volumeIops = DefaultVolumeIops diff --git a/upup/pkg/fi/cloudup/awstasks/block_device_mappings.go b/upup/pkg/fi/cloudup/awstasks/block_device_mappings.go index 829ba699a1..b038bea9b6 100644 --- a/upup/pkg/fi/cloudup/awstasks/block_device_mappings.go +++ b/upup/pkg/fi/cloudup/awstasks/block_device_mappings.go @@ -50,8 +50,8 @@ func (i *BlockDeviceMapping) ToEC2(deviceName string) *ec2.BlockDeviceMapping { if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil { o.Ebs = &ec2.EbsBlockDevice{} o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination - o.Ebs.VolumeSize = i.EbsVolumeSize - o.Ebs.VolumeType = i.EbsVolumeType + o.Ebs.VolumeSize = i.EbsVolumeSize + o.Ebs.VolumeType = i.EbsVolumeType } return o } @@ -75,9 +75,9 @@ func (i *BlockDeviceMapping) ToAutoscaling(deviceName string) *autoscaling.Block if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil { o.Ebs = &autoscaling.Ebs{} o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination - o.Ebs.VolumeSize = i.EbsVolumeSize - o.Ebs.VolumeType = i.EbsVolumeType - o.Ebs.Iops = i.EbsVolumeIops + o.Ebs.VolumeSize = i.EbsVolumeSize + o.Ebs.VolumeType = i.EbsVolumeType + o.Ebs.Iops = i.EbsVolumeIops } return o diff --git a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go index ea611b2c27..21169b85a8 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go +++ b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go @@ -205,7 +205,7 @@ func (e *LaunchConfiguration) buildRootDevice(cloud awsup.AWSCloud) (map[string] EbsVolumeSize: e.RootVolumeSize, EbsVolumeType: e.RootVolumeType, EbsVolumeIops: e.RootVolumeIops, -} + } blockDeviceMappings[rootDeviceName] = rootDeviceMapping