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

service/eks: Fix testing and eks-getting-started example for EKS API change #13323

Merged
merged 2 commits into from
May 19, 2020
Merged

service/eks: Fix testing and eks-getting-started example for EKS API change #13323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
586a5e0
service/eks: Fix testing and eks-getting-started example for EKS API …
bflad May 14, 2020
41d88be
tests/resource/aws_eks_node_group: Fix version test to use version fr…
bflad May 19, 2020
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
60 changes: 47 additions & 13 deletions 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 @@ -271,6 +271,7 @@ func TestAccAWSEksNodeGroup_Labels(t *testing.T) {
func TestAccAWSEksNodeGroup_ReleaseVersion(t *testing.T) {
var nodeGroup1 eks.Nodegroup
rName := acctest.RandomWithPrefix("tf-acc-test")
ssmParameterDataSourceName := "data.aws_ssm_parameter.test"
resourceName := "aws_eks_node_group.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -279,10 +280,10 @@ func TestAccAWSEksNodeGroup_ReleaseVersion(t *testing.T) {
CheckDestroy: testAccCheckAWSEksNodeGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSEksNodeGroupConfigReleaseVersion(rName, "1.14.8-20191213"),
Config: testAccAWSEksNodeGroupConfigReleaseVersion(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksNodeGroupExists(resourceName, &nodeGroup1),
resource.TestCheckResourceAttr(resourceName, "release_version", "1.14.8-20191213"),
resource.TestCheckResourceAttrPair(resourceName, "release_version", ssmParameterDataSourceName, "value"),
),
},
{
Expand Down Expand Up @@ -637,7 +638,7 @@ func testAccCheckAWSEksNodeGroupDisappears(nodeGroup *eks.Nodegroup) resource.Te
}
}

func testAccAWSEksNodeGroupConfigBase(rName string) string {
func testAccAWSEksNodeGroupConfigBaseIamAndVpc(rName string) string {
return fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"
Expand Down Expand Up @@ -759,16 +760,23 @@ resource "aws_security_group" "test" {
resource "aws_subnet" "test" {
count = 2

availability_zone = data.aws_availability_zones.available.names[count.index]
cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index)
vpc_id = aws_vpc.test.id
availability_zone = data.aws_availability_zones.available.names[count.index]
cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index)
map_public_ip_on_launch = true
vpc_id = aws_vpc.test.id

tags = {
Name = "tf-acc-test-eks-node-group"
"kubernetes.io/cluster/%[1]s" = "shared"
}
}
`, rName)
}

func testAccAWSEksNodeGroupConfigBase(rName string) string {
return composeConfig(
testAccAWSEksNodeGroupConfigBaseIamAndVpc(rName),
fmt.Sprintf(`
resource "aws_eks_cluster" "test" {
name = %[1]q
role_arn = aws_iam_role.cluster.arn
Expand All @@ -783,7 +791,29 @@ resource "aws_eks_cluster" "test" {
"aws_main_route_table_association.test",
]
}
`, rName)
`, rName))
}

func testAccAWSEksNodeGroupConfigBaseVersion(rName string, version string) string {
return composeConfig(
testAccAWSEksNodeGroupConfigBaseIamAndVpc(rName),
fmt.Sprintf(`
resource "aws_eks_cluster" "test" {
name = %[1]q
role_arn = aws_iam_role.cluster.arn
version = %[2]q

vpc_config {
subnet_ids = aws_subnet.test[*].id
}

depends_on = [
"aws_iam_role_policy_attachment.cluster-AmazonEKSClusterPolicy",
"aws_iam_role_policy_attachment.cluster-AmazonEKSServicePolicy",
"aws_main_route_table_association.test",
]
}
`, rName, version))
}

func testAccAWSEksNodeGroupConfigNodeGroupName(rName string) string {
Expand Down Expand Up @@ -936,13 +966,17 @@ resource "aws_eks_node_group" "test" {
`, rName, labelKey1, labelValue1, labelKey2, labelValue2)
}

func testAccAWSEksNodeGroupConfigReleaseVersion(rName, releaseVersion string) string {
func testAccAWSEksNodeGroupConfigReleaseVersion(rName string) string {
return testAccAWSEksNodeGroupConfigBase(rName) + fmt.Sprintf(`
data "aws_ssm_parameter" "test" {
name = "/aws/service/eks/optimized-ami/${aws_eks_cluster.test.version}/amazon-linux-2/recommended/release_version"
}

resource "aws_eks_node_group" "test" {
cluster_name = aws_eks_cluster.test.name
node_group_name = %[1]q
node_role_arn = aws_iam_role.node.arn
release_version = %[2]q
release_version = data.aws_ssm_parameter.test.value
subnet_ids = aws_subnet.test[*].id

scaling_config {
Expand All @@ -957,7 +991,7 @@ resource "aws_eks_node_group" "test" {
"aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly",
]
}
`, rName, releaseVersion)
`, rName)
}

func testAccAWSEksNodeGroupConfigRemoteAccessEc2SshKey(rName string) string {
Expand Down Expand Up @@ -1104,13 +1138,13 @@ resource "aws_eks_node_group" "test" {
}

func testAccAWSEksNodeGroupConfigVersion(rName, version string) string {
return testAccAWSEksNodeGroupConfigBase(rName) + fmt.Sprintf(`
return testAccAWSEksNodeGroupConfigBaseVersion(rName, version) + fmt.Sprintf(`
resource "aws_eks_node_group" "test" {
cluster_name = aws_eks_cluster.test.name
node_group_name = %[1]q
node_role_arn = aws_iam_role.node.arn
subnet_ids = aws_subnet.test[*].id
version = %[2]q
version = aws_eks_cluster.test.version

scaling_config {
desired_size = 1
Expand All @@ -1124,5 +1158,5 @@ resource "aws_eks_node_group" "test" {
"aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly",
]
}
`, rName, version)
`, rName)
}
7 changes: 4 additions & 3 deletions examples/eks-getting-started/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ resource "aws_vpc" "demo" {
resource "aws_subnet" "demo" {
count = 2

availability_zone = data.aws_availability_zones.available.names[count.index]
cidr_block = "10.0.${count.index}.0/24"
vpc_id = aws_vpc.demo.id
availability_zone = data.aws_availability_zones.available.names[count.index]
cidr_block = "10.0.${count.index}.0/24"
map_public_ip_on_launch = true
vpc_id = aws_vpc.demo.id

tags = map(
"Name", "terraform-eks-demo-node",
Expand Down