github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix AWS reporting "The parameter KmsKeyId requires the parameter Encrypted to be set."

Browse Source 
- use aws.String/Int/Bool functions
- don't set the key to empty string, use nil instead
This commit is contained in:
Jan Safranek 2016-08-24 10:05:07 +02:00
parent 2fe56d4bb3
commit 8cd5e263b8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1567,18 +1567,16 @@ func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (string, error) {
// TODO: Should we tag this with the cluster id (so it gets deleted when the cluster does?)
request := &ec2.CreateVolumeInput{}
request.AvailabilityZone = &createAZ
volSize := int64(volumeOptions.CapacityGB)
request.Size = &volSize
request.VolumeType = &createType
request.Encrypted = &volumeOptions.Encrypted
request.KmsKeyId = &volumeOptions.KmsKeyId
if len(*request.KmsKeyId) > 0 {
b := true
request.Encrypted = &b
request.AvailabilityZone = aws.String(createAZ)
request.Size = aws.Int64(int64(volumeOptions.CapacityGB))
request.VolumeType = aws.String(createType)
request.Encrypted = aws.Bool(volumeOptions.Encrypted)
if len(volumeOptions.KmsKeyId) > 0 {
request.KmsKeyId = aws.String(volumeOptions.KmsKeyId)
request.Encrypted = aws.Bool(true)
}
if iops > 0 {
request.Iops = &iops
request.Iops = aws.Int64(iops)
}
response, err := c.ec2.CreateVolume(request)
if err != nil {