diff --git a/cluster-autoscaler/processors/nodegroupset/aws_nodegroups.go b/cluster-autoscaler/processors/nodegroupset/aws_nodegroups.go index 2c22f8280522..e576ecbf67c8 100644 --- a/cluster-autoscaler/processors/nodegroupset/aws_nodegroups.go +++ b/cluster-autoscaler/processors/nodegroupset/aws_nodegroups.go @@ -32,6 +32,7 @@ func CreateAwsNodeInfoComparator(extraIgnoredLabels []string, ratioOpts config.N "k8s.amazonaws.com/eniConfig": true, // this is a label used by the AWS CNI for custom networking. "lifecycle": true, // this is a label used by the AWS for spot. "topology.ebs.csi.aws.com/zone": true, // this is a label used by the AWS EBS CSI driver as a target for Persistent Volume Node Affinity + "topology.k8s.aws/zone-id": true, // this is a label used to determine the location of resources in an account relative to those in another one } for k, v := range BasicIgnoredLabels { diff --git a/cluster-autoscaler/processors/nodegroupset/aws_nodegroups_test.go b/cluster-autoscaler/processors/nodegroupset/aws_nodegroups_test.go index 334d9dc8d627..28a2fb4e2e70 100644 --- a/cluster-autoscaler/processors/nodegroupset/aws_nodegroups_test.go +++ b/cluster-autoscaler/processors/nodegroupset/aws_nodegroups_test.go @@ -162,6 +162,27 @@ func TestIsAwsNodeInfoSimilar(t *testing.T) { value2: "bar", removeOneLabel: true, }, + { + description: "topology.k8s.aws/zone-id empty value", + label: "topology.k8s.aws/zone-id", + value1: "", + value2: "", + removeOneLabel: false, + }, + { + description: "topology.k8s.aws/zone-id different values", + label: "topology.k8s.aws/zone-id", + value1: "foo", + value2: "bar", + removeOneLabel: false, + }, + { + description: "topology.k8s.aws/zone-id one node labeled", + label: "topology.k8s.aws/zone-id", + value1: "foo", + value2: "bar", + removeOneLabel: true, + }, } { t.Run(tc.description, func(t *testing.T) { node1.ObjectMeta.Labels[tc.label] = tc.value1