kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hack/update-expected.sh

This commit is contained in:
John Gardiner Myers 2021-11-26 18:21:50 -08:00
parent 19c46f766a
commit da2b33a4a5
6 changed files with 543 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json
View File

@ -195,6 +195,26 @@
]
}
},
"AWSEC2EIPustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc",
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2InternetGatewayminimalipv6examplecom": {
"Type": "AWS::EC2::InternetGateway",
"Properties": {
@ -478,6 +498,34 @@
}
}
},
"AWSEC2NatGatewayustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::NatGateway",
"Properties": {
"AllocationId": {
"Fn::GetAtt": [
"AWSEC2EIPustest1aminimalipv6examplecom",
"AllocationId"
]
},
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
@ -528,6 +576,68 @@
]
}
},
"AWSEC2RouteTablepublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "public-us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
},
{
"Key": "kubernetes.io/kops/role",
"Value": "public-us-test-1a"
}
]
}
},
"AWSEC2Routepublicustest1a0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a64ff9b96": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "64:ff9b::/96",
"NatGatewayId": {
"Ref": "AWSEC2NatGatewayustest1aminimalipv6examplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommastersminimalipv6examplecomegressall0to00": {
"Type": "AWS::EC2::SecurityGroupEgress",
"Properties": {
@ -868,14 +978,14 @@
]
}
},
"AWSEC2SubnetRouteTableAssociationustest1aminimalipv6examplecom": {
"AWSEC2SubnetRouteTableAssociationpublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::SubnetRouteTableAssociation",
"Properties": {
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalipv6examplecom"
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
}
}
},

86
tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf
View File

@ -1,19 +1,20 @@
locals {
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public-us-test-1a_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
output "cluster_name" {
@ -60,6 +61,10 @@ output "region" {
value = "us-test-1"
}
output "route_table_public-us-test-1a_id" {
value = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
output "route_table_public_id" {
value = aws_route_table.minimal-ipv6-example-com.id
}
@ -231,6 +236,15 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-ipv6-example-com" {
type = "gp3"
}
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc = true
}
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
name = "masters.minimal-ipv6.example.com"
role = aws_iam_role.masters-minimal-ipv6-example-com.name
@ -503,6 +517,16 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_nat_gateway" "us-test-1a-minimal-ipv6-example-com" {
allocation_id = aws_eip.us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
}
resource "aws_route" "route-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
@ -515,6 +539,24 @@ resource "aws_route" "route-__--0" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-64_ff9b__--96" {
destination_ipv6_cidr_block = "64:ff9b::/96"
nat_gateway_id = aws_nat_gateway.us-test-1a-minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route53_record" "api-minimal-ipv6-example-com" {
alias {
evaluate_target_health = false
@ -547,8 +589,18 @@ resource "aws_route_table" "minimal-ipv6-example-com" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
resource "aws_route_table" "public-us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "public-us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/kops/role" = "public-us-test-1a"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "public-us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
}

114
tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json
View File

@ -195,6 +195,26 @@
]
}
},
"AWSEC2EIPustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc",
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2InternetGatewayminimalipv6examplecom": {
"Type": "AWS::EC2::InternetGateway",
"Properties": {
@ -478,6 +498,34 @@
}
}
},
"AWSEC2NatGatewayustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::NatGateway",
"Properties": {
"AllocationId": {
"Fn::GetAtt": [
"AWSEC2EIPustest1aminimalipv6examplecom",
"AllocationId"
]
},
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
@ -528,6 +576,68 @@
]
}
},
"AWSEC2RouteTablepublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "public-us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
},
{
"Key": "kubernetes.io/kops/role",
"Value": "public-us-test-1a"
}
]
}
},
"AWSEC2Routepublicustest1a0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a64ff9b96": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "64:ff9b::/96",
"NatGatewayId": {
"Ref": "AWSEC2NatGatewayustest1aminimalipv6examplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommastersminimalipv6examplecomegressall0to00": {
"Type": "AWS::EC2::SecurityGroupEgress",
"Properties": {
@ -854,14 +964,14 @@
]
}
},
"AWSEC2SubnetRouteTableAssociationustest1aminimalipv6examplecom": {
"AWSEC2SubnetRouteTableAssociationpublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::SubnetRouteTableAssociation",
"Properties": {
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalipv6examplecom"
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
}
}
},

86
tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf
View File

@ -1,19 +1,20 @@
locals {
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public-us-test-1a_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
output "cluster_name" {
@ -60,6 +61,10 @@ output "region" {
value = "us-test-1"
}
output "route_table_public-us-test-1a_id" {
value = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
output "route_table_public_id" {
value = aws_route_table.minimal-ipv6-example-com.id
}
@ -231,6 +236,15 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-ipv6-example-com" {
type = "gp3"
}
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc = true
}
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
name = "masters.minimal-ipv6.example.com"
role = aws_iam_role.masters-minimal-ipv6-example-com.name
@ -503,6 +517,16 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_nat_gateway" "us-test-1a-minimal-ipv6-example-com" {
allocation_id = aws_eip.us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
}
resource "aws_route" "route-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
@ -515,6 +539,24 @@ resource "aws_route" "route-__--0" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-64_ff9b__--96" {
destination_ipv6_cidr_block = "64:ff9b::/96"
nat_gateway_id = aws_nat_gateway.us-test-1a-minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route53_record" "api-minimal-ipv6-example-com" {
alias {
evaluate_target_health = false
@ -547,8 +589,18 @@ resource "aws_route_table" "minimal-ipv6-example-com" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
resource "aws_route_table" "public-us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "public-us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/kops/role" = "public-us-test-1a"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "public-us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
}

