From 36a763c88f5057bb51ffcf1257c33ac6d2d4f065 Mon Sep 17 00:00:00 2001 From: justinsb Date: Sun, 18 Jun 2023 14:21:24 -0400 Subject: [PATCH 1/2] node labeling: don't ignore unknown roles We were silently ignoring unknown roles, which makes it hard to know when our expectations aren't met. It looks like the rename of the role from "Master" to "ControlPlane" may have caused some drift against our expectations also. --- .../controllers/legacy_node_controller.go | 5 +++- pkg/model/context.go | 6 +++- pkg/nodelabels/builder.go | 28 +++++++++++++++---- pkg/nodelabels/builder_test.go | 5 +++- .../fi/cloudup/populate_instancegroup_spec.go | 6 +++- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/cmd/kops-controller/controllers/legacy_node_controller.go b/cmd/kops-controller/controllers/legacy_node_controller.go index 351c5e5cdb..2122c9d0b0 100644 --- a/cmd/kops-controller/controllers/legacy_node_controller.go +++ b/cmd/kops-controller/controllers/legacy_node_controller.go @@ -111,7 +111,10 @@ func (r *LegacyNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) return ctrl.Result{}, fmt.Errorf("unable to load instance group object for node %s: %v", node.Name, err) } - labels := nodelabels.BuildNodeLabels(cluster, ig) + labels, err := nodelabels.BuildNodeLabels(cluster, ig) + if err != nil { + return ctrl.Result{}, fmt.Errorf("error building node labels for node %q: %w", node.Name, err) + } lifecycle, err := r.getInstanceLifecycle(ctx, node) if err != nil { diff --git a/pkg/model/context.go b/pkg/model/context.go index 38ea0b9cdc..0622976824 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -157,7 +157,11 @@ func (b *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (ma } // Apply labels for cluster autoscaler node labels - for k, v := range nodelabels.BuildNodeLabels(b.Cluster, ig) { + nodeLabels, err := nodelabels.BuildNodeLabels(b.Cluster, ig) + if err != nil { + return nil, fmt.Errorf("error building node labels: %w", err) + } + for k, v := range nodeLabels { labels[nodeidentityaws.ClusterAutoscalerNodeTemplateLabel+k] = v } diff --git a/pkg/nodelabels/builder.go b/pkg/nodelabels/builder.go index 4a82779260..fd7c82fc17 100644 --- a/pkg/nodelabels/builder.go +++ b/pkg/nodelabels/builder.go @@ -17,6 +17,8 @@ limitations under the License. package nodelabels import ( + "fmt" + "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/util/pkg/reflectutils" @@ -37,10 +39,22 @@ const ( // BuildNodeLabels returns the node labels for the specified instance group // This moved from the kubelet to a central controller in kubernetes 1.16 -func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) map[string]string { - isControlPlane := instanceGroup.Spec.Role == kops.InstanceGroupRoleControlPlane - - isAPIServer := instanceGroup.Spec.Role == kops.InstanceGroupRoleAPIServer +func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (map[string]string, error) { + isControlPlane := false + isAPIServer := false + isNode := false + switch instanceGroup.Spec.Role { + case kops.InstanceGroupRoleControlPlane: + isControlPlane = true + case kops.InstanceGroupRoleAPIServer: + isAPIServer = true + case kops.InstanceGroupRoleNode: + isNode = true + case kops.InstanceGroupRoleBastion: + // no labels to add + default: + return nil, fmt.Errorf("unhandled instanceGroup role %q", instanceGroup.Spec.Role) + } // Merge KubeletConfig for NodeLabels c := &kops.KubeletConfigSpec{} @@ -70,7 +84,9 @@ func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) m if cluster.IsKubernetesLT("1.24") { nodeLabels[RoleLabelName15] = RoleAPIServerLabelValue15 } - } else { + } + + if isNode { if nodeLabels == nil { nodeLabels = make(map[string]string) } @@ -104,7 +120,7 @@ func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) m nodeLabels["karpenter.sh/provisioner-name"] = instanceGroup.ObjectMeta.Name } - return nodeLabels + return nodeLabels, nil } // BuildMandatoryControlPlaneLabels returns the list of labels all CP nodes must have diff --git a/pkg/nodelabels/builder_test.go b/pkg/nodelabels/builder_test.go index d4519fd958..a71c06a5e7 100644 --- a/pkg/nodelabels/builder_test.go +++ b/pkg/nodelabels/builder_test.go @@ -115,7 +115,10 @@ func TestBuildNodeLabels(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - out := BuildNodeLabels(test.cluster, test.ig) + out, err := BuildNodeLabels(test.cluster, test.ig) + if err != nil { + t.Fatalf("unexpected error from BuildNodeLabels: %v", err) + } if !reflect.DeepEqual(out, test.expected) { t.Fatalf("Actual result:\n%v\nExpect:\n%v", out, test.expected) } diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index 51a4c2e621..fb533d32fa 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -258,7 +258,11 @@ func PopulateInstanceGroupSpec(cluster *kops.Cluster, input *kops.InstanceGroup, // We include the NodeLabels in the userdata even for Kubernetes 1.16 and later so that // rolling update will still replace nodes when they change. - igKubeletConfig.NodeLabels = nodelabels.BuildNodeLabels(cluster, ig) + nodeLabels, err := nodelabels.BuildNodeLabels(cluster, ig) + if err != nil { + return nil, fmt.Errorf("error building node labels: %w", err) + } + igKubeletConfig.NodeLabels = nodeLabels useSecureKubelet := fi.ValueOf(igKubeletConfig.AnonymousAuth) From cd1c7434e8916553522e531be449df3ca156f021 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 19 Jun 2023 15:12:11 +0300 Subject: [PATCH 2/2] hack/update-expected.sh --- .../one-master-one-node-one-bastion-2.yaml | 1 - .../one-master-one-node-one-bastion.yaml | 1 - ...aws_s3_object_nodeupconfig-bastion_content | 2 - .../bastionadditional_user-data/kubernetes.tf | 38 +++++------- .../private-shared-ip/kubernetes.tf | 38 +++++------- .../private-shared-subnet/kubernetes.tf | 38 +++++------- .../privatecalico/kubernetes.tf | 38 +++++------- .../update_cluster/privatecanal/kubernetes.tf | 38 +++++------- .../privatecilium-eni/kubernetes.tf | 38 +++++------- .../privatecilium/kubernetes.tf | 38 +++++------- .../privatecilium2/kubernetes.tf | 38 +++++------- .../privateciliumadvanced/kubernetes.tf | 38 +++++------- .../update_cluster/privatedns1/kubernetes.tf | 58 +++++++------------ .../update_cluster/privatedns2/kubernetes.tf | 38 +++++------- .../privateflannel/kubernetes.tf | 38 +++++------- .../privatekopeio/kubernetes.tf | 38 +++++------- .../update_cluster/privateweave/kubernetes.tf | 46 +++++---------- .../update_cluster/unmanaged/kubernetes.tf | 38 +++++------- 18 files changed, 231 insertions(+), 371 deletions(-) diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml index dee8dcebf0..59ff5c7265 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml @@ -24,7 +24,6 @@ Metadata: cluster_generation: "0" ig_generation: "0" k8s: cluster - k8s.io_cluster-autoscaler_node-template_label_node-role.kubernetes.io_node: "" k8s.io_role_bastion: "1" kops.k8s.io_instancegroup: bastion Name: bastion-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml index 68a8423816..c22191ca21 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml @@ -37,7 +37,6 @@ Metadata: cluster_generation: "0" ig_generation: "0" k8s: cluster - k8s.io_cluster-autoscaler_node-template_label_node-role.kubernetes.io_node: "" k8s.io_role_bastion: "1" kops.k8s.io_instancegroup: bastion Name: bastion-1-cluster diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content index fdbe355d97..7d177a8abc 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content @@ -37,8 +37,6 @@ KubeletConfig: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - nodeLabels: - node-role.kubernetes.io/node: "" podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index c5343710d2..82cea581ce 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" { propagate_at_launch = true value = "bastion.bastionuserdata.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "bastionuserdata.example.com" - "Name" = "bastion.bastionuserdata.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" + "KubernetesCluster" = "bastionuserdata.example.com" + "Name" = "bastion.bastionuserdata.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "bastionuserdata.example.com" - "Name" = "bastion.bastionuserdata.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" + "KubernetesCluster" = "bastionuserdata.example.com" + "Name" = "bastion.bastionuserdata.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" } } tags = { - "KubernetesCluster" = "bastionuserdata.example.com" - "Name" = "bastion.bastionuserdata.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" + "KubernetesCluster" = "bastionuserdata.example.com" + "Name" = "bastion.bastionuserdata.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/bastionuserdata.example.com" = "owned" } user_data = filebase64("${path.module}/data/aws_launch_template_bastion.bastionuserdata.example.com_user_data") } diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index d9c7ad6a22..2468c03ed7 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-private-shared-ip-example-com" { propagate_at_launch = true value = "bastion.private-shared-ip.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -467,32 +462,29 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "private-shared-ip.example.com" - "Name" = "bastion.private-shared-ip.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" + "KubernetesCluster" = "private-shared-ip.example.com" + "Name" = "bastion.private-shared-ip.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "private-shared-ip.example.com" - "Name" = "bastion.private-shared-ip.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" + "KubernetesCluster" = "private-shared-ip.example.com" + "Name" = "bastion.private-shared-ip.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" } } tags = { - "KubernetesCluster" = "private-shared-ip.example.com" - "Name" = "bastion.private-shared-ip.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" + "KubernetesCluster" = "private-shared-ip.example.com" + "Name" = "bastion.private-shared-ip.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-ip.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index 3be735c78a..f4f4d3b772 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -142,11 +142,6 @@ resource "aws_autoscaling_group" "bastion-private-shared-subnet-example-com" { propagate_at_launch = true value = "bastion.private-shared-subnet.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -462,32 +457,29 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "private-shared-subnet.example.com" - "Name" = "bastion.private-shared-subnet.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" + "KubernetesCluster" = "private-shared-subnet.example.com" + "Name" = "bastion.private-shared-subnet.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "private-shared-subnet.example.com" - "Name" = "bastion.private-shared-subnet.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" + "KubernetesCluster" = "private-shared-subnet.example.com" + "Name" = "bastion.private-shared-subnet.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" } } tags = { - "KubernetesCluster" = "private-shared-subnet.example.com" - "Name" = "bastion.private-shared-subnet.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" + "KubernetesCluster" = "private-shared-subnet.example.com" + "Name" = "bastion.private-shared-subnet.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/private-shared-subnet.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index ff8794149d..11491219ea 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecalico-example-com" { propagate_at_launch = true value = "bastion.privatecalico.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatecalico.example.com" - "Name" = "bastion.privatecalico.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecalico.example.com" = "owned" + "KubernetesCluster" = "privatecalico.example.com" + "Name" = "bastion.privatecalico.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecalico.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatecalico.example.com" - "Name" = "bastion.privatecalico.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecalico.example.com" = "owned" + "KubernetesCluster" = "privatecalico.example.com" + "Name" = "bastion.privatecalico.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecalico.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatecalico.example.com" - "Name" = "bastion.privatecalico.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecalico.example.com" = "owned" + "KubernetesCluster" = "privatecalico.example.com" + "Name" = "bastion.privatecalico.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecalico.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index 8bded2f28c..42ffde45dc 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecanal-example-com" { propagate_at_launch = true value = "bastion.privatecanal.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatecanal.example.com" - "Name" = "bastion.privatecanal.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecanal.example.com" = "owned" + "KubernetesCluster" = "privatecanal.example.com" + "Name" = "bastion.privatecanal.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecanal.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatecanal.example.com" - "Name" = "bastion.privatecanal.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecanal.example.com" = "owned" + "KubernetesCluster" = "privatecanal.example.com" + "Name" = "bastion.privatecanal.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecanal.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatecanal.example.com" - "Name" = "bastion.privatecanal.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecanal.example.com" = "owned" + "KubernetesCluster" = "privatecanal.example.com" + "Name" = "bastion.privatecanal.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecanal.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf index ee9f993eeb..3152017af5 100644 --- a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" { propagate_at_launch = true value = "bastion.privatecilium.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index ee9f993eeb..3152017af5 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" { propagate_at_launch = true value = "bastion.privatecilium.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 69242a79f5..40b6e0fc61 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" { propagate_at_launch = true value = "bastion.privatecilium.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatecilium.example.com" - "Name" = "bastion.privatecilium.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatecilium.example.com" = "owned" + "KubernetesCluster" = "privatecilium.example.com" + "Name" = "bastion.privatecilium.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatecilium.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index b3d5767b34..5a7f7a841e 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateciliumadvanced-example-com" { propagate_at_launch = true value = "bastion.privateciliumadvanced.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -502,32 +497,29 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privateciliumadvanced.example.com" - "Name" = "bastion.privateciliumadvanced.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" + "KubernetesCluster" = "privateciliumadvanced.example.com" + "Name" = "bastion.privateciliumadvanced.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privateciliumadvanced.example.com" - "Name" = "bastion.privateciliumadvanced.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" + "KubernetesCluster" = "privateciliumadvanced.example.com" + "Name" = "bastion.privateciliumadvanced.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privateciliumadvanced.example.com" - "Name" = "bastion.privateciliumadvanced.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" + "KubernetesCluster" = "privateciliumadvanced.example.com" + "Name" = "bastion.privateciliumadvanced.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 73132a9d28..c399ca8078 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -157,16 +157,6 @@ resource "aws_autoscaling_group" "bastion-privatedns1-example-com" { propagate_at_launch = true value = "fib+baz" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" - propagate_at_launch = true - value = "node" - } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -559,41 +549,35 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatedns1.example.com" - "Name" = "bastion.privatedns1.example.com" - "Owner" = "John Doe" - "foo/bar" = "fib+baz" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns1.example.com" = "owned" + "KubernetesCluster" = "privatedns1.example.com" + "Name" = "bastion.privatedns1.example.com" + "Owner" = "John Doe" + "foo/bar" = "fib+baz" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns1.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatedns1.example.com" - "Name" = "bastion.privatedns1.example.com" - "Owner" = "John Doe" - "foo/bar" = "fib+baz" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns1.example.com" = "owned" + "KubernetesCluster" = "privatedns1.example.com" + "Name" = "bastion.privatedns1.example.com" + "Owner" = "John Doe" + "foo/bar" = "fib+baz" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns1.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatedns1.example.com" - "Name" = "bastion.privatedns1.example.com" - "Owner" = "John Doe" - "foo/bar" = "fib+baz" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns1.example.com" = "owned" + "KubernetesCluster" = "privatedns1.example.com" + "Name" = "bastion.privatedns1.example.com" + "Owner" = "John Doe" + "foo/bar" = "fib+baz" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns1.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index 1bb935db3c..f477d4fe04 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatedns2-example-com" { propagate_at_launch = true value = "bastion.privatedns2.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -476,32 +471,29 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatedns2.example.com" - "Name" = "bastion.privatedns2.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns2.example.com" = "owned" + "KubernetesCluster" = "privatedns2.example.com" + "Name" = "bastion.privatedns2.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns2.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatedns2.example.com" - "Name" = "bastion.privatedns2.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns2.example.com" = "owned" + "KubernetesCluster" = "privatedns2.example.com" + "Name" = "bastion.privatedns2.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns2.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatedns2.example.com" - "Name" = "bastion.privatedns2.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatedns2.example.com" = "owned" + "KubernetesCluster" = "privatedns2.example.com" + "Name" = "bastion.privatedns2.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatedns2.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index a3af98d2ef..967f668056 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateflannel-example-com" { propagate_at_launch = true value = "bastion.privateflannel.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privateflannel.example.com" - "Name" = "bastion.privateflannel.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateflannel.example.com" = "owned" + "KubernetesCluster" = "privateflannel.example.com" + "Name" = "bastion.privateflannel.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateflannel.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privateflannel.example.com" - "Name" = "bastion.privateflannel.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateflannel.example.com" = "owned" + "KubernetesCluster" = "privateflannel.example.com" + "Name" = "bastion.privateflannel.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateflannel.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privateflannel.example.com" - "Name" = "bastion.privateflannel.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateflannel.example.com" = "owned" + "KubernetesCluster" = "privateflannel.example.com" + "Name" = "bastion.privateflannel.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateflannel.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index 87d284731c..9b991ec28e 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -162,11 +162,6 @@ resource "aws_autoscaling_group" "bastion-privatekopeio-example-com" { propagate_at_launch = true value = "bastion.privatekopeio.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -491,32 +486,29 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privatekopeio.example.com" - "Name" = "bastion.privatekopeio.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatekopeio.example.com" = "owned" + "KubernetesCluster" = "privatekopeio.example.com" + "Name" = "bastion.privatekopeio.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatekopeio.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privatekopeio.example.com" - "Name" = "bastion.privatekopeio.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatekopeio.example.com" = "owned" + "KubernetesCluster" = "privatekopeio.example.com" + "Name" = "bastion.privatekopeio.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatekopeio.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privatekopeio.example.com" - "Name" = "bastion.privatekopeio.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privatekopeio.example.com" = "owned" + "KubernetesCluster" = "privatekopeio.example.com" + "Name" = "bastion.privatekopeio.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privatekopeio.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index f17ef3e7e7..2d5088effd 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -147,16 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateweave-example-com" { propagate_at_launch = true value = "bastion.privateweave.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" - propagate_at_launch = true - value = "node" - } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -505,35 +495,29 @@ resource "aws_launch_template" "bastion-privateweave-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "privateweave.example.com" - "Name" = "bastion.privateweave.example.com" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateweave.example.com" = "owned" + "KubernetesCluster" = "privateweave.example.com" + "Name" = "bastion.privateweave.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateweave.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "privateweave.example.com" - "Name" = "bastion.privateweave.example.com" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateweave.example.com" = "owned" + "KubernetesCluster" = "privateweave.example.com" + "Name" = "bastion.privateweave.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateweave.example.com" = "owned" } } tags = { - "KubernetesCluster" = "privateweave.example.com" - "Name" = "bastion.privateweave.example.com" - "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/privateweave.example.com" = "owned" + "KubernetesCluster" = "privateweave.example.com" + "Name" = "bastion.privateweave.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/privateweave.example.com" = "owned" } } diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index 111867c411..fb1fffd530 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-unmanaged-example-com" { propagate_at_launch = true value = "bastion.unmanaged.example.com" } - tag { - key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" - propagate_at_launch = true - value = "" - } tag { key = "k8s.io/role/bastion" propagate_at_launch = true @@ -467,32 +462,29 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" { tag_specifications { resource_type = "instance" tags = { - "KubernetesCluster" = "unmanaged.example.com" - "Name" = "bastion.unmanaged.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/unmanaged.example.com" = "owned" + "KubernetesCluster" = "unmanaged.example.com" + "Name" = "bastion.unmanaged.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/unmanaged.example.com" = "owned" } } tag_specifications { resource_type = "volume" tags = { - "KubernetesCluster" = "unmanaged.example.com" - "Name" = "bastion.unmanaged.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/unmanaged.example.com" = "owned" + "KubernetesCluster" = "unmanaged.example.com" + "Name" = "bastion.unmanaged.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/unmanaged.example.com" = "owned" } } tags = { - "KubernetesCluster" = "unmanaged.example.com" - "Name" = "bastion.unmanaged.example.com" - "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = "" - "k8s.io/role/bastion" = "1" - "kops.k8s.io/instancegroup" = "bastion" - "kubernetes.io/cluster/unmanaged.example.com" = "owned" + "KubernetesCluster" = "unmanaged.example.com" + "Name" = "bastion.unmanaged.example.com" + "k8s.io/role/bastion" = "1" + "kops.k8s.io/instancegroup" = "bastion" + "kubernetes.io/cluster/unmanaged.example.com" = "owned" } }