Merge pull request openshift#6184 from r4f4/aws-secret-regions

openshift-merge-robot · web-flow · commit a4e933c0690d · 2023-06-21T07:54:05.000+02:00
OCPBUGS-13636: new Aws secret regions support
diff --git a/pkg/types/aws/validation/machinepool.go b/pkg/types/aws/validation/machinepool.go
@@ -106,7 +106,7 @@ func ValidateAMIID(platform *aws.Platform, p *aws.MachinePool, fldPath *field.Pa
 
 	// regions is a list of regions for which the user should set AMI ID as copying the AMI to these regions
 	// is known to not be supported.
-	regions := sets.NewString("us-iso-east-1", "cn-north-1", "cn-northwest-1")
+	regions := sets.NewString("us-iso-east-1", "us-isob-east-1", "us-iso-west-1", "cn-north-1", "cn-northwest-1")
 	if pool.AMIID == "" && regions.Has(platform.Region) {
 		allErrs = append(allErrs, field.Required(fldPath, fmt.Sprintf("AMI ID must be provided for regions %s", strings.Join(regions.List(), ", "))))
 	}

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func ValidateAMIID(platform aws.Platform, p aws.MachinePool, fldPath *field.Pa`
`106`	`106`
`107`	`107`	`// regions is a list of regions for which the user should set AMI ID as copying the AMI to these regions`
`108`	`108`	`// is known to not be supported.`
`109`		`- regions := sets.NewString("us-iso-east-1", "cn-north-1", "cn-northwest-1")`
	`109`	`+ regions := sets.NewString("us-iso-east-1", "us-isob-east-1", "us-iso-west-1", "cn-north-1", "cn-northwest-1")`
`110`	`110`	`if pool.AMIID == "" && regions.Has(platform.Region) {`
`111`	`111`	`allErrs = append(allErrs, field.Required(fldPath, fmt.Sprintf("AMI ID must be provided for regions %s", strings.Join(regions.List(), ", "))))`
`112`	`112`	`}`