From dbde17c9a53166f8079b4cb12235a7d2adee5c93 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 5 Aug 2023 08:11:39 +0300 Subject: [PATCH] hack/update-expected.sh --- .../additionalobjects/kubernetes.tf | 2 - .../apiservernodes/kubernetes.tf | 15 +++---- .../aws-lb-controller/kubernetes.tf | 14 +++---- .../bastionadditional_user-data/kubernetes.tf | 3 -- .../kubernetes.tf | 4 -- .../kubernetes.tf | 4 -- .../update_cluster/complex/kubernetes.tf | 16 ++++--- .../update_cluster/compress/kubernetes.tf | 14 +++---- .../containerd-custom/kubernetes.tf | 2 - .../update_cluster/containerd/kubernetes.tf | 2 - .../update_cluster/digit/kubernetes.tf | 14 +++---- .../docker-custom/kubernetes.tf | 14 +++---- .../update_cluster/existing_iam/kubernetes.tf | 4 -- .../update_cluster/existing_sg/kubernetes.tf | 4 -- .../update_cluster/external_dns/kubernetes.tf | 14 +++---- .../external_dns_irsa/kubernetes.tf | 14 +++---- .../update_cluster/externallb/kubernetes.tf | 2 - .../externalpolicies/kubernetes.tf | 2 - .../update_cluster/ha/kubernetes.tf | 42 ++++++++----------- .../update_cluster/irsa/kubernetes.tf | 14 +++---- .../update_cluster/karpenter/kubernetes.tf | 2 - .../lifecycle_phases/network-kubernetes.tf | 3 -- .../many-addons-ccm-irsa/kubernetes.tf | 14 +++---- .../many-addons-ccm-irsa23/kubernetes.tf | 14 +++---- .../many-addons-ccm-irsa24/kubernetes.tf | 14 +++---- .../many-addons-ccm-irsa25/kubernetes.tf | 14 +++---- .../many-addons-ccm-irsa26/kubernetes.tf | 14 +++---- .../many-addons-ccm/kubernetes.tf | 14 +++---- .../update_cluster/many-addons/kubernetes.tf | 14 +++---- .../update_cluster/minimal-1.23/kubernetes.tf | 14 +++---- .../update_cluster/minimal-1.24/kubernetes.tf | 14 +++---- .../update_cluster/minimal-1.25/kubernetes.tf | 14 +++---- .../update_cluster/minimal-1.26/kubernetes.tf | 14 +++---- .../update_cluster/minimal-1.27/kubernetes.tf | 14 +++---- .../minimal-dns-none/kubernetes.tf | 14 +++---- .../update_cluster/minimal-etcd/kubernetes.tf | 2 - .../update_cluster/minimal-gp3/kubernetes.tf | 14 +++---- .../minimal-ipv6-calico/kubernetes.tf | 3 -- .../minimal-ipv6-cilium/kubernetes.tf | 3 -- .../kubernetes.tf | 3 -- .../update_cluster/minimal-ipv6/kubernetes.tf | 3 -- .../minimal-longclustername/kubernetes.tf | 2 - .../minimal-warmpool/kubernetes.tf | 2 - .../update_cluster/minimal/kubernetes.tf | 14 +++---- .../minimal_gossip/kubernetes.tf | 14 +++---- .../minimal_gossip_irsa/kubernetes.tf | 14 +++---- .../mixed_instances/kubernetes.tf | 4 -- .../mixed_instances_spot/kubernetes.tf | 4 -- .../nth-imds-processor-irsa/kubernetes.tf | 2 - .../nth-imds-processor/kubernetes.tf | 2 - .../update_cluster/nvidia/kubernetes.tf | 14 +++---- .../private-shared-ip/kubernetes.tf | 3 -- .../privatecalico/kubernetes.tf | 3 -- .../update_cluster/privatecanal/kubernetes.tf | 3 -- .../privatecilium-eni/kubernetes.tf | 3 -- .../privatecilium/kubernetes.tf | 3 -- .../privatecilium2/kubernetes.tf | 3 -- .../privateciliumadvanced/kubernetes.tf | 3 -- .../update_cluster/privatedns1/kubernetes.tf | 3 -- .../update_cluster/privatedns2/kubernetes.tf | 3 -- .../privateflannel/kubernetes.tf | 3 -- .../privatekopeio/kubernetes.tf | 4 -- .../public-jwks-apiserver/kubernetes.tf | 14 +++---- .../update_cluster/shared_vpc/kubernetes.tf | 14 +++---- .../shared_vpc_ipv6/kubernetes.tf | 3 -- .../update_cluster/unmanaged/kubernetes.tf | 14 +++---- .../update_cluster/vfs-said/kubernetes.tf | 14 +++---- 67 files changed, 204 insertions(+), 376 deletions(-) diff --git a/tests/integration/update_cluster/additionalobjects/kubernetes.tf b/tests/integration/update_cluster/additionalobjects/kubernetes.tf index 58e5fb286a..94b444da1a 100644 --- a/tests/integration/update_cluster/additionalobjects/kubernetes.tf +++ b/tests/integration/update_cluster/additionalobjects/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/apiservernodes/kubernetes.tf b/tests/integration/update_cluster/apiservernodes/kubernetes.tf index 2889eb3881..c246ed0359 100644 --- a/tests/integration/update_cluster/apiservernodes/kubernetes.tf +++ b/tests/integration/update_cluster/apiservernodes/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf b/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf index e2f2a563f4..7bf3b07101 100644 --- a/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf +++ b/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index dae6f3bf83..1d8b98ed37 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf index 8c8997e775..c776960a78 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf index 1c458040e2..88ecc96990 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 3ea8127074..49f5ffe9d6 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/compress/kubernetes.tf b/tests/integration/update_cluster/compress/kubernetes.tf index 3c4fae35b5..d4b96f9dfa 100644 --- a/tests/integration/update_cluster/compress/kubernetes.tf +++ b/tests/integration/update_cluster/compress/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/containerd-custom/kubernetes.tf b/tests/integration/update_cluster/containerd-custom/kubernetes.tf index 923f0c28d0..ad657d7170 100644 --- a/tests/integration/update_cluster/containerd-custom/kubernetes.tf +++ b/tests/integration/update_cluster/containerd-custom/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/containerd/kubernetes.tf b/tests/integration/update_cluster/containerd/kubernetes.tf index 923f0c28d0..ad657d7170 100644 --- a/tests/integration/update_cluster/containerd/kubernetes.tf +++ b/tests/integration/update_cluster/containerd/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/digit/kubernetes.tf b/tests/integration/update_cluster/digit/kubernetes.tf index b8688e24ab..99c72edf25 100644 --- a/tests/integration/update_cluster/digit/kubernetes.tf +++ b/tests/integration/update_cluster/digit/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/docker-custom/kubernetes.tf b/tests/integration/update_cluster/docker-custom/kubernetes.tf index 1bd1011a82..bd7e2f3949 100644 --- a/tests/integration/update_cluster/docker-custom/kubernetes.tf +++ b/tests/integration/update_cluster/docker-custom/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index 061e934f18..1d89d775ef 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 9af82cf4f5..2dcaaff3c4 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/external_dns/kubernetes.tf b/tests/integration/update_cluster/external_dns/kubernetes.tf index dc67c7f201..f0fc291af1 100644 --- a/tests/integration/update_cluster/external_dns/kubernetes.tf +++ b/tests/integration/update_cluster/external_dns/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf b/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf index b8bf63ce1d..417296c2a1 100644 --- a/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf +++ b/tests/integration/update_cluster/external_dns_irsa/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index e3a0abb376..d4625a3d86 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/externalpolicies/kubernetes.tf b/tests/integration/update_cluster/externalpolicies/kubernetes.tf index adacd89215..8d9d7162fe 100644 --- a/tests/integration/update_cluster/externalpolicies/kubernetes.tf +++ b/tests/integration/update_cluster/externalpolicies/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index 430995eb80..affeab5a18 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/irsa/kubernetes.tf b/tests/integration/update_cluster/irsa/kubernetes.tf index 70c4aa393b..f3e8699dcc 100644 --- a/tests/integration/update_cluster/irsa/kubernetes.tf +++ b/tests/integration/update_cluster/irsa/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/karpenter/kubernetes.tf b/tests/integration/update_cluster/karpenter/kubernetes.tf index f516b6486b..b65a6c9625 100644 --- a/tests/integration/update_cluster/karpenter/kubernetes.tf +++ b/tests/integration/update_cluster/karpenter/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf index acf30f11ef..80f8b315e4 100644 --- a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf +++ b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf index 18d570c9cb..f1e3f980d8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf index 8975c5a645..336674e1f5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf index aa1aa9049c..b631c08d73 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf index aa1aa9049c..b631c08d73 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf index d833d2fd70..2a3d4dc33b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf index e28f59ea40..e724ed87ae 100644 --- a/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-ccm/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/many-addons/kubernetes.tf b/tests/integration/update_cluster/many-addons/kubernetes.tf index 7245bf0ec6..9af8b19312 100644 --- a/tests/integration/update_cluster/many-addons/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-1.23/kubernetes.tf b/tests/integration/update_cluster/minimal-1.23/kubernetes.tf index fbeb1149f4..4a1fd04764 100644 --- a/tests/integration/update_cluster/minimal-1.23/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.23/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-1.24/kubernetes.tf b/tests/integration/update_cluster/minimal-1.24/kubernetes.tf index fb7546a844..80ee193d75 100644 --- a/tests/integration/update_cluster/minimal-1.24/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.24/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-1.25/kubernetes.tf b/tests/integration/update_cluster/minimal-1.25/kubernetes.tf index fb7546a844..80ee193d75 100644 --- a/tests/integration/update_cluster/minimal-1.25/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.25/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-1.26/kubernetes.tf b/tests/integration/update_cluster/minimal-1.26/kubernetes.tf index bf2e6623e2..d6f33f04a2 100644 --- a/tests/integration/update_cluster/minimal-1.26/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.26/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-1.27/kubernetes.tf b/tests/integration/update_cluster/minimal-1.27/kubernetes.tf index bf2e6623e2..d6f33f04a2 100644 --- a/tests/integration/update_cluster/minimal-1.27/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-1.27/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf index b8c7084e55..9866965c1f 100644 --- a/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-dns-none/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-etcd/kubernetes.tf b/tests/integration/update_cluster/minimal-etcd/kubernetes.tf index 9d33979d47..58d400db04 100644 --- a/tests/integration/update_cluster/minimal-etcd/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-etcd/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf index a64a82306e..fe5c3eed61 100644 --- a/tests/integration/update_cluster/minimal-gp3/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-gp3/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf index 45f9a4e79d..fbe0131c2a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf index bff3f73b25..47c64871ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf index 02dcfb4aa4..0856492460 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/kubernetes.tf @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf index 10f9bac667..70c3e63935 100644 --- a/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6/kubernetes.tf @@ -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 diff --git a/tests/integration/update_cluster/minimal-longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal-longclustername/kubernetes.tf index 5ac4934a3d..eeeef78bda 100644 --- a/tests/integration/update_cluster/minimal-longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-longclustername/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf index c2012f3d8b..add0853e60 100644 --- a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 814c284e29..879964f5ff 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal_gossip/kubernetes.tf b/tests/integration/update_cluster/minimal_gossip/kubernetes.tf index f1913eab1c..f9af6bfc43 100644 --- a/tests/integration/update_cluster/minimal_gossip/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gossip/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf b/tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf index acc81e2fdc..099cfb96e7 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index 7021efc7ff..4b605580e6 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index 17ba4a8f34..796673e5b1 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf b/tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf index 39d1cdaaa6..ea419b0f08 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/nth-imds-processor/kubernetes.tf b/tests/integration/update_cluster/nth-imds-processor/kubernetes.tf index 295fa6b83b..c10564dbd6 100644 --- a/tests/integration/update_cluster/nth-imds-processor/kubernetes.tf +++ b/tests/integration/update_cluster/nth-imds-processor/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/nvidia/kubernetes.tf b/tests/integration/update_cluster/nvidia/kubernetes.tf index f1c9d03049..bb845131fb 100644 --- a/tests/integration/update_cluster/nvidia/kubernetes.tf +++ b/tests/integration/update_cluster/nvidia/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index 7dcf13f060..7d82507542 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index 1ff1aca100..1b6ca7e897 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index eab4dfeec0..b9ccb0dc51 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf index c4932e163a..289f5e2657 100644 --- a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index c4932e163a..289f5e2657 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 4f6c9e4c97..ff8b9e1dab 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index caaefd36cf..342f3d5f9f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 528deb610b..322d01d259 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index ece0bd82e5..effe4fe337 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index aced70f156..e55f5fb769 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index 66c89203f6..50f6dae4a4 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf b/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf index fae4fbfdeb..39a562d16f 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf +++ b/tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf @@ -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 } diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index 98106d8deb..84070052e0 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf b/tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf index a94579d9af..8c27088d14 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc_ipv6/kubernetes.tf @@ -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" diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index 4611c0c045..67d32c6a59 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -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" } diff --git a/tests/integration/update_cluster/vfs-said/kubernetes.tf b/tests/integration/update_cluster/vfs-said/kubernetes.tf index e369fc34d8..27c11ede1f 100644 --- a/tests/integration/update_cluster/vfs-said/kubernetes.tf +++ b/tests/integration/update_cluster/vfs-said/kubernetes.tf @@ -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 }