Skip to content

Commit

Permalink
Update tests for new tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@justinsb
justinsb committed May 2, 2017
1 parent 383c2bf commit fb6d171
Show file tree
Hide file tree
Showing 12 changed files with 98 additions and 60 deletions.
10 changes: 6 additions & 4 deletions tests/integration/complex/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,9 @@ resource "aws_subnet" "us-test-1a-complex-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.complex.example.com"
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.complex.example.com"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}

Expand All @@ -353,8 +354,9 @@ resource "aws_vpc" "complex-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
KubernetesCluster = "complex.example.com"
Name = "complex.example.com"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}

Expand Down
20 changes: 12 additions & 8 deletions tests/integration/ha/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,9 @@ resource "aws_subnet" "us-test-1a-ha-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "ha.example.com"
Name = "us-test-1a.ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "us-test-1a.ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

Expand All @@ -523,8 +524,9 @@ resource "aws_subnet" "us-test-1b-ha-example-com" {
availability_zone = "us-test-1b"

tags = {
KubernetesCluster = "ha.example.com"
Name = "us-test-1b.ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "us-test-1b.ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

Expand All @@ -534,8 +536,9 @@ resource "aws_subnet" "us-test-1c-ha-example-com" {
availability_zone = "us-test-1c"

tags = {
KubernetesCluster = "ha.example.com"
Name = "us-test-1c.ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "us-test-1c.ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

Expand All @@ -545,8 +548,9 @@ resource "aws_vpc" "ha-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
KubernetesCluster = "ha.example.com"
Name = "ha.example.com"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

Expand Down
10 changes: 6 additions & 4 deletions tests/integration/minimal-141/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,9 @@ resource "aws_subnet" "us-test-1a-minimal-141-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.minimal-141.example.com"
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.minimal-141.example.com"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}

Expand All @@ -353,8 +354,9 @@ resource "aws_vpc" "minimal-141-example-com" {
enable_dns_support = true

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"
}
}

Expand Down
8 changes: 8 additions & 0 deletions tests/integration/minimal/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@
{
"Key": "Name",
"Value": "us-test-1a.minimal.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}
Expand Down Expand Up @@ -437,6 +441,10 @@
{
"Key": "Name",
"Value": "minimal.example.com"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}
Expand Down
10 changes: 6 additions & 4 deletions tests/integration/minimal/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,9 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.minimal.example.com"
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.minimal.example.com"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}

Expand All @@ -353,8 +354,9 @@ resource "aws_vpc" "minimal-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
KubernetesCluster = "minimal.example.com"
Name = "minimal.example.com"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}

Expand Down
15 changes: 9 additions & 6 deletions tests/integration/privatecalico/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,9 @@ resource "aws_subnet" "us-test-1a-privatecalico-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

Expand All @@ -625,8 +626,9 @@ resource "aws_subnet" "utility-us-test-1a-privatecalico-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "utility-us-test-1a.privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "utility-us-test-1a.privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

Expand All @@ -636,8 +638,9 @@ resource "aws_vpc" "privatecalico-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
KubernetesCluster = "privatecalico.example.com"
Name = "privatecalico.example.com"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

Expand Down
15 changes: 9 additions & 6 deletions tests/integration/privatecanal/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,9 @@ resource "aws_subnet" "us-test-1a-privatecanal-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

Expand All @@ -616,8 +617,9 @@ resource "aws_subnet" "utility-us-test-1a-privatecanal-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "utility-us-test-1a.privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "utility-us-test-1a.privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

Expand All @@ -627,8 +629,9 @@ resource "aws_vpc" "privatecanal-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
KubernetesCluster = "privatecanal.example.com"
Name = "privatecanal.example.com"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

Expand Down
15 changes: 9 additions & 6 deletions tests/integration/privatedns1/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,9 @@ resource "aws_subnet" "us-test-1a-privatedns1-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

Expand All @@ -621,8 +622,9 @@ resource "aws_subnet" "utility-us-test-1a-privatedns1-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "utility-us-test-1a.privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "utility-us-test-1a.privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

Expand All @@ -632,8 +634,9 @@ resource "aws_vpc" "privatedns1-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
KubernetesCluster = "privatedns1.example.com"
Name = "privatedns1.example.com"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

Expand Down
10 changes: 6 additions & 4 deletions tests/integration/privatedns2/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,9 @@ resource "aws_subnet" "us-test-1a-privatedns2-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.privatedns2.example.com"
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.privatedns2.example.com"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}

Expand All @@ -607,7 +608,8 @@ resource "aws_subnet" "utility-us-test-1a-privatedns2-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "utility-us-test-1a.privatedns2.example.com"
KubernetesCluster = "privatedns2.example.com"
Name = "utility-us-test-1a.privatedns2.example.com"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}
15 changes: 9 additions & 6 deletions tests/integration/privateflannel/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,9 @@ resource "aws_subnet" "us-test-1a-privateflannel-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

Expand All @@ -616,8 +617,9 @@ resource "aws_subnet" "utility-us-test-1a-privateflannel-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "utility-us-test-1a.privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "utility-us-test-1a.privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

Expand All @@ -627,8 +629,9 @@ resource "aws_vpc" "privateflannel-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
KubernetesCluster = "privateflannel.example.com"
Name = "privateflannel.example.com"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

Expand Down
15 changes: 9 additions & 6 deletions tests/integration/privatekopeio/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,9 @@ resource "aws_subnet" "us-test-1a-privatekopeio-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

Expand All @@ -607,8 +608,9 @@ resource "aws_subnet" "utility-us-test-1a-privatekopeio-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "utility-us-test-1a.privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "utility-us-test-1a.privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

Expand All @@ -618,8 +620,9 @@ resource "aws_vpc" "privatekopeio-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
KubernetesCluster = "privatekopeio.example.com"
Name = "privatekopeio.example.com"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

Expand Down
15 changes: 9 additions & 6 deletions tests/integration/privateweave/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,9 @@ resource "aws_subnet" "us-test-1a-privateweave-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

Expand All @@ -616,8 +617,9 @@ resource "aws_subnet" "utility-us-test-1a-privateweave-example-com" {
availability_zone = "us-test-1a"

tags = {
KubernetesCluster = "privateweave.example.com"
Name = "utility-us-test-1a.privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "utility-us-test-1a.privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

Expand All @@ -627,8 +629,9 @@ resource "aws_vpc" "privateweave-example-com" {
enable_dns_support = true

tags = {
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
KubernetesCluster = "privateweave.example.com"
Name = "privateweave.example.com"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

Expand Down

0 comments on commit fb6d171

Please sign in to comment.