Skip to content
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

[master] Ensure new EKS regions can be selected when validating creds #5040

Merged
merged 1 commit into from
Jun 23, 2023
Merged

[master] Ensure new EKS regions can be selected when validating creds #5040

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
12 changes: 10 additions & 2 deletions lib/shared/addon/utils/amazon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,18 +624,22 @@ export const INSTANCE_TYPES = [
},
];

// These need to match the supported list in docker-machine:
// https://github.com/docker/machine/blob/master/drivers/amazonec2/region.go
// Supports
// 1) Validating AWS creds (used in both EC2 and EKS world)
// 2) Managing EC2 Nodes. See https://cloud-images.ubuntu.com/locator/ec2/ (and https://github.com/rancher/machine/blob/master/drivers/amazonec2/region.go#L13)
export const REGIONS = [
'af-south-1',
'ap-northeast-1',
'ap-northeast-2',
'ap-southeast-1',
'ap-southeast-2',
'ap-southeast-3',
'ap-southeast-4',
'ap-east-1',
'ap-south-1',
'ap-south-2',
'me-south-1',
'me-central-1',
'ca-central-1',
'cn-north-1',
'cn-northwest-1',
Expand All @@ -644,7 +648,9 @@ export const REGIONS = [
'eu-west-2',
'eu-west-3',
'eu-central-1',
'eu-central-2',
'eu-south-1',
'eu-south-2',
'sa-east-1',
'us-east-1',
'us-east-2',
Expand All @@ -654,6 +660,8 @@ export const REGIONS = [
'us-gov-east-1',
];

// Supports
// 1) Managing EKS clusters. See https://docs.aws.amazon.com/general/latest/gr/eks.html
export const EKS_REGIONS = [
'af-south-1',
'ap-northeast-1',
Expand Down