diff --git a/tests/integration/update_cluster/apiservernodes/kubernetes.tf b/tests/integration/update_cluster/apiservernodes/kubernetes.tf index 280f2e61e75ec..937cadda4813a 100644 --- a/tests/integration/update_cluster/apiservernodes/kubernetes.tf +++ b/tests/integration/update_cluster/apiservernodes/kubernetes.tf @@ -1010,7 +1010,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf b/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf index d44d25ea599c2..fce6d91133e8f 100644 --- a/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf +++ b/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf @@ -923,7 +923,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 7fd8426f09187..1248e3461fd80 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -1245,7 +1245,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index c2ac6795a5bc0..cfdcae0de1151 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -1158,7 +1158,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/compress/kubernetes.tf b/tests/integration/update_cluster/compress/kubernetes.tf index 8847d338581d0..7dbe482793d17 100644 --- a/tests/integration/update_cluster/compress/kubernetes.tf +++ b/tests/integration/update_cluster/compress/kubernetes.tf @@ -806,7 +806,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/digit/kubernetes.tf b/tests/integration/update_cluster/digit/kubernetes.tf index eff0ffdef7d84..f935a90e05c24 100644 --- a/tests/integration/update_cluster/digit/kubernetes.tf +++ b/tests/integration/update_cluster/digit/kubernetes.tf @@ -906,7 +906,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index 8605fa6dbe65e..a9356aa3988b6 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -1174,7 +1174,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 7d495820e6155..4f6085a23de0b 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -1547,7 +1547,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/external_dns/kubernetes.tf b/tests/integration/update_cluster/external_dns/kubernetes.tf index ad1413d60a7ac..4a6675f9dd8e3 100644 --- a/tests/integration/update_cluster/external_dns/kubernetes.tf +++ b/tests/integration/update_cluster/external_dns/kubernetes.tf @@ -818,7 +818,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf b/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf index 35901560560bd..cbd126e976a16 100644 --- a/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf +++ b/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf @@ -881,7 +881,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index d66d4fca4c826..1cb69b6e9c87a 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -822,7 +822,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/externalpolicies/kubernetes.tf b/tests/integration/update_cluster/externalpolicies/kubernetes.tf index 4b5d1be8c7e9f..270b1b24b2c30 100644 --- a/tests/integration/update_cluster/externalpolicies/kubernetes.tf +++ b/tests/integration/update_cluster/externalpolicies/kubernetes.tf @@ -1016,7 +1016,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index be7d3f8659ca0..095ad07203663 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -1246,7 +1246,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/irsa/kubernetes.tf b/tests/integration/update_cluster/irsa/kubernetes.tf index 5146a8ae5ef13..08fd02ed54dbc 100644 --- a/tests/integration/update_cluster/irsa/kubernetes.tf +++ b/tests/integration/update_cluster/irsa/kubernetes.tf @@ -931,7 +931,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/karpenter/kubernetes.tf b/tests/integration/update_cluster/karpenter/kubernetes.tf index 86a01f85e509f..f1140f6104f73 100644 --- a/tests/integration/update_cluster/karpenter/kubernetes.tf +++ b/tests/integration/update_cluster/karpenter/kubernetes.tf @@ -1081,7 +1081,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf index e022479f72de4..82e8684046769 100644 --- a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf +++ b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf @@ -185,7 +185,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf index 0ef17884ee071..c8eda8bc5063f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf @@ -1084,7 +1084,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf index 6153f8c2a7da9..9ffdf41bc5df9 100644 --- a/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf @@ -891,7 +891,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/many-addons/kubernetes.tf b/tests/integration/update_cluster/many-addons/kubernetes.tf index a5bfafc64ac73..0a1bd17427826 100644 --- a/tests/integration/update_cluster/many-addons/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons/kubernetes.tf @@ -883,7 +883,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-1.23/kubernetes.tf b/tests/integration/update_cluster/minimal-1.23/kubernetes.tf index 78ff413b4dcfa..2d23da3f6c1cc 100644 --- a/tests/integration/update_cluster/minimal-1.23/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.23/kubernetes.tf @@ -877,7 +877,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-1.24/kubernetes.tf b/tests/integration/update_cluster/minimal-1.24/kubernetes.tf index 8e0bf38b7c295..b238ae3f2c4a6 100644 --- a/tests/integration/update_cluster/minimal-1.24/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.24/kubernetes.tf @@ -839,8 +839,10 @@ resource "aws_security_group_rule" "from-nodes-minimal-example-com-ingress-udp-1 } resource "aws_subnet" "us-test-1a-minimal-example-com" { - availability_zone = "us-test-1a" - cidr_block = "172.20.32.0/19" + availability_zone = "us-test-1a" + cidr_block = "172.20.32.0/19" + enable_resource_name_dns_a_record_on_launch = true + private_dns_hostname_type_on_launch = "resource-name" tags = { "KubernetesCluster" = "minimal.example.com" "Name" = "us-test-1a.minimal.example.com" @@ -885,7 +887,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf index ffa56361e4567..94b74c7bef11b 100644 --- a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf @@ -814,7 +814,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf index 88cbeaf09c823..ca204d5dc516f 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf @@ -1034,7 +1034,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf index 6d7099dca4d76..992ab7a2761d1 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf @@ -1025,7 +1025,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-ipv6-private/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-private/kubernetes.tf index 5e9479be13f38..298d2438d7590 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-private/kubernetes.tf @@ -1072,9 +1072,12 @@ resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" { } resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" { - availability_zone = "us-test-1a" - cidr_block = "172.20.32.0/19" - ipv6_cidr_block = "2001:db8:0:111::/64" + availability_zone = "us-test-1a" + cidr_block = "172.20.32.0/19" + enable_resource_name_dns_a_record_on_launch = true + enable_resource_name_dns_aaaa_record_on_launch = true + ipv6_cidr_block = "2001:db8:0:111::/64" + private_dns_hostname_type_on_launch = "resource-name" tags = { "KubernetesCluster" = "minimal-ipv6.example.com" "Name" = "us-test-1a.minimal-ipv6.example.com" @@ -1086,9 +1089,12 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" { } resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" { - availability_zone = "us-test-1b" - cidr_block = "172.20.64.0/19" - ipv6_cidr_block = "2001:db8:0:112::/64" + availability_zone = "us-test-1b" + cidr_block = "172.20.64.0/19" + enable_resource_name_dns_a_record_on_launch = true + enable_resource_name_dns_aaaa_record_on_launch = true + ipv6_cidr_block = "2001:db8:0:112::/64" + private_dns_hostname_type_on_launch = "resource-name" tags = { "KubernetesCluster" = "minimal-ipv6.example.com" "Name" = "us-test-1b.minimal-ipv6.example.com" @@ -1100,9 +1106,12 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" { } resource "aws_subnet" "utility-us-test-1a-minimal-ipv6-example-com" { - availability_zone = "us-test-1a" - cidr_block = "172.20.0.0/22" - ipv6_cidr_block = "2001:db8:0:113::/64" + availability_zone = "us-test-1a" + cidr_block = "172.20.0.0/22" + enable_resource_name_dns_a_record_on_launch = true + enable_resource_name_dns_aaaa_record_on_launch = true + ipv6_cidr_block = "2001:db8:0:113::/64" + private_dns_hostname_type_on_launch = "resource-name" tags = { "KubernetesCluster" = "minimal-ipv6.example.com" "Name" = "utility-us-test-1a.minimal-ipv6.example.com" @@ -1114,9 +1123,12 @@ resource "aws_subnet" "utility-us-test-1a-minimal-ipv6-example-com" { } resource "aws_subnet" "utility-us-test-1b-minimal-ipv6-example-com" { - availability_zone = "us-test-1b" - cidr_block = "172.20.4.0/22" - ipv6_cidr_block = "2001:db8:0:114::/64" + availability_zone = "us-test-1b" + cidr_block = "172.20.4.0/22" + enable_resource_name_dns_a_record_on_launch = true + enable_resource_name_dns_aaaa_record_on_launch = true + ipv6_cidr_block = "2001:db8:0:114::/64" + private_dns_hostname_type_on_launch = "resource-name" tags = { "KubernetesCluster" = "minimal-ipv6.example.com" "Name" = "utility-us-test-1b.minimal-ipv6.example.com" @@ -1160,7 +1172,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf index 39e2e7af79afb..9f37b325ea3ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf @@ -1017,7 +1017,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf index 730301232e819..8355d4ae4fbb4 100644 --- a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf @@ -842,7 +842,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index c75a09b559c1b..b74866c92ec93 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -818,7 +818,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/minimal_gossip/kubernetes.tf b/tests/integration/update_cluster/minimal_gossip/kubernetes.tf index c78ca5ab05752..f0d9a8f26566c 100644 --- a/tests/integration/update_cluster/minimal_gossip/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gossip/kubernetes.tf @@ -818,7 +818,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index 91f2ec09d23eb..b1e5e864a88f8 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -1263,7 +1263,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index 3aa449a1786e7..e3d81688bb8bb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -1264,7 +1264,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf b/tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf index 337de63d17d57..e70618b66fa9e 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf +++ b/tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf @@ -929,7 +929,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/nvidia/kubernetes.tf b/tests/integration/update_cluster/nvidia/kubernetes.tf index 95aface60b34b..a3fb9e8840fd7 100644 --- a/tests/integration/update_cluster/nvidia/kubernetes.tf +++ b/tests/integration/update_cluster/nvidia/kubernetes.tf @@ -834,7 +834,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index 935f2ce9a2ae7..bf4f05b7bd206 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -1186,7 +1186,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index 8177671020672..80333718abae2 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -1097,7 +1097,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index 9e5481b4a1152..d66d64b0010ce 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -1253,7 +1253,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index f13167af0ac0d..1f1468bafb95f 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -1252,7 +1252,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index 3648228b76bd0..9142b7d919deb 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -1244,7 +1244,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 641e5bb100b84..1f1cc5962ec1b 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -1244,7 +1244,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index be00a92382f3c..90b1bbba34f91 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -1276,7 +1276,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 71d0fb8aeece1..877a1cb552b10 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -1347,7 +1347,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index e683f2707c5a6..d20923c55633a 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -1195,7 +1195,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index d7fd2fba9d17f..b92d1afbde520 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -1244,7 +1244,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index 36f534c621ce2..14a70349312da 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -1292,7 +1292,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index 7476206cb3af5..cff299d5c8bef 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -1244,7 +1244,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf b/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf index 59675ef792ce2..067d5ca90a2ce 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf +++ b/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf @@ -881,7 +881,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/shared_subnet/kubernetes.tf b/tests/integration/update_cluster/shared_subnet/kubernetes.tf index d0153aa1f0fc7..e186592c522a3 100644 --- a/tests/integration/update_cluster/shared_subnet/kubernetes.tf +++ b/tests/integration/update_cluster/shared_subnet/kubernetes.tf @@ -736,7 +736,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index 376e64d487e03..5a7ad353d9df2 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -777,7 +777,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index a55113e8fa383..bda843d2fa76a 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -1154,7 +1154,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/tests/integration/update_cluster/vfs-said/kubernetes.tf b/tests/integration/update_cluster/vfs-said/kubernetes.tf index 0f2ac039a33bc..fe3cd54cbe721 100644 --- a/tests/integration/update_cluster/vfs-said/kubernetes.tf +++ b/tests/integration/update_cluster/vfs-said/kubernetes.tf @@ -855,7 +855,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go index 8f296b3801861..fe272addf50dc 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go @@ -251,7 +251,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } @@ -326,7 +326,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go index 4c77db969355c..56d8fb1761cd5 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go @@ -99,7 +99,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } @@ -186,7 +186,7 @@ terraform { aws = { "configuration_aliases" = [aws.files] "source" = "hashicorp/aws" - "version" = ">= 3.59.0" + "version" = ">= 3.71.0" } } } diff --git a/upup/pkg/fi/cloudup/awstasks/subnet.go b/upup/pkg/fi/cloudup/awstasks/subnet.go index 6a8c76210f121..8db9f7e500c90 100644 --- a/upup/pkg/fi/cloudup/awstasks/subnet.go +++ b/upup/pkg/fi/cloudup/awstasks/subnet.go @@ -355,11 +355,16 @@ func subnetSlicesEqualIgnoreOrder(l, r []*Subnet) bool { } type terraformSubnet struct { - VPCID *terraformWriter.Literal `cty:"vpc_id"` - CIDR *string `cty:"cidr_block"` - IPv6CIDR *string `cty:"ipv6_cidr_block"` - AvailabilityZone *string `cty:"availability_zone"` - Tags map[string]string `cty:"tags"` + VPCID *terraformWriter.Literal `cty:"vpc_id"` + CIDR *string `cty:"cidr_block"` + IPv6CIDR *string `cty:"ipv6_cidr_block"` + IPv6Native *bool `cty:"ipv6_native"` + AvailabilityZone *string `cty:"availability_zone"` + EnableDNS64 *bool `cty:"enable_dns64"` + EnableResourceNameDNSAAAARecordOnLaunch *bool `cty:"enable_resource_name_dns_aaaa_record_on_launch"` + EnableResourceNameDNSARecordOnLaunch *bool `cty:"enable_resource_name_dns_a_record_on_launch"` + PrivateDNSHostnameTypeOnLaunch *string `cty:"private_dns_hostname_type_on_launch"` + Tags map[string]string `cty:"tags"` } func (_ *Subnet) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Subnet) error { @@ -394,6 +399,23 @@ func (_ *Subnet) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Su AvailabilityZone: e.AvailabilityZone, Tags: e.Tags, } + if fi.StringValue(e.CIDR) == "" { + tf.EnableDNS64 = fi.Bool(true) + tf.IPv6Native = fi.Bool(true) + } + if e.ResourceBasedNaming != nil { + hostnameType := ec2.HostnameTypeIpName + if *e.ResourceBasedNaming { + hostnameType = ec2.HostnameTypeResourceName + } + tf.PrivateDNSHostnameTypeOnLaunch = fi.String(hostnameType) + if fi.StringValue(e.CIDR) != "" { + tf.EnableResourceNameDNSARecordOnLaunch = e.ResourceBasedNaming + } + if fi.StringValue(e.IPv6CIDR) != "" { + tf.EnableResourceNameDNSAAAARecordOnLaunch = e.ResourceBasedNaming + } + } return t.RenderResource("aws_subnet", *e.Name, tf) } diff --git a/upup/pkg/fi/cloudup/terraform/target_hcl2.go b/upup/pkg/fi/cloudup/terraform/target_hcl2.go index a270e9ebc7016..78f38043e9287 100644 --- a/upup/pkg/fi/cloudup/terraform/target_hcl2.go +++ b/upup/pkg/fi/cloudup/terraform/target_hcl2.go @@ -122,7 +122,7 @@ func (t *TerraformTarget) finishHCL2() error { } writeMap(requiredProvidersBody, "aws", map[string]cty.Value{ "source": cty.StringVal("hashicorp/aws"), - "version": cty.StringVal(">= 3.59.0"), + "version": cty.StringVal(">= 3.71.0"), "configuration_aliases": aliasesVal, }) if featureflag.Spotinst.Enabled() {