Skip to content

Add support for ARM AMI type in managed node group #246

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
merged 1 commit into from
Feb 1, 2022
Merged

Add support for ARM AMI type in managed node group #246

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
12 changes: 10 additions & 2 deletions eksconfig/add-on-managed-node-groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ type MNG struct {
ReleaseVersionValue float64 `json:"release-version-value" read-only:"true"`

// AMIType is the AMI type for the node group.
// Allowed values are AL2_x86_64 and AL2_x86_64_GPU.
// Allowed values are AL2_x86_64, AL2_x86_64_GPU and AL2_ARM_64.
// ref. https://docs.aws.amazon.com/eks/latest/userguide/create-managed-node-group.html
// ref. https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html
// ref. https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-amitype
AMIType string `json:"ami-type,omitempty"`

// InstanceTypes is the EC2 instance types for the node instances.
Expand Down Expand Up @@ -404,6 +404,10 @@ func (cfg *Config) validateAddOnManagedNodeGroups() error {
if cur.RemoteAccessUserName != "ec2-user" {
return fmt.Errorf("AMIType %q but unexpected RemoteAccessUserName %q", cur.AMIType, cur.RemoteAccessUserName)
}
case eks.AMITypesAl2Arm64:
if cur.RemoteAccessUserName != "ec2-user" {
return fmt.Errorf("AMIType %q but unexpected RemoteAccessUserName %q", cur.AMIType, cur.RemoteAccessUserName)
}
default:
return fmt.Errorf("unknown ASGs[%q].AMIType %q", k, cur.AMIType)
}
Expand All @@ -417,6 +421,10 @@ func (cfg *Config) validateAddOnManagedNodeGroups() error {
if len(cur.InstanceTypes) == 0 {
cur.InstanceTypes = []string{DefaultNodeInstanceTypeGPU}
}
case eks.AMITypesAl2Arm64:
if len(cur.InstanceTypes) == 0 {
cur.InstanceTypes = []string{DefaultNodeInstanceTypeARMCPU}
}
default:
return fmt.Errorf("unknown AddOnManagedNodeGroups.MNGs[%q].AMIType %q", k, cur.AMIType)
}
Expand Down
2 changes: 2 additions & 0 deletions eksconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,8 @@ const (

// DefaultNodeInstanceTypeCPU is the default EC2 instance type for CPU worker node.
DefaultNodeInstanceTypeCPU = "c5.xlarge"
// DefaultNodeInstanceTypeARMCPU is the default EC2 instance type for ARM CPU worker node.
DefaultNodeInstanceTypeARMCPU = "c6g.xlarge"
// DefaultNodeInstanceTypeGPU is the default EC2 instance type for GPU worker node.
DefaultNodeInstanceTypeGPU = "p3.8xlarge"

Expand Down