Skip to content

Bug 2047258: Read GovCloud from RHCOS stream #5585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jan 28, 2022
Merged

Bug 2047258: Read GovCloud from RHCOS stream #5585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/types/aws/validation/machinepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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-gov-west-1", "us-gov-east-1", "us-iso-east-1", "cn-north-1", "cn-northwest-1")
regions := sets.NewString("us-iso-east-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(), ", "))))
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/types/aws/validation/machinepool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ func Test_validateAMIID(t *testing.T) {
err string
}{{
platform: &aws.Platform{Region: "us-east-1"},
}, {
platform: &aws.Platform{Region: "us-gov-east-1"},
err: `^test-path: Required value: AMI ID must be provided for regions .*$`,
}, {
platform: &aws.Platform{Region: "cn-north-1"},
err: `^test-path: Required value: AMI ID must be provided for regions .*$`,
Expand Down