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 10, 2021
1 parent 24f3338 commit ea43146
Show file tree
Hide file tree
Showing 51 changed files with 953 additions and 342 deletions.
45 changes: 33 additions & 12 deletions tests/integration/update_cluster/apiservernodes/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,18 +668,6 @@
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalexamplecom"
}
}
},
"AWSEC2RouteTableminimalexamplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
Expand All @@ -706,6 +694,30 @@
]
}
},
"AWSEC2Routeipv4default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalexamplecom"
}
}
},
"AWSEC2Routeipv6default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalexamplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommastersminimalexamplecomegressall0to000000": {
"Type": "AWS::EC2::SecurityGroupEgress",
"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
15 changes: 11 additions & 4 deletions tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,12 +506,18 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.minimal.example.com_user_data")
}

resource "aws_route" "route-0-0-0-0--0" {
resource "aws_route" "route-ipv4-default" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-example-com.id
route_table_id = aws_route_table.minimal-example-com.id
}

resource "aws_route" "route-ipv6-default" {
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
15 changes: 11 additions & 4 deletions tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,12 +687,18 @@ resource "aws_nat_gateway" "us-test-1a-bastionuserdata-example-com" {
}
}

resource "aws_route" "route-0-0-0-0--0" {
resource "aws_route" "route-ipv4-default" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.bastionuserdata-example-com.id
route_table_id = aws_route_table.bastionuserdata-example-com.id
}

resource "aws_route" "route-ipv6-default" {
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
45 changes: 33 additions & 12 deletions tests/integration/update_cluster/complex/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,18 +566,6 @@
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecomplexexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycomplexexamplecom"
}
}
},
"AWSEC2RouteTablecomplexexamplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
Expand Down Expand Up @@ -646,6 +634,30 @@
]
}
},
"AWSEC2Routeipv4default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecomplexexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycomplexexamplecom"
}
}
},
"AWSEC2Routeipv6default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecomplexexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycomplexexamplecom"
}
}
},
"AWSEC2Routeprivateustest1a00000": {
"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
15 changes: 11 additions & 4 deletions tests/integration/update_cluster/complex/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,18 @@ resource "aws_lb_target_group" "tls-complex-example-com-5nursn" {
vpc_id = aws_vpc.complex-example-com.id
}

resource "aws_route" "route-0-0-0-0--0" {
resource "aws_route" "route-ipv4-default" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.complex-example-com.id
route_table_id = aws_route_table.complex-example-com.id
}

resource "aws_route" "route-ipv6-default" {
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
15 changes: 11 additions & 4 deletions tests/integration/update_cluster/compress/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,18 @@ resource "aws_launch_template" "nodes-compress-example-com" {
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.compress.example.com_user_data")
}

resource "aws_route" "route-0-0-0-0--0" {
resource "aws_route" "route-ipv4-default" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.compress-example-com.id
route_table_id = aws_route_table.compress-example-com.id
}

resource "aws_route" "route-ipv6-default" {
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
45 changes: 33 additions & 12 deletions tests/integration/update_cluster/containerd-custom/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,18 +465,6 @@
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2RouteTablecontainerdexamplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
Expand All @@ -503,6 +491,30 @@
]
}
},
"AWSEC2Routeipv4default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2Routeipv6default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommasterscontainerdexamplecomegressall0to000000": {
"Type": "AWS::EC2::SecurityGroupEgress",
"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
45 changes: 33 additions & 12 deletions tests/integration/update_cluster/containerd/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,18 +465,6 @@
}
}
},
"AWSEC2Route00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2RouteTablecontainerdexamplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
Expand All @@ -503,6 +491,30 @@
]
}
},
"AWSEC2Routeipv4default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2Routeipv6default": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablecontainerdexamplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewaycontainerdexamplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommasterscontainerdexamplecomegressall0to000000": {
"Type": "AWS::EC2::SecurityGroupEgress",
"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
Loading

0 comments on commit ea43146

Please sign in to comment.