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:
Ciprian Hacman 2023-08-05 08:11:39 +03:00
parent 60b0fee1e0
commit dbde17c9a5
67 changed files with 204 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/additionalobjects/kubernetes.tf
View File

@ -962,8 +962,6 @@ resource "aws_subnet" "us-test-1a-additionalobjects-example-com" {
"KubernetesCluster" = "additionalobjects.example.com"
"Name" = "us-test-1a.additionalobjects.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/additionalobjects.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -1087,15 +1087,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/apiserver" = "true"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View File

@ -1087,14 +1087,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

3
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -1333,8 +1333,6 @@ resource "aws_subnet" "us-test-1a-bastionuserdata-example-com" {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "us-test-1a.bastionuserdata.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1350,7 +1348,6 @@ resource "aws_subnet" "utility-us-test-1a-bastionuserdata-example-com" {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "utility-us-test-1a.bastionuserdata.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

4
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf
View File

@ -1183,10 +1183,6 @@ resource "aws_subnet" "us-test-1a-cas-priority-expander-custom-example-com" {
"KubernetesCluster" = "cas-priority-expander-custom.example.com"
"Name" = "us-test-1a.cas-priority-expander-custom.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kops.k8s.io/instance-group/nodes-high-priority" = "true"
"kops.k8s.io/instance-group/nodes-low-priority" = "true"
"kubernetes.io/cluster/cas-priority-expander-custom.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

4
tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf
View File

@ -1183,10 +1183,6 @@ resource "aws_subnet" "us-test-1a-cas-priority-expander-example-com" {
"KubernetesCluster" = "cas-priority-expander.example.com"
"Name" = "us-test-1a.cas-priority-expander.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kops.k8s.io/instance-group/nodes-high-priority" = "true"
"kops.k8s.io/instance-group/nodes-low-priority" = "true"
"kubernetes.io/cluster/cas-priority-expander.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -1305,15 +1305,13 @@ resource "aws_subnet" "us-test-1a-complex-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "complex.example.com"
"Name" = "us-test-1a.complex.example.com"
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/complex.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"KubernetesCluster" = "complex.example.com"
"Name" = "us-test-1a.complex.example.com"
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kubernetes.io/cluster/complex.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}
vpc_id = aws_vpc.complex-example-com.id
}

14
tests/integration/update_cluster/compress/kubernetes.tf
View File

@ -882,14 +882,12 @@ resource "aws_subnet" "us-test-1a-compress-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "compress.example.com"
"Name" = "us-test-1a.compress.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/compress.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "compress.example.com"
"Name" = "us-test-1a.compress.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/compress.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.compress-example-com.id
}

2
tests/integration/update_cluster/containerd-custom/kubernetes.tf
View File

@ -897,8 +897,6 @@ resource "aws_subnet" "us-test-1a-containerd-example-com" {
"KubernetesCluster" = "containerd.example.com"
"Name" = "us-test-1a.containerd.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/containerd.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/containerd/kubernetes.tf
View File

@ -897,8 +897,6 @@ resource "aws_subnet" "us-test-1a-containerd-example-com" {
"KubernetesCluster" = "containerd.example.com"
"Name" = "us-test-1a.containerd.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/containerd.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

14
tests/integration/update_cluster/digit/kubernetes.tf
View File

@ -986,14 +986,12 @@ resource "aws_subnet" "us-test-1a-123-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "123.example.com"
"Name" = "us-test-1a.123.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/123.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "123.example.com"
"Name" = "us-test-1a.123.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/123.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.prefix_123-example-com.id
}

14
tests/integration/update_cluster/docker-custom/kubernetes.tf
View File

@ -916,14 +916,12 @@ resource "aws_subnet" "us-test-1a-docker-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "docker.example.com"
"Name" = "us-test-1a.docker.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/docker.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "docker.example.com"
"Name" = "us-test-1a.docker.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/docker.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.docker-example-com.id
}

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

@ -1279,8 +1279,6 @@ resource "aws_subnet" "us-test-1a-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1a.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1297,7 +1295,6 @@ resource "aws_subnet" "us-test-1b-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1b.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1314,7 +1311,6 @@ resource "aws_subnet" "us-test-1c-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1c.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -1663,8 +1663,6 @@ resource "aws_subnet" "us-test-1a-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1a.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1681,7 +1679,6 @@ resource "aws_subnet" "us-test-1b-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1b.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1698,7 +1695,6 @@ resource "aws_subnet" "us-test-1c-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1c.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

14
tests/integration/update_cluster/external_dns/kubernetes.tf
View File

@ -894,14 +894,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/external_dns_irsa/kubernetes.tf
View File

@ -1043,14 +1043,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

2
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -901,8 +901,6 @@ resource "aws_subnet" "us-test-1a-externallb-example-com" {
"KubernetesCluster" = "externallb.example.com"
"Name" = "us-test-1a.externallb.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/externallb.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/externalpolicies/kubernetes.tf
View File

@ -1112,8 +1112,6 @@ resource "aws_subnet" "us-test-1a-externalpolicies-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/externalpolicies.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -1348,14 +1348,12 @@ resource "aws_subnet" "us-test-1a-ha-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1a.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1a.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}
@ -1366,14 +1364,12 @@ resource "aws_subnet" "us-test-1b-ha-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1b.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1b.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}
@ -1384,14 +1380,12 @@ resource "aws_subnet" "us-test-1c-ha-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1c.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1c.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}

14
tests/integration/update_cluster/irsa/kubernetes.tf
View File

@ -1029,14 +1029,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

2
tests/integration/update_cluster/karpenter/kubernetes.tf
View File

@ -1258,8 +1258,6 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
"SubnetType" = "Public"
"kops.k8s.io/instance-group/karpenter-nodes-default" = "true"
"kops.k8s.io/instance-group/karpenter-nodes-single-machinetype" = "true"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -140,8 +140,6 @@ resource "aws_subnet" "us-test-1a-lifecyclephases-example-com" {
"KubernetesCluster" = "lifecyclephases.example.com"
"Name" = "us-test-1a.lifecyclephases.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/lifecyclephases.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -157,7 +155,6 @@ resource "aws_subnet" "utility-us-test-1a-lifecyclephases-example-com" {
"KubernetesCluster" = "lifecyclephases.example.com"
"Name" = "utility-us-test-1a.lifecyclephases.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/lifecyclephases.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf
View File

@ -1156,14 +1156,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf
View File

@ -1188,14 +1188,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf
View File

@ -1164,14 +1164,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf
View File

@ -1164,14 +1164,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf
View File

@ -1164,14 +1164,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm/kubernetes.tf
View File

@ -966,14 +966,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons/kubernetes.tf
View File

@ -951,14 +951,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.23/kubernetes.tf
View File

@ -959,14 +959,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.24/kubernetes.tf
View File

@ -945,14 +945,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.25/kubernetes.tf
View File

@ -945,14 +945,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.26/kubernetes.tf
View File

@ -937,14 +937,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.27/kubernetes.tf
View File

@ -937,14 +937,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-dns-none/kubernetes.tf
View File

@ -1052,14 +1052,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

2
tests/integration/update_cluster/minimal-etcd/kubernetes.tf
View File

@ -897,8 +897,6 @@ resource "aws_subnet" "us-test-1a-minimal-etcd-example-com" {
"KubernetesCluster" = "minimal-etcd.example.com"
"Name" = "us-test-1a.minimal-etcd.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-etcd.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

14
tests/integration/update_cluster/minimal-gp3/kubernetes.tf
View File

@ -890,14 +890,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

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

@ -1225,7 +1225,6 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1262,7 +1261,6 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
@ -1280,7 +1278,6 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id

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

@ -1216,7 +1216,6 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1253,7 +1252,6 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
@ -1271,7 +1269,6 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id

3
tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf
View File

@ -1208,7 +1208,6 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1245,7 +1244,6 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
@ -1263,7 +1261,6 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id

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

@ -1208,7 +1208,6 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1245,7 +1244,6 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
@ -1263,7 +1261,6 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id

2
tests/integration/update_cluster/minimal-longclustername/kubernetes.tf
View File

@ -897,8 +897,6 @@ resource "aws_subnet" "us-test-1a-this-is-truly-a-really-really-long-cluster-nam
"KubernetesCluster" = "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"Name" = "us-test-1a.this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/minimal-warmpool/kubernetes.tf
View File

@ -917,8 +917,6 @@ resource "aws_subnet" "us-test-1a-minimal-warmpool-example-com" {
"KubernetesCluster" = "minimal-warmpool.example.com"
"Name" = "us-test-1a.minimal-warmpool.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-warmpool.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -894,14 +894,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal_gossip/kubernetes.tf
View File

@ -894,14 +894,12 @@ resource "aws_subnet" "us-test-1a-minimal-k8s-local" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-k8s-local.id
}

14
tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf
View File

@ -1015,14 +1015,12 @@ resource "aws_subnet" "us-test-1a-minimal-k8s-local" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-k8s-local.id
}

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

@ -1369,7 +1369,6 @@ resource "aws_subnet" "us-test-1a-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1a.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1386,8 +1385,6 @@ resource "aws_subnet" "us-test-1b-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1b.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1404,7 +1401,6 @@ resource "aws_subnet" "us-test-1c-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1c.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

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

@ -1369,7 +1369,6 @@ resource "aws_subnet" "us-test-1a-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1a.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1386,8 +1385,6 @@ resource "aws_subnet" "us-test-1b-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1b.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1404,7 +1401,6 @@ resource "aws_subnet" "us-test-1c-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1c.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf
View File

@ -943,8 +943,6 @@ resource "aws_subnet" "us-test-1a-nthimdsprocessor-longclustername-example-com"
"KubernetesCluster" = "nthimdsprocessor.longclustername.example.com"
"Name" = "us-test-1a.nthimdsprocessor.longclustername.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/nth-imds-processor/kubernetes.tf
View File

@ -794,8 +794,6 @@ resource "aws_subnet" "us-test-1a-nthimdsprocessor-longclustername-example-com"
"KubernetesCluster" = "nthimdsprocessor.longclustername.example.com"
"Name" = "us-test-1a.nthimdsprocessor.longclustername.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

14
tests/integration/update_cluster/nvidia/kubernetes.tf
View File

@ -910,14 +910,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

3
tests/integration/update_cluster/private-shared-ip/kubernetes.tf
View File

@ -1306,8 +1306,6 @@ resource "aws_subnet" "us-test-1a-private-shared-ip-example-com" {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "us-test-1a.private-shared-ip.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1323,7 +1321,6 @@ resource "aws_subnet" "utility-us-test-1a-private-shared-ip-example-com" {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "utility-us-test-1a.private-shared-ip.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1381,8 +1381,6 @@ resource "aws_subnet" "us-test-1a-privatecalico-example-com" {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "us-test-1a.privatecalico.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1398,7 +1396,6 @@ resource "aws_subnet" "utility-us-test-1a-privatecalico-example-com" {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "utility-us-test-1a.privatecalico.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1340,8 +1340,6 @@ resource "aws_subnet" "us-test-1a-privatecanal-example-com" {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "us-test-1a.privatecanal.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1357,7 +1355,6 @@ resource "aws_subnet" "utility-us-test-1a-privatecanal-example-com" {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "utility-us-test-1a.privatecanal.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatecilium-eni/kubernetes.tf
View File

@ -1332,8 +1332,6 @@ resource "aws_subnet" "us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1349,7 +1347,6 @@ resource "aws_subnet" "utility-us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "utility-us-test-1a.privatecilium.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatecilium/kubernetes.tf
View File

@ -1332,8 +1332,6 @@ resource "aws_subnet" "us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1349,7 +1347,6 @@ resource "aws_subnet" "utility-us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "utility-us-test-1a.privatecilium.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatecilium2/kubernetes.tf
View File

@ -1348,8 +1348,6 @@ resource "aws_subnet" "us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1365,7 +1363,6 @@ resource "aws_subnet" "utility-us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "utility-us-test-1a.privatecilium.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf
View File

@ -1365,8 +1365,6 @@ resource "aws_subnet" "us-test-1a-privateciliumadvanced-example-com" {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "us-test-1a.privateciliumadvanced.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1382,7 +1380,6 @@ resource "aws_subnet" "utility-us-test-1a-privateciliumadvanced-example-com" {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "utility-us-test-1a.privateciliumadvanced.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1431,8 +1431,6 @@ resource "aws_subnet" "us-test-1a-privatedns1-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Private"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1450,7 +1448,6 @@ resource "aws_subnet" "utility-us-test-1a-privatedns1-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Utility"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1315,8 +1315,6 @@ resource "aws_subnet" "us-test-1a-privatedns2-example-com" {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "us-test-1a.privatedns2.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1332,7 +1330,6 @@ resource "aws_subnet" "utility-us-test-1a-privatedns2-example-com" {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "utility-us-test-1a.privatedns2.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1340,8 +1340,6 @@ resource "aws_subnet" "us-test-1a-privateflannel-example-com" {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "us-test-1a.privateflannel.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1357,7 +1355,6 @@ resource "aws_subnet" "utility-us-test-1a-privateflannel-example-com" {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "utility-us-test-1a.privateflannel.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

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

@ -1375,8 +1375,6 @@ resource "aws_subnet" "us-test-1a-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "us-test-1a.privatekopeio.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1392,7 +1390,6 @@ resource "aws_subnet" "us-test-1b-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "us-test-1b.privatekopeio.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1408,7 +1405,6 @@ resource "aws_subnet" "utility-us-test-1a-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "utility-us-test-1a.privatekopeio.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf
View File

@ -1051,14 +1051,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

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

@ -885,14 +885,12 @@ resource "aws_subnet" "us-test-1a-sharedvpc-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "sharedvpc.example.com"
"Name" = "us-test-1a.sharedvpc.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "sharedvpc.example.com"
"Name" = "us-test-1a.sharedvpc.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = "vpc-12345678"
}

3
tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf
View File

@ -1190,7 +1190,6 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1227,7 +1226,6 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = "vpc-12345678"
@ -1245,7 +1243,6 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = "vpc-12345678"

14
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -1266,13 +1266,11 @@ resource "aws_subnet" "us-test-1a-unmanaged-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1a.unmanaged.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1a.unmanaged.example.com"
"SubnetType" = "Private"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = "vpc-12345678"
}
@ -1286,7 +1284,6 @@ resource "aws_subnet" "us-test-1b-unmanaged-example-com" {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1b.unmanaged.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1302,7 +1299,6 @@ resource "aws_subnet" "utility-us-test-1a-unmanaged-example-com" {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "utility-us-test-1a.unmanaged.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/vfs-said/kubernetes.tf
View File

@ -931,14 +931,12 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}