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

updating integration tests

This commit is contained in:
chrislovecnm 2018-02-21 20:23:18 -07:00
parent f758919f21
commit 6e32329fb0
15 changed files with 150 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/update_cluster/additional_user-data/cloudformation.json
View File

@ -169,6 +169,10 @@
{
"Key": "Name",
"Value": "additionaluserdata.example.com"
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned"
}
]
}
@ -184,6 +188,10 @@
{
"Key": "Name",
"Value": "additionaluserdata.example.com"
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned"
}
]
}
@ -214,6 +222,10 @@
{
"Key": "Name",
"Value": "additionaluserdata.example.com"
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned"
}
]
}

15
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -226,8 +226,9 @@ resource "aws_internet_gateway" "complex-example-com" {
vpc_id = "${aws_vpc.complex-example-com.id}"
tags = {
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}
@ -306,8 +307,9 @@ resource "aws_route_table" "complex-example-com" {
vpc_id = "${aws_vpc.complex-example-com.id}"
tags = {
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}
@ -542,8 +544,9 @@ resource "aws_vpc_dhcp_options" "complex-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}

15
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -278,8 +278,9 @@ resource "aws_internet_gateway" "ha-example-com" {
vpc_id = "${aws_vpc.ha-example-com.id}"
tags = {
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -397,8 +398,9 @@ resource "aws_route_table" "ha-example-com" {
vpc_id = "${aws_vpc.ha-example-com.id}"
tags = {
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -606,8 +608,9 @@ resource "aws_vpc_dhcp_options" "ha-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

20
tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf
View File

@ -22,8 +22,9 @@ resource "aws_internet_gateway" "privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -48,8 +49,9 @@ resource "aws_route_table" "private-us-test-1a-privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "private-us-test-1a.privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "private-us-test-1a.privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -57,8 +59,9 @@ resource "aws_route_table" "privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -117,8 +120,9 @@ resource "aws_vpc_dhcp_options" "privateweave-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

15
tests/integration/update_cluster/minimal-141/kubernetes.tf
View File

@ -164,8 +164,9 @@ resource "aws_internet_gateway" "minimal-141-example-com" {
vpc_id = "${aws_vpc.minimal-141-example-com.id}"
tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}
@ -231,8 +232,9 @@ resource "aws_route_table" "minimal-141-example-com" {
vpc_id = "${aws_vpc.minimal-141-example-com.id}"
tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}
@ -402,8 +404,9 @@ resource "aws_vpc_dhcp_options" "minimal-141-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
KubernetesCluster = "minimal-141.example.com"
Name = "minimal-141.example.com"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}

12
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json
View File

@ -169,6 +169,10 @@
{
"Key": "Name",
"Value": "minimal.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}
@ -184,6 +188,10 @@
{
"Key": "Name",
"Value": "minimal.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}
@ -214,6 +222,10 @@
{
"Key": "Name",
"Value": "minimal.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}

15
tests/integration/update_cluster/minimal/kubernetes.tf
View File

@ -164,8 +164,9 @@ resource "aws_internet_gateway" "minimal-example-com" {
vpc_id = "${aws_vpc.minimal-example-com.id}"
tags = {
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}
@ -231,8 +232,9 @@ resource "aws_route_table" "minimal-example-com" {
vpc_id = "${aws_vpc.minimal-example-com.id}"
tags = {
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}
@ -402,8 +404,9 @@ resource "aws_vpc_dhcp_options" "minimal-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}

20
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -293,8 +293,9 @@ resource "aws_internet_gateway" "privatecalico-example-com" {
vpc_id = "${aws_vpc.privatecalico-example-com.id}"
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
@ -404,8 +405,9 @@ resource "aws_route_table" "private-us-test-1a-privatecalico-example-com" {
vpc_id = "${aws_vpc.privatecalico-example-com.id}"
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "private-us-test-1a.privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "private-us-test-1a.privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
@ -413,8 +415,9 @@ resource "aws_route_table" "privatecalico-example-com" {
vpc_id = "${aws_vpc.privatecalico-example-com.id}"
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
@ -699,8 +702,9 @@ resource "aws_vpc_dhcp_options" "privatecalico-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

20
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -293,8 +293,9 @@ resource "aws_internet_gateway" "privatecanal-example-com" {
vpc_id = "${aws_vpc.privatecanal-example-com.id}"
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
@ -404,8 +405,9 @@ resource "aws_route_table" "private-us-test-1a-privatecanal-example-com" {
vpc_id = "${aws_vpc.privatecanal-example-com.id}"
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "private-us-test-1a.privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "private-us-test-1a.privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
@ -413,8 +415,9 @@ resource "aws_route_table" "privatecanal-example-com" {
vpc_id = "${aws_vpc.privatecanal-example-com.id}"
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
@ -690,8 +693,9 @@ resource "aws_vpc_dhcp_options" "privatecanal-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

20
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -293,8 +293,9 @@ resource "aws_internet_gateway" "privatedns1-example-com" {
vpc_id = "${aws_vpc.privatedns1-example-com.id}"
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
@ -409,8 +410,9 @@ resource "aws_route_table" "private-us-test-1a-privatedns1-example-com" {
vpc_id = "${aws_vpc.privatedns1-example-com.id}"
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "private-us-test-1a.privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "private-us-test-1a.privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
@ -418,8 +420,9 @@ resource "aws_route_table" "privatedns1-example-com" {
vpc_id = "${aws_vpc.privatedns1-example-com.id}"
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
@ -695,8 +698,9 @@ resource "aws_vpc_dhcp_options" "privatedns1-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

8
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -395,8 +395,8 @@ resource "aws_route_table" "private-us-test-1a-privatedns2-example-com" {
vpc_id = "vpc-12345678"
tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "private-us-test-1a.privatedns2.example.com"
KubernetesCluster = "privatedns2.example.com"
"kubernetes.io/cluster/privatedns2.example.com" = "shared"
}
}
@ -404,8 +404,8 @@ resource "aws_route_table" "privatedns2-example-com" {
vpc_id = "vpc-12345678"
tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "privatedns2.example.com"
KubernetesCluster = "privatedns2.example.com"
"kubernetes.io/cluster/privatedns2.example.com" = "shared"
}
}

20
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -293,8 +293,9 @@ resource "aws_internet_gateway" "privateflannel-example-com" {
vpc_id = "${aws_vpc.privateflannel-example-com.id}"
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
@ -404,8 +405,9 @@ resource "aws_route_table" "private-us-test-1a-privateflannel-example-com" {
vpc_id = "${aws_vpc.privateflannel-example-com.id}"
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "private-us-test-1a.privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "private-us-test-1a.privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
@ -413,8 +415,9 @@ resource "aws_route_table" "privateflannel-example-com" {
vpc_id = "${aws_vpc.privateflannel-example-com.id}"
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
@ -690,8 +693,9 @@ resource "aws_vpc_dhcp_options" "privateflannel-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

20
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -289,8 +289,9 @@ resource "aws_internet_gateway" "privatekopeio-example-com" {
vpc_id = "${aws_vpc.privatekopeio-example-com.id}"
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
@ -395,8 +396,9 @@ resource "aws_route_table" "private-us-test-1a-privatekopeio-example-com" {
vpc_id = "${aws_vpc.privatekopeio-example-com.id}"
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "private-us-test-1a.privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "private-us-test-1a.privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
@ -404,8 +406,9 @@ resource "aws_route_table" "privatekopeio-example-com" {
vpc_id = "${aws_vpc.privatekopeio-example-com.id}"
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
@ -681,8 +684,9 @@ resource "aws_vpc_dhcp_options" "privatekopeio-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

20
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -293,8 +293,9 @@ resource "aws_internet_gateway" "privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -404,8 +405,9 @@ resource "aws_route_table" "private-us-test-1a-privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "private-us-test-1a.privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "private-us-test-1a.privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -413,8 +415,9 @@ resource "aws_route_table" "privateweave-example-com" {
vpc_id = "${aws_vpc.privateweave-example-com.id}"
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -690,8 +693,9 @@ resource "aws_vpc_dhcp_options" "privateweave-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

4
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -222,8 +222,8 @@ resource "aws_route_table" "sharedvpc-example-com" {
vpc_id = "vpc-12345678"
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "sharedvpc.example.com"
KubernetesCluster = "sharedvpc.example.com"
"kubernetes.io/cluster/sharedvpc.example.com" = "shared"
}
}