114
tests/integration/update_cluster/minimal-ipv6/cloudformation.json
View File

@ -195,6 +195,26 @@
]
}
},
"AWSEC2EIPustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::EIP",
"Properties": {
"Domain": "vpc",
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2InternetGatewayminimalipv6examplecom": {
"Type": "AWS::EC2::InternetGateway",
"Properties": {
@ -478,6 +498,34 @@
}
}
},
"AWSEC2NatGatewayustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::NatGateway",
"Properties": {
"AllocationId": {
"Fn::GetAtt": [
"AWSEC2EIPustest1aminimalipv6examplecom",
"AllocationId"
]
},
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
}
]
}
},
"AWSEC2Route0": {
"Type": "AWS::EC2::Route",
"Properties": {
@ -528,6 +576,68 @@
]
}
},
"AWSEC2RouteTablepublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
"VpcId": {
"Ref": "AWSEC2VPCminimalipv6examplecom"
},
"Tags": [
{
"Key": "KubernetesCluster",
"Value": "minimal-ipv6.example.com"
},
{
"Key": "Name",
"Value": "public-us-test-1a.minimal-ipv6.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"
},
{
"Key": "kubernetes.io/kops/role",
"Value": "public-us-test-1a"
}
]
}
},
"AWSEC2Routepublicustest1a0": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "::/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a00000": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
"Ref": "AWSEC2InternetGatewayminimalipv6examplecom"
}
}
},
"AWSEC2Routepublicustest1a64ff9b96": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
},
"DestinationIpv6CidrBlock": "64:ff9b::/96",
"NatGatewayId": {
"Ref": "AWSEC2NatGatewayustest1aminimalipv6examplecom"
}
}
},
"AWSEC2SecurityGroupEgressfrommastersminimalipv6examplecomegressall0to00": {
"Type": "AWS::EC2::SecurityGroupEgress",
"Properties": {
@ -854,14 +964,14 @@
]
}
},
"AWSEC2SubnetRouteTableAssociationustest1aminimalipv6examplecom": {
"AWSEC2SubnetRouteTableAssociationpublicustest1aminimalipv6examplecom": {
"Type": "AWS::EC2::SubnetRouteTableAssociation",
"Properties": {
"SubnetId": {
"Ref": "AWSEC2Subnetustest1aminimalipv6examplecom"
},
"RouteTableId": {
"Ref": "AWSEC2RouteTableminimalipv6examplecom"
"Ref": "AWSEC2RouteTablepublicustest1aminimalipv6examplecom"
}
}
},

86
tests/integration/update_cluster/minimal-ipv6/kubernetes.tf
View File

@ -1,19 +1,20 @@
locals {
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
cluster_name = "minimal-ipv6.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-minimal-ipv6-example-com.id]
master_security_group_ids = [aws_security_group.masters-minimal-ipv6-example-com.id]
masters_role_arn = aws_iam_role.masters-minimal-ipv6-example-com.arn
masters_role_name = aws_iam_role.masters-minimal-ipv6-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-minimal-ipv6-example-com.id]
node_security_group_ids = [aws_security_group.nodes-minimal-ipv6-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-minimal-ipv6-example-com.id]
nodes_role_arn = aws_iam_role.nodes-minimal-ipv6-example-com.arn
nodes_role_name = aws_iam_role.nodes-minimal-ipv6-example-com.name
region = "us-test-1"
route_table_public-us-test-1a_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
route_table_public_id = aws_route_table.minimal-ipv6-example-com.id
subnet_us-test-1a_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
vpc_cidr_block = aws_vpc.minimal-ipv6-example-com.cidr_block
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
output "cluster_name" {
@ -60,6 +61,10 @@ output "region" {
value = "us-test-1"
}
output "route_table_public-us-test-1a_id" {
value = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
output "route_table_public_id" {
value = aws_route_table.minimal-ipv6-example-com.id
}
@ -231,6 +236,15 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-ipv6-example-com" {
type = "gp3"
}
resource "aws_eip" "us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc = true
}
resource "aws_iam_instance_profile" "masters-minimal-ipv6-example-com" {
name = "masters.minimal-ipv6.example.com"
role = aws_iam_role.masters-minimal-ipv6-example-com.name
@ -503,6 +517,16 @@ resource "aws_lb_target_group" "tcp-minimal-ipv6-example--bne5ih" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_nat_gateway" "us-test-1a-minimal-ipv6-example-com" {
allocation_id = aws_eip.us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
}
resource "aws_route" "route-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
@ -515,6 +539,24 @@ resource "aws_route" "route-__--0" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-0-0-0-0--0" {
destination_cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-64_ff9b__--96" {
destination_ipv6_cidr_block = "64:ff9b::/96"
nat_gateway_id = aws_nat_gateway.us-test-1a-minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route" "route-public-us-test-1a-__--0" {
destination_ipv6_cidr_block = "::/0"
gateway_id = aws_internet_gateway.minimal-ipv6-example-com.id
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
}
resource "aws_route53_record" "api-minimal-ipv6-example-com" {
alias {
evaluate_target_health = false
@ -547,8 +589,18 @@ resource "aws_route_table" "minimal-ipv6-example-com" {
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.minimal-ipv6-example-com.id
resource "aws_route_table" "public-us-test-1a-minimal-ipv6-example-com" {
tags = {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "public-us-test-1a.minimal-ipv6.example.com"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/kops/role" = "public-us-test-1a"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
}
resource "aws_route_table_association" "public-us-test-1a-minimal-ipv6-example-com" {
route_table_id = aws_route_table.public-us-test-1a-minimal-ipv6-example-com.id
subnet_id = aws_subnet.us-test-1a-minimal-ipv6-example-com.id
}