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

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 == "" {

26
pkg/util/node/node_test.go
View File

@@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
@@ -287,8 +287,8 @@ func Test_GetZoneKey(t *testing.T) {
node: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelZoneFailureDomain: "zone1",
v1.LabelZoneRegion: "region1",
v1.LabelFailureDomainBetaZone: "zone1",
v1.LabelFailureDomainBetaRegion: "region1",
},
},
},
@@ -299,8 +299,8 @@ func Test_GetZoneKey(t *testing.T) {
node: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelZoneFailureDomainStable: "zone1",
v1.LabelZoneRegionStable: "region1",
v1.LabelTopologyZone: "zone1",
v1.LabelTopologyRegion: "region1",
},
},
},
@@ -311,10 +311,10 @@ func Test_GetZoneKey(t *testing.T) {
node: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelZoneFailureDomainStable: "zone1",
v1.LabelZoneRegionStable: "region1",
v1.LabelZoneFailureDomain: "zone1",
v1.LabelZoneRegion: "region1",
v1.LabelTopologyZone: "zone1",
v1.LabelTopologyRegion: "region1",
v1.LabelFailureDomainBetaZone: "zone1",
v1.LabelFailureDomainBetaRegion: "region1",
},
},
},
@@ -325,10 +325,10 @@ func Test_GetZoneKey(t *testing.T) {
node: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelZoneFailureDomainStable: "zone1",
v1.LabelZoneRegionStable: "region1",
v1.LabelZoneFailureDomain: "zone2",
v1.LabelZoneRegion: "region2",
v1.LabelTopologyZone: "zone1",
v1.LabelTopologyRegion: "region1",
v1.LabelFailureDomainBetaZone: "zone2",
v1.LabelFailureDomainBetaRegion: "region2",
},
},
},