github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +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
Show Stats 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 "" 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] zone, ok := labels[v1.LabelFailureDomainBetaZone]
if !ok { if !ok {
zone, _ = labels[v1.LabelTopologyZone] zone, _ = labels[v1.LabelTopologyZone]
} }
// TODO: prefer stable labels for region in v1.18
region, ok := labels[v1.LabelFailureDomainBetaRegion] region, ok := labels[v1.LabelFailureDomainBetaRegion]
if !ok { if !ok {
region, _ = labels[v1.LabelTopologyRegion] region, _ = labels[v1.LabelTopologyRegion]

23
staging/src/k8s.io/api/core/v1/well_known_labels.go
View File

@ -19,16 +19,21 @@ package v1
const ( const (
LabelHostname = "kubernetes.io/hostname" LabelHostname = "kubernetes.io/hostname"
LabelFailureDomainBetaZone = "failure-domain.beta.kubernetes.io/zone" LabelTopologyZone = "topology.kubernetes.io/zone"
LabelFailureDomainBetaRegion = "failure-domain.beta.kubernetes.io/region" LabelTopologyRegion = "topology.kubernetes.io/region"
LabelTopologyZone = "topology.kubernetes.io/zone"
LabelTopologyRegion = "topology.kubernetes.io/region"
// Legacy names for compat. // These label have been deprecated since 1.17, but will be supported for
LabelZoneFailureDomain = LabelFailureDomainBetaZone // deprecated, remove after 1.20 // the foreseeable future, to accommodate things like long-lived PVs that
LabelZoneRegion = LabelFailureDomainBetaRegion // deprecated, remove after 1.20 // use them. New users should prefer the "topology.kubernetes.io/*"
LabelZoneFailureDomainStable = LabelTopologyZone // equivalents.
LabelZoneRegionStable = LabelTopologyRegion LabelFailureDomainBetaZone = "failure-domain.beta.kubernetes.io/zone" // deprecated
LabelFailureDomainBetaRegion = "failure-domain.beta.kubernetes.io/region" // deprecated
// Retained for compat when vendored. Do not use these consts in new code.
LabelZoneFailureDomain = LabelFailureDomainBetaZone // deprecated
LabelZoneRegion = LabelFailureDomainBetaRegion // deprecated
LabelZoneFailureDomainStable = LabelTopologyZone // deprecated
LabelZoneRegionStable = LabelTopologyRegion // deprecated
LabelInstanceType = "beta.kubernetes.io/instance-type" LabelInstanceType = "beta.kubernetes.io/instance-type"
LabelInstanceTypeStable = "node.kubernetes.io/instance-type" LabelInstanceTypeStable = "node.kubernetes.io/instance-type"