Use topology labels instead of old beta names (#96033)

* Rename const for topology.../zone

* Rename const for topology.../region

* Rename const for failure-domain.../zone

* Rename const for failure-domain.../region

* Restore old names for compat
This commit is contained in:
Tim Hockin
2020-11-05 20:26:50 -08:00
committed by GitHub
parent cccd77bd3a
commit 819ff9b087
65 changed files with 630 additions and 624 deletions

View File

@@ -36,12 +36,12 @@ func RecreateNodes(c clientset.Interface, nodes []v1.Node) error {
for i := range nodes {
node := &nodes[i]
if zone, ok := node.Labels[v1.LabelZoneFailureDomain]; ok {
if zone, ok := node.Labels[v1.LabelFailureDomainBetaZone]; ok {
nodeNamesByZone[zone] = append(nodeNamesByZone[zone], node.Name)
continue
}
if zone, ok := node.Labels[v1.LabelZoneFailureDomainStable]; ok {
if zone, ok := node.Labels[v1.LabelTopologyZone]; ok {
nodeNamesByZone[zone] = append(nodeNamesByZone[zone], node.Name)
continue
}