kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ran make gofmt

This commit is contained in:
Ionut Craciunescu 2017-08-01 00:34:39 +01:00
parent 66d377f5c4
commit 07397ec2f0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -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) 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) volumeIops := fi.Int32Value(ig.Spec.RootVolumeIops)
switch volumeType { switch volumeType {
case "io1": case "io1":
if volumeIops == 0 { if volumeIops == 0 {
volumeIops = DefaultVolumeIops volumeIops = DefaultVolumeIops

10
upup/pkg/fi/cloudup/awstasks/block_device_mappings.go
View File

@ -50,8 +50,8 @@ func (i *BlockDeviceMapping) ToEC2(deviceName string) *ec2.BlockDeviceMapping {
if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil { if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil {
o.Ebs = &ec2.EbsBlockDevice{} o.Ebs = &ec2.EbsBlockDevice{}
o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination
o.Ebs.VolumeSize = i.EbsVolumeSize o.Ebs.VolumeSize = i.EbsVolumeSize
o.Ebs.VolumeType = i.EbsVolumeType o.Ebs.VolumeType = i.EbsVolumeType
} }
return o return o
} }
@ -75,9 +75,9 @@ func (i *BlockDeviceMapping) ToAutoscaling(deviceName string) *autoscaling.Block
if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil { if i.EbsDeleteOnTermination != nil || i.EbsVolumeSize != nil || i.EbsVolumeType != nil {
o.Ebs = &autoscaling.Ebs{} o.Ebs = &autoscaling.Ebs{}
o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination o.Ebs.DeleteOnTermination = i.EbsDeleteOnTermination
o.Ebs.VolumeSize = i.EbsVolumeSize o.Ebs.VolumeSize = i.EbsVolumeSize
o.Ebs.VolumeType = i.EbsVolumeType o.Ebs.VolumeType = i.EbsVolumeType
o.Ebs.Iops = i.EbsVolumeIops o.Ebs.Iops = i.EbsVolumeIops
} }
return o return o

2
upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
View File

@ -205,7 +205,7 @@ func (e *LaunchConfiguration) buildRootDevice(cloud awsup.AWSCloud) (map[string]
EbsVolumeSize: e.RootVolumeSize, EbsVolumeSize: e.RootVolumeSize,
EbsVolumeType: e.RootVolumeType, EbsVolumeType: e.RootVolumeType,
EbsVolumeIops: e.RootVolumeIops, EbsVolumeIops: e.RootVolumeIops,
} }
blockDeviceMappings[rootDeviceName] = rootDeviceMapping blockDeviceMappings[rootDeviceName] = rootDeviceMapping