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

Merge pull request #13585 from spotinst/feat-rootvol-encrypt 

Spotinst: Add support for EBS root volume encryption
This commit is contained in:
Kubernetes Prow Robot 2022-05-01 03:33:14 -07:00 committed by GitHub
parent 095e00606a 8061b27afd
commit 275264ac06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/model/awsmodel/spotinst.go
View File

@ -712,6 +712,13 @@ func (b *SpotInstanceGroupModelBuilder) buildRootVolumeOpts(ig *kops.InstanceGro
} }
} }
// Encryption.
{
if fi.BoolValue(ig.Spec.RootVolumeEncryption) {
opts.Encryption = ig.Spec.RootVolumeEncryption
}
}
// Size. // Size.
{ {
size := fi.Int32Value(ig.Spec.RootVolumeSize) size := fi.Int32Value(ig.Spec.RootVolumeSize)

8
upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go
View File

@ -79,6 +79,7 @@ type RootVolumeOpts struct {
IOPS *int64 IOPS *int64
Throughput *int64 Throughput *int64
Optimization *bool Optimization *bool
Encryption *bool
} }
type AutoScalerOpts struct { type AutoScalerOpts struct {
@ -306,6 +307,9 @@ func (e *Elastigroup) Find(c *fi.Context) (*Elastigroup, error) {
if b.EBS.Throughput != nil { if b.EBS.Throughput != nil {
actual.RootVolumeOpts.Throughput = fi.Int64(int64(fi.IntValue(b.EBS.Throughput))) actual.RootVolumeOpts.Throughput = fi.Int64(int64(fi.IntValue(b.EBS.Throughput)))
} }
if b.EBS.Encrypted != nil {
actual.RootVolumeOpts.Encryption = b.EBS.Encrypted
}
} }
} }
} }
@ -1394,6 +1398,7 @@ type terraformElastigroupBlockDevice struct {
VolumeSize *int64 `cty:"volume_size"` VolumeSize *int64 `cty:"volume_size"`
VolumeIOPS *int64 `cty:"iops"` VolumeIOPS *int64 `cty:"iops"`
VolumeThroughput *int64 `cty:"throughput"` VolumeThroughput *int64 `cty:"throughput"`
Encrypted *bool `cty:"encrypted"`
DeleteOnTermination *bool `cty:"delete_on_termination"` DeleteOnTermination *bool `cty:"delete_on_termination"`
} }
@ -1594,6 +1599,7 @@ func (_ *Elastigroup) RenderTerraform(t *terraform.TerraformTarget, a, e, change
VolumeSize: rootDevice.EbsVolumeSize, VolumeSize: rootDevice.EbsVolumeSize,
VolumeIOPS: rootDevice.EbsVolumeIops, VolumeIOPS: rootDevice.EbsVolumeIops,
VolumeThroughput: rootDevice.EbsVolumeThroughput, VolumeThroughput: rootDevice.EbsVolumeThroughput,
Encrypted: rootDevice.EbsEncrypted,
DeleteOnTermination: fi.Bool(true), DeleteOnTermination: fi.Bool(true),
} }
@ -1780,6 +1786,7 @@ func buildRootDevice(cloud awsup.AWSCloud, volumeOpts *RootVolumeOpts,
DeviceName: img.RootDeviceName, DeviceName: img.RootDeviceName,
EbsVolumeSize: volumeOpts.Size, EbsVolumeSize: volumeOpts.Size,
EbsVolumeType: volumeOpts.Type, EbsVolumeType: volumeOpts.Type,
EbsEncrypted: volumeOpts.Encryption,
EbsDeleteOnTermination: fi.Bool(true), EbsDeleteOnTermination: fi.Bool(true),
} }
@ -1806,6 +1813,7 @@ func (e *Elastigroup) convertBlockDeviceMapping(in *awstasks.BlockDeviceMapping)
out.EBS = &aws.EBS{ out.EBS = &aws.EBS{
VolumeType: in.EbsVolumeType, VolumeType: in.EbsVolumeType,
VolumeSize: fi.Int(int(fi.Int64Value(in.EbsVolumeSize))), VolumeSize: fi.Int(int(fi.Int64Value(in.EbsVolumeSize))),
Encrypted: in.EbsEncrypted,
DeleteOnTermination: in.EbsDeleteOnTermination, DeleteOnTermination: in.EbsDeleteOnTermination,
} }

5
upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go
View File

@ -220,6 +220,9 @@ func (o *LaunchSpec) Find(c *fi.Context) (*LaunchSpec, error) {
if b.EBS.Throughput != nil { if b.EBS.Throughput != nil {
actual.RootVolumeOpts.Throughput = fi.Int64(int64(fi.IntValue(b.EBS.Throughput))) actual.RootVolumeOpts.Throughput = fi.Int64(int64(fi.IntValue(b.EBS.Throughput)))
} }
if b.EBS.Encrypted != nil {
actual.RootVolumeOpts.Encryption = b.EBS.Encrypted
}
} }
} }
} }
@ -876,6 +879,7 @@ type terraformBlockDeviceMappingEBS struct {
VolumeSize *int64 `cty:"volume_size"` VolumeSize *int64 `cty:"volume_size"`
VolumeIOPS *int64 `cty:"iops"` VolumeIOPS *int64 `cty:"iops"`
VolumeThroughput *int64 `cty:"throughput"` VolumeThroughput *int64 `cty:"throughput"`
Encrypted *bool `cty:"encrypted"`
DeleteOnTermination *bool `cty:"delete_on_termination"` DeleteOnTermination *bool `cty:"delete_on_termination"`
} }
@ -981,6 +985,7 @@ func (_ *LaunchSpec) RenderTerraform(t *terraform.TerraformTarget, a, e, changes
VolumeSize: rootDevice.EbsVolumeSize, VolumeSize: rootDevice.EbsVolumeSize,
VolumeIOPS: rootDevice.EbsVolumeIops, VolumeIOPS: rootDevice.EbsVolumeIops,
VolumeThroughput: rootDevice.EbsVolumeThroughput, VolumeThroughput: rootDevice.EbsVolumeThroughput,
Encrypted: rootDevice.EbsEncrypted,
DeleteOnTermination: fi.Bool(true), DeleteOnTermination: fi.Bool(true),
}, },
}) })