Merge pull request #101534 from kassarl/issue-98281

Use GA topology labels for Azuredisk
This commit is contained in:
Kubernetes Prow Robot
2021-05-07 13:32:00 -07:00
committed by GitHub
6 changed files with 39 additions and 24 deletions

View File

@@ -361,19 +361,19 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
})
}
} else {
// Set node affinity labels based on fault domains.
// Set node affinity labels based on topology.
// This is required because unzoned AzureDisk can't be attached to zoned nodes.
// There are at most 3 fault domains available in each region.
// There are at most 3 Availability Zones per supported Azure region.
// Refer https://docs.microsoft.com/en-us/azure/virtual-machines/windows/manage-availability.
for i := 0; i < 3; i++ {
requirements := []v1.NodeSelectorRequirement{
{
Key: v1.LabelFailureDomainBetaRegion,
Key: v1.LabelTopologyRegion,
Operator: v1.NodeSelectorOpIn,
Values: []string{diskController.GetLocation()},
},
{
Key: v1.LabelFailureDomainBetaZone,
Key: v1.LabelTopologyZone,
Operator: v1.NodeSelectorOpIn,
Values: []string{strconv.Itoa(i)},
},