Merge pull request #4061 from marwanad/stable-zone-labels

add stable zone labels in azure template generation
kubernetes · May 6, 2021 · 67dc894 · 67dc894
2 parents c6d4535 + dda7db0
commit 67dc894
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/azure/azure_template.go b/cluster-autoscaler/cloudprovider/azure/azure_template.go
@@ -52,6 +52,7 @@ func buildGenericLabels(template compute.VirtualMachineScaleSet, nodeName string
 
 	result[apiv1.LabelInstanceType] = *template.Sku.Name
 	result[apiv1.LabelZoneRegion] = strings.ToLower(*template.Location)
+	result[apiv1.LabelTopologyRegion] = strings.ToLower(*template.Location)
 
 	if template.Zones != nil && len(*template.Zones) > 0 {
 		failureDomains := make([]string, len(*template.Zones))
@@ -60,8 +61,10 @@ func buildGenericLabels(template compute.VirtualMachineScaleSet, nodeName string
 		}
 
 		result[apiv1.LabelZoneFailureDomain] = strings.Join(failureDomains[:], cloudvolume.LabelMultiZoneDelimiter)
+		result[apiv1.LabelTopologyZone] = strings.Join(failureDomains[:], cloudvolume.LabelMultiZoneDelimiter)
 	} else {
 		result[apiv1.LabelZoneFailureDomain] = "0"
+		result[apiv1.LabelTopologyZone] = "0"
 	}
 
 	result[apiv1.LabelHostname] = nodeName