Merge pull request #8925 from k8s-infra-cherrypick-robot/cherry-pick-8910-to-cluster-autoscaler-release-1.30

[cluster-autoscaler-release-1.30] Add new AWS provider label that needs to be ignored

Author: k8s-ci-robot

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 {

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