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

Merge pull request #10461 from olemarkus/allow-modify-etcd-volume 

Make it possible to change the etcd volume type and iops
This commit is contained in:
Kubernetes Prow Robot 2021-01-06 02:47:52 -08:00 committed by GitHub
parent 76bd02754c 0676e38473
commit 2677254392
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/kops/validation/cluster.go
View File

@ -105,14 +105,6 @@ func validateEtcdMemberUpdate(fp *field.Path, obj kops.EtcdMemberSpec, status *k
allErrs = append(allErrs, field.Forbidden(fp.Child("instanceGroup"), "instanceGroup cannot be changed"))
}
if fi.StringValue(obj.VolumeType) != fi.StringValue(old.VolumeType) {
allErrs = append(allErrs, field.Forbidden(fp.Child("volumeType"), "volumeType cannot be changed"))
}
if fi.Int32Value(obj.VolumeIops) != fi.Int32Value(old.VolumeIops) {
allErrs = append(allErrs, field.Forbidden(fp.Child("volumeIops"), "volumeIops cannot be changed"))
}
if fi.Int32Value(obj.VolumeSize) != fi.Int32Value(old.VolumeSize) {
allErrs = append(allErrs, field.Forbidden(fp.Child("volumeSize"), "volumeSize cannot be changed"))
}

39
upup/pkg/fi/cloudup/awstasks/ebsvolume.go
View File

@ -132,6 +132,15 @@ func (_ *EBSVolume) CheckChanges(a, e, changes *EBSVolume) error {
if changes.ID != nil {
return fi.CannotChangeField("ID")
}
if changes.AvailabilityZone != nil {
return fi.CannotChangeField("AvailabilityZone")
}
if changes.Encrypted != nil {
return fi.CannotChangeField("Encrypted")
}
if changes.KmsKeyId != nil {
return fi.CannotChangeField("KmsKeyId")
}
}
return nil
}
@ -163,13 +172,33 @@ func (_ *EBSVolume) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *EBSVolume) e
return fmt.Errorf("error adding AWS Tags to EBS Volume: %v", err)
}
if a != nil && len(a.Tags) > 0 {
tagsToDelete := e.getEBSVolumeTagsToDelete(a.Tags)
if len(tagsToDelete) > 0 {
return t.DeleteTags(*e.ID, tagsToDelete)
if a != nil {
if len(changes.Tags) > 0 {
tagsToDelete := e.getEBSVolumeTagsToDelete(a.Tags)
if len(tagsToDelete) > 0 {
return t.DeleteTags(*e.ID, tagsToDelete)
}
}
if changes.VolumeType != nil ||
changes.VolumeIops != nil ||
changes.VolumeThroughput != nil ||
changes.SizeGB != nil {
request := &ec2.ModifyVolumeInput{
VolumeId: a.ID,
VolumeType: e.VolumeType,
Iops: e.VolumeIops,
Throughput: e.VolumeThroughput,
Size: e.SizeGB,
}
_, err := t.Cloud.EC2().ModifyVolume(request)
if err != nil {
return fmt.Errorf("error modifying volume: %v", err)
}
}
}
return nil
}