Skip to content

Commit 96065a8

Browse files
committed
Update AWSMachine webhook validate logic on update to be consistent with validation on create
1 parent 9b5ae92 commit 96065a8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

api/v1beta2/awsmachine_webhook.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ func (r *AWSMachine) ValidateUpdate(old runtime.Object) error {
7878
var allErrs field.ErrorList
7979

8080
allErrs = append(allErrs, r.validateCloudInitSecret()...)
81+
allErrs = append(allErrs, r.validateAdditionalSecurityGroups()...)
8182
allErrs = append(allErrs, r.Spec.AdditionalTags.Validate()...)
8283

8384
newAWSMachineSpec := newAWSMachine["spec"].(map[string]interface{})
@@ -203,7 +204,7 @@ func (r *AWSMachine) validateNonRootVolumes() field.ErrorList {
203204
var allErrs field.ErrorList
204205

205206
for _, volume := range r.Spec.NonRootVolumes {
206-
if VolumeTypesProvisioned.Has(string(r.Spec.RootVolume.Type)) && volume.IOPS == 0 {
207+
if VolumeTypesProvisioned.Has(string(volume.Type)) && volume.IOPS == 0 {
207208
allErrs = append(allErrs, field.Required(field.NewPath("spec.nonRootVolumes.iops"), "iops required if type is 'io1' or 'io2'"))
208209
}
209210

0 commit comments

Comments
 (0)