Skip to content

Added support for EUSC #8743

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

Open
Choem wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added support for EUSC #8743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917264d
Added support for EUSC
Choem May 7, 2026
42e2198
Updated tests and testdata with EUSC related data
Choem May 7, 2026
2a0ee8a
Removed unnecessary newline, updated reflect const in configfile fiel…
Choem May 7, 2026
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
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/al2-force-false-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/al2-no-force-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/al2-updated-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/br-force-false-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/br-force-true-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/actions/nodegroup/testdata/br-updated-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
13 changes: 13 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/partitions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const (
PartitionISOB = "aws-iso-b"
PartitionISOF = "aws-iso-f"
PartitionISOE = "aws-iso-e"
PartitionEUSC = "aws-eusc"
)

// partition is an AWS partition.
Expand Down Expand Up @@ -149,6 +150,18 @@ var Partitions = partitions{
endpointServiceDomainPrefixAlt: "gov.ic.hci.csp",
v1SDKDNSPrefix: "csp.hci.ic.gov",
},
{
name: PartitionEUSC,
serviceMappings: map[string]string{
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com",
},
regions: []string{RegionEUSCDEEast1},
endpointServiceDomainPrefix: standardPartitionServiceDomainPrefix,
endpointServiceDomainPrefixAlt: "amazonaws.com",
v1SDKDNSPrefix: "amazonaws.com",
},
}

func (p partitions) partitionFromRegion(region string) *partition {
Expand Down
8 changes: 8 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ const (
// Region represents the region EU ISOE West.
RegionEUISOEWest1 = "eu-isoe-west-1"

RegionEUSCDEEast1 = "eusc-de-east-1"

// DefaultRegion defines the default region, where to deploy the EKS cluster
DefaultRegion = RegionUSWest2
)
Expand Down Expand Up @@ -419,6 +421,9 @@ const (

// eksResourceAccountEUISOEWest1 defines the AWS EKS account ID that provides node resources in eu-isoe-west-1
eksResourceAccountEUISOEWest1 = "249663109785"

// eksResourceAccountEUSCDEEast1 defines the AWS EKS account ID that provides node resources in eusc-de-east-1
eksResourceAccountEUSCDEEast1 = "877088126301"
)

// Values for `VolumeType`
Expand Down Expand Up @@ -580,6 +585,7 @@ func SupportedRegions() []string {
RegionUSISOFSouth1,
RegionUSISOFEast1,
RegionEUISOEWest1,
RegionEUSCDEEast1,
}
}

Expand Down Expand Up @@ -689,6 +695,8 @@ func EKSResourceAccountID(region string) string {
return eksResourceAccountUSISOFEast1
case RegionEUISOEWest1:
return eksResourceAccountEUISOEWest1
case RegionEUSCDEEast1:
return eksResourceAccountEUSCDEEast1
default:
return eksResourceAccountStandard
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/cfn/builder/karpenter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ var expectedTemplate = `{
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/cfn/builder/testdata/nodegroup_access_entry/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/cfn/builder/testdata/nodegroup_access_entry/2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
5 changes: 5 additions & 0 deletions pkg/cfn/builder/testdata/nodegroup_access_entry/3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-eusc": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
"EKSFargatePods": "eks-fargate-pods.amazonaws.com"
},
"aws-us-gov": {
"EC2": "ec2.amazonaws.com",
"EKS": "eks.amazonaws.com",
Expand Down
1 change: 1 addition & 0 deletions pkg/connector/arn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var arnTests = []struct {
{"arn:aws-iso-b:iam::123456789012:user/Chris", "arn:aws-iso-b:iam::123456789012:user/Chris", nil},
{"arn:aws-iso-f:iam::123456789012:user/Chris", "arn:aws-iso-f:iam::123456789012:user/Chris", nil},
{"arn:aws-iso-e:iam::123456789012:user/Chris", "arn:aws-iso-e:iam::123456789012:user/Chris", nil},
{"arn:aws-eusc:iam::123456789012:user/Chris", "arn:aws-eusc:iam::123456789012:user/Chris", nil},
}

func TestUserARN(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/cmdutils/configfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ func emptyConfigField(v reflect.Value) bool {
return v.Uint() == 0
case reflect.String:
return v.String() == ""
case reflect.Ptr, reflect.Slice, reflect.Map, reflect.Interface, reflect.Chan:
case reflect.Pointer, reflect.Slice, reflect.Map, reflect.Interface, reflect.Chan:
return v.IsNil()
case reflect.Bool:
return !v.Bool()
Expand Down