diff --git a/tests/integration/update_cluster/complex/cloudformation.json b/tests/integration/update_cluster/complex/cloudformation.json index bdf9a67160..7d35d25ee5 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json +++ b/tests/integration/update_cluster/complex/cloudformation.json @@ -673,6 +673,36 @@ "TransitGatewayId": "tgw-123456" } }, + "AWSEC2Routepublicuseast1aprivate19216811032": { + "Type": "AWS::EC2::Route", + "Properties": { + "RouteTableId": { + "Ref": "AWSEC2RouteTableprivateustest1acomplexexamplecom" + }, + "DestinationCidrBlock": "192.168.1.10/32", + "TransitGatewayId": "tgw-0123456" + } + }, + "AWSEC2Routepublicuseast1autilitycomplexexamplecom550016": { + "Type": "AWS::EC2::Route", + "Properties": { + "RouteTableId": { + "Ref": "AWSEC2RouteTablecomplexexamplecom" + }, + "DestinationCidrBlock": "5.5.0.0/16", + "VpcPeeringConnectionId": "pcx-0123abc" + } + }, + "AWSEC2Routepublicustest1acomplexexamplecom1010016": { + "Type": "AWS::EC2::Route", + "Properties": { + "RouteTableId": { + "Ref": "AWSEC2RouteTablecomplexexamplecom" + }, + "DestinationCidrBlock": "10.1.0.0/16", + "VpcPeeringConnectionId": "pcx-abcdef" + } + }, "AWSEC2SecurityGroupEgressfrommasterscomplexexamplecomegressall0to00": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content index 5c7b3f04a5..c8d16e91c6 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -202,16 +202,25 @@ spec: - pl-66666666 sshKeyName: "" subnets: - - cidr: 172.20.32.0/19 + - additionalRoutes: + - cidr: 10.1.0.0/16 + target: pcx-abcdef + cidr: 172.20.32.0/19 name: us-test-1a type: Public zone: us-test-1a - - cidr: 172.20.64.0/19 + - additionalRoutes: + - cidr: 192.168.1.10/32 + target: tgw-0123456 + cidr: 172.20.64.0/19 egress: tgw-123456 name: us-east-1a-private type: Private zone: us-test-1a - - cidr: 172.20.96.0/19 + - additionalRoutes: + - cidr: 5.5.0.0/16 + target: pcx-0123abc + cidr: 172.20.96.0/19 name: us-east-1a-utility type: Utility zone: us-test-1a diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml index 1fdfc1b266..b770c6664e 100644 --- a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -83,15 +83,24 @@ spec: name: us-test-1a type: Public zone: us-test-1a + additionalRoutes: + - cidr: "10.1.0.0/16" + target: "pcx-abcdef" - cidr: 172.20.64.0/19 name: us-east-1a-private type: Private zone: us-test-1a egress: tgw-123456 + additionalRoutes: + - cidr: "192.168.1.10/32" + target: "tgw-0123456" - cidr: 172.20.96.0/19 name: us-east-1a-utility type: Utility zone: us-test-1a + additionalRoutes: + - cidr: "5.5.0.0/16" + target: "pcx-0123abc" --- diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 794b36ce0d..ff457419ef 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -84,15 +84,24 @@ spec: name: us-test-1a type: Public zone: us-test-1a + additionalRoutes: + - cidr: "10.1.0.0/16" + target: "pcx-abcdef" - cidr: 172.20.64.0/19 name: us-east-1a-private type: Private zone: us-test-1a egress: tgw-123456 + additionalRoutes: + - cidr: "192.168.1.10/32" + target: "tgw-0123456" - cidr: 172.20.96.0/19 name: us-east-1a-utility type: Utility zone: us-test-1a + additionalRoutes: + - cidr: "5.5.0.0/16" + target: "pcx-0123abc" --- diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 3faf0059d1..5067c29c48 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -632,6 +632,24 @@ resource "aws_route" "route-private-us-test-1a-0-0-0-0--0" { transit_gateway_id = "tgw-123456" } +resource "aws_route" "route-public-us-east-1a-private-192-168-1-10--32" { + destination_cidr_block = "192.168.1.10/32" + route_table_id = aws_route_table.private-us-test-1a-complex-example-com.id + transit_gateway_id = "tgw-0123456" +} + +resource "aws_route" "route-public-us-east-1a-utility-complex-example-com-5-5-0-0--16" { + destination_cidr_block = "5.5.0.0/16" + route_table_id = aws_route_table.complex-example-com.id + vpc_peering_connection_id = "pcx-0123abc" +} + +resource "aws_route" "route-public-us-test-1a-complex-example-com-10-1-0-0--16" { + destination_cidr_block = "10.1.0.0/16" + route_table_id = aws_route_table.complex-example-com.id + vpc_peering_connection_id = "pcx-abcdef" +} + resource "aws_route53_record" "api-complex-example-com" { alias { evaluate_target_health = false