hack/update-expected.sh

kubernetes · Oct 7, 2023 · c4c8a40 · c4c8a40
1 parent 63258e4
commit c4c8a40
Show file tree

Hide file tree

Showing 22 changed files with 178 additions and 155 deletions.
diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml
@@ -87,7 +87,7 @@ spec:
  minSize: 1
  role: Master
  subnets:
- - dualstack-us-test-1a
+ - us-test-1a
 
 ---
 

diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
@@ -803,9 +803,10 @@ resource "aws_lb_target_group" "bastion-bastionuserdata-e-4grhsv" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "bastion-bastionuserdata-e-4grhsv"
- port = 22
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "bastion-bastionuserdata-e-4grhsv"
+ port = 22
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "bastionuserdata.example.com"
  "Name" = "bastion-bastionuserdata-e-4grhsv"

diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf
@@ -683,9 +683,10 @@ resource "aws_lb_target_group" "tcp-complex-example-com-vpjolq" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-complex-example-com-vpjolq"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "tcp-complex-example-com-vpjolq"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "complex.example.com"
  "Name" = "tcp-complex-example-com-vpjolq"
@@ -705,9 +706,10 @@ resource "aws_lb_target_group" "tls-complex-example-com-5nursn" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tls-complex-example-com-5nursn"
- port = 443
- protocol = "TLS"
+ ip_address_type = "ipv4"
+ name = "tls-complex-example-com-5nursn"
+ port = 443
+ protocol = "TLS"
  tags = {
  "KubernetesCluster" = "complex.example.com"
  "Name" = "tls-complex-example-com-5nursn"

diff --git a/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf
@@ -612,9 +612,10 @@ resource "aws_lb_target_group" "kops-controller-minimal-e-uvauf3" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "kops-controller-minimal-e-uvauf3"
- port = 3988
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "kops-controller-minimal-e-uvauf3"
+ port = 3988
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal.example.com"
  "Name" = "kops-controller-minimal-e-uvauf3"
@@ -632,9 +633,10 @@ resource "aws_lb_target_group" "tcp-minimal-example-com-5905t8" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-minimal-example-com-5905t8"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "tcp-minimal-example-com-5905t8"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal.example.com"
  "Name" = "tcp-minimal-example-com-5905t8"

diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf
@@ -652,9 +652,10 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-minimal-ipv6-example--bne5ih"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv6"
+ name = "tcp-minimal-ipv6-example--bne5ih"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal-ipv6.example.com"
  "Name" = "tcp-minimal-ipv6-example--bne5ih"
@@ -1212,33 +1213,33 @@ resource "aws_security_group_rule" "icmp-pmtu-api-elb-0-0-0-0--0" {
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-cp-to-elb" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
+ from_port = -1
+ ipv6_cidr_blocks = ["::/0"]
+ protocol = "icmpv6"
+ security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
+ to_port = -1
+ type = "ingress"
+}
+
+resource "aws_security_group_rule" "icmpv6-pmtu-cp-to-elb" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-elb-to-cp" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-elb-to-cp" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
- from_port = -1
- ipv6_cidr_blocks = ["::/0"]
- protocol = "icmpv6"
- security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = -1
- type = "ingress"
-}
-
 resource "aws_sqs_queue" "minimal-ipv6-example-com-nth" {
  message_retention_seconds = 300
  name = "minimal-ipv6-example-com-nth"

diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf
@@ -652,9 +652,10 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-minimal-ipv6-example--bne5ih"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv6"
+ name = "tcp-minimal-ipv6-example--bne5ih"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal-ipv6.example.com"
  "Name" = "tcp-minimal-ipv6-example--bne5ih"
@@ -1203,33 +1204,33 @@ resource "aws_security_group_rule" "icmp-pmtu-api-elb-0-0-0-0--0" {
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-cp-to-elb" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
+ from_port = -1
+ ipv6_cidr_blocks = ["::/0"]
+ protocol = "icmpv6"
+ security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
+ to_port = -1
+ type = "ingress"
+}
+
+resource "aws_security_group_rule" "icmpv6-pmtu-cp-to-elb" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-elb-to-cp" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-elb-to-cp" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
- from_port = -1
- ipv6_cidr_blocks = ["::/0"]
- protocol = "icmpv6"
- security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = -1
- type = "ingress"
-}
-
 resource "aws_sqs_queue" "minimal-ipv6-example-com-nth" {
  message_retention_seconds = 300
  name = "minimal-ipv6-example-com-nth"

diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf
@@ -652,9 +652,10 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-minimal-ipv6-example--bne5ih"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv6"
+ name = "tcp-minimal-ipv6-example--bne5ih"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal-ipv6.example.com"
  "Name" = "tcp-minimal-ipv6-example--bne5ih"
@@ -1195,33 +1196,33 @@ resource "aws_security_group_rule" "icmp-pmtu-api-elb-0-0-0-0--0" {
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-cp-to-elb" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
+ from_port = -1
+ ipv6_cidr_blocks = ["::/0"]
+ protocol = "icmpv6"
+ security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
+ to_port = -1
+ type = "ingress"
+}
+
+resource "aws_security_group_rule" "icmpv6-pmtu-cp-to-elb" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-elb-to-cp" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-elb-to-cp" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
- from_port = -1
- ipv6_cidr_blocks = ["::/0"]
- protocol = "icmpv6"
- security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = -1
- type = "ingress"
-}
-
 resource "aws_sqs_queue" "minimal-ipv6-example-com-nth" {
  message_retention_seconds = 300
  name = "minimal-ipv6-example-com-nth"

diff --git a/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf
@@ -652,9 +652,10 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "tcp-minimal-ipv6-example--bne5ih"
- port = 443
- protocol = "TCP"
+ ip_address_type = "ipv6"
+ name = "tcp-minimal-ipv6-example--bne5ih"
+ port = 443
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "minimal-ipv6.example.com"
  "Name" = "tcp-minimal-ipv6-example--bne5ih"
@@ -1195,33 +1196,33 @@ resource "aws_security_group_rule" "icmp-pmtu-api-elb-0-0-0-0--0" {
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-cp-to-elb" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
+ from_port = -1
+ ipv6_cidr_blocks = ["::/0"]
+ protocol = "icmpv6"
+ security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
+ to_port = -1
+ type = "ingress"
+}
+
+resource "aws_security_group_rule" "icmpv6-pmtu-cp-to-elb" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmp-pmtu-elb-to-cp" {
- from_port = 3
- protocol = "icmp"
+resource "aws_security_group_rule" "icmpv6-pmtu-elb-to-cp" {
+ from_port = -1
+ protocol = "icmpv6"
  security_group_id = aws_security_group.masters-minimal-ipv6-example-com.id
  source_security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = 4
+ to_port = -1
  type = "ingress"
 }
 
-resource "aws_security_group_rule" "icmpv6-pmtu-api-elb-__--0" {
- from_port = -1
- ipv6_cidr_blocks = ["::/0"]
- protocol = "icmpv6"
- security_group_id = aws_security_group.api-elb-minimal-ipv6-example-com.id
- to_port = -1
- type = "ingress"
-}
-
 resource "aws_sqs_queue" "minimal-ipv6-example-com-nth" {
  message_retention_seconds = 300
  name = "minimal-ipv6-example-com-nth"

diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf
@@ -784,9 +784,10 @@ resource "aws_lb_target_group" "bastion-private-shared-ip-eepmph" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "bastion-private-shared-ip-eepmph"
- port = 22
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "bastion-private-shared-ip-eepmph"
+ port = 22
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "private-shared-ip.example.com"
  "Name" = "bastion-private-shared-ip-eepmph"

diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
@@ -779,9 +779,10 @@ resource "aws_lb_target_group" "bastion-private-shared-su-5ol32q" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "bastion-private-shared-su-5ol32q"
- port = 22
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "bastion-private-shared-su-5ol32q"
+ port = 22
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "private-shared-subnet.example.com"
  "Name" = "bastion-private-shared-su-5ol32q"

diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf
@@ -798,9 +798,10 @@ resource "aws_lb_target_group" "bastion-privatecalico-exa-hocohm" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "bastion-privatecalico-exa-hocohm"
- port = 22
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "bastion-privatecalico-exa-hocohm"
+ port = 22
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "privatecalico.example.com"
  "Name" = "bastion-privatecalico-exa-hocohm"

diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf
@@ -802,9 +802,10 @@ resource "aws_lb_target_group" "bastion-privatecanal-exam-hmhsp5" {
  protocol = "TCP"
  unhealthy_threshold = 2
  }
- name = "bastion-privatecanal-exam-hmhsp5"
- port = 22
- protocol = "TCP"
+ ip_address_type = "ipv4"
+ name = "bastion-privatecanal-exam-hmhsp5"
+ port = 22
+ protocol = "TCP"
  tags = {
  "KubernetesCluster" = "privatecanal.example.com"
  "Name" = "bastion-privatecanal-exam-hmhsp5"