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

Jump to bottom

r/eks_node_group: Add support for ami_type AL2_ARM_64 to eks_node_group #14729

Merged
merged 1 commit into from
Aug 19, 2020
Merged

r/eks_node_group: Add support for ami_type AL2_ARM_64 to eks_node_group #14729

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
1 change: 1 addition & 0 deletions aws/resource_aws_eks_node_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func resourceAwsEksNodeGroup() *schema.Resource {
ValidateFunc: validation.StringInSlice([]string{
eks.AMITypesAl2X8664,
eks.AMITypesAl2X8664Gpu,
eks.AMITypesAl2Arm64,
}, false),
},
"arn": {
Expand Down
9 changes: 8 additions & 1 deletion aws/resource_aws_eks_node_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func TestAccAWSEksNodeGroup_disappears(t *testing.T) {
}

func TestAccAWSEksNodeGroup_AmiType(t *testing.T) {
var nodeGroup1 eks.Nodegroup
var nodeGroup1, nodeGroup2 eks.Nodegroup
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_eks_node_group.test"

Expand All @@ -168,6 +168,13 @@ func TestAccAWSEksNodeGroup_AmiType(t *testing.T) {
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAWSEksNodeGroupConfigAmiType(rName, eks.AMITypesAl2Arm64),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksNodeGroupExists(resourceName, &nodeGroup2),
resource.TestCheckResourceAttr(resourceName, "ami_type", eks.AMITypesAl2Arm64),
),
},
},
})
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/eks_node_group.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The following arguments are required:

The following arguments are optional:

* `ami_type` - (Optional) Type of Amazon Machine Image (AMI) associated with the EKS Node Group. Defaults to `AL2_x86_64`. Valid values: `AL2_x86_64`, `AL2_x86_64_GPU`. Terraform will only perform drift detection if a configuration value is provided.
* `ami_type` - (Optional) Type of Amazon Machine Image (AMI) associated with the EKS Node Group. Defaults to `AL2_x86_64`. Valid values: `AL2_x86_64`, `AL2_x86_64_GPU`, `AL2_ARM_64`. Terraform will only perform drift detection if a configuration value is provided.
* `disk_size` - (Optional) Disk size in GiB for worker nodes. Defaults to `20`. Terraform will only perform drift detection if a configuration value is provided.
* `force_update_version` - (Optional) Force version update if existing pods are unable to be drained due to a pod disruption budget issue.
* `instance_types` - (Optional) Set of instance types associated with the EKS Node Group. Defaults to `["t3.medium"]`. Terraform will only perform drift detection if a configuration value is provided. Currently, the EKS API only accepts a single value in the set.
Expand Down