Skip to content

Commit

Permalink
Run hack/update-expected.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@hakman
hakman committed May 11, 2021
1 parent 921ef10 commit d9ea7f3
Show file tree
Hide file tree
Showing 51 changed files with 699 additions and 84 deletions.
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/apiservernodes/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -955,6 +967,15 @@
]
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCminimalexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationminimalexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.minimal-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.minimal-example-com.id
route_table_id = aws_route_table.minimal-example-com.id
}

resource "aws_route_table" "minimal-example-com" {
tags = {
"KubernetesCluster" = "minimal.example.com"
Expand Down Expand Up @@ -671,9 +677,10 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
}

resource "aws_vpc" "minimal-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "minimal.example.com"
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.bastionuserdata-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.bastionuserdata-example-com.id
route_table_id = aws_route_table.bastionuserdata-example-com.id
}

resource "aws_route" "route-private-us-test-1a-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
nat_gateway_id = aws_nat_gateway.us-test-1a-bastionuserdata-example-com.id
Expand Down Expand Up @@ -993,9 +999,10 @@ resource "aws_subnet" "utility-us-test-1a-bastionuserdata-example-com" {
}

resource "aws_vpc" "bastionuserdata-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastionuserdata.example.com"
Expand Down
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/complex/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecomplexexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycomplexexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -1249,6 +1261,15 @@
"CidrBlock": "10.2.0.0/16"
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCcomplexexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationcomplexexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/complex/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.complex-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.complex-example-com.id
route_table_id = aws_route_table.complex-example-com.id
}

resource "aws_route" "route-private-us-test-1a-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
route_table_id = aws_route_table.private-us-test-1a-complex-example-com.id
Expand Down Expand Up @@ -974,9 +980,10 @@ resource "aws_subnet" "us-test-1a-complex-example-com" {
}

resource "aws_vpc" "complex-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "complex.example.com"
"Name" = "complex.example.com"
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/compress/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.compress-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.compress-example-com.id
route_table_id = aws_route_table.compress-example-com.id
}

resource "aws_route_table" "compress-example-com" {
tags = {
"KubernetesCluster" = "compress.example.com"
Expand Down Expand Up @@ -596,9 +602,10 @@ resource "aws_subnet" "us-test-1a-compress-example-com" {
}

resource "aws_vpc" "compress-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "compress.example.com"
"Name" = "compress.example.com"
Expand Down
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/containerd-custom/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -752,6 +764,15 @@
]
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCcontainerdexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationcontainerdexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/containerd/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -752,6 +764,15 @@
]
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCcontainerdexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationcontainerdexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/docker-custom/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTabledockerexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaydockerexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -752,6 +764,15 @@
]
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCdockerexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationdockerexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/existing_iam/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.existing-iam-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.existing-iam-example-com.id
route_table_id = aws_route_table.existing-iam-example-com.id
}

resource "aws_route_table" "existing-iam-example-com" {
tags = {
"KubernetesCluster" = "existing-iam.example.com"
Expand Down Expand Up @@ -934,9 +940,10 @@ resource "aws_subnet" "us-test-1c-existing-iam-example-com" {
}

resource "aws_vpc" "existing-iam-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "existing-iam.example.com"
Expand Down
21 changes: 21 additions & 0 deletions tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,18 @@
}
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalexamplecom"
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
Expand Down Expand Up @@ -748,6 +760,15 @@
]
}
},
"AWSEC2VPCCidrBlockAmazonIPv6": {
"Type": "AWS::EC2::VPCCidrBlock",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCminimalexamplecom"
},
"AmazonProvidedIpv6CidrBlock": true
}
},
"AWSEC2VPCDHCPOptionsAssociationminimalexamplecom": {
"Type": "AWS::EC2::VPCDHCPOptionsAssociation",
"Properties": {
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/update_cluster/existing_sg/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,12 @@ resource "aws_route" "route-0-0-0-0--0" {
route_table_id = aws_route_table.existingsg-example-com.id
}

resource "aws_route" "route-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.existingsg-example-com.id
route_table_id = aws_route_table.existingsg-example-com.id
}

resource "aws_route53_record" "api-existingsg-example-com" {
alias {
evaluate_target_health = false
Expand Down Expand Up @@ -1278,9 +1284,10 @@ resource "aws_subnet" "us-test-1c-existingsg-example-com" {
}

resource "aws_vpc" "existingsg-example-com" {
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
assign_generated_ipv6_cidr_block = true
cidr_block = "172.20.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "existingsg.example.com"
Expand Down
Loading

0 comments on commit d9ea7f3

Please sign in to comment.