github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Clean up comments around old topology labels

Browse Source
This commit is contained in:
Tim Hockin
2020-11-06 08:43:00 -08:00
parent 4068402459
commit f63ca48a1f
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,13 +187,14 @@ func GetZoneKey(node *v1.Node) string {
return ""
}
// TODO: prefer stable labels for zone in v1.18
// TODO: "failure-domain.beta..." names are deprecated, but will
// stick around a long time due to existing on old extant objects like PVs.
// Maybe one day we can stop considering them (see #88493).
zone, ok := labels[v1.LabelFailureDomainBetaZone]
if !ok {
zone, _ = labels[v1.LabelTopologyZone]
}
// TODO: prefer stable labels for region in v1.18
region, ok := labels[v1.LabelFailureDomainBetaRegion]
if !ok {
region, _ = labels[v1.LabelTopologyRegion]