github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/util/node/node.go
View File

@@ -188,15 +188,15 @@ func GetZoneKey(node *v1.Node) string {
}
// TODO: prefer stable labels for zone in v1.18
zone, ok := labels[v1.LabelZoneFailureDomain]
zone, ok := labels[v1.LabelFailureDomainBetaZone]
if !ok {
zone, _ = labels[v1.LabelZoneFailureDomainStable]
zone, _ = labels[v1.LabelTopologyZone]
}
// TODO: prefer stable labels for region in v1.18
region, ok := labels[v1.LabelZoneRegion]
region, ok := labels[v1.LabelFailureDomainBetaRegion]
if !ok {
region, _ = labels[v1.LabelZoneRegionStable]
region, _ = labels[v1.LabelTopologyRegion]
}
if region == "" && zone == "" {