scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues 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

144
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -1412,10 +1412,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1431,10 +1431,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: true,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1447,10 +1447,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1462,10 +1462,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "old-hostname",
v1.LabelZoneFailureDomainStable: "old-zone-failure-domain",
v1.LabelZoneRegionStable: "old-zone-region",
v1.LabelZoneFailureDomain: "old-zone-failure-domain",
v1.LabelZoneRegion: "old-zone-region",
v1.LabelTopologyZone: "old-zone-failure-domain",
v1.LabelTopologyRegion: "old-zone-region",
v1.LabelFailureDomainBetaZone: "old-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "old-zone-region",
v1.LabelInstanceTypeStable: "old-instance-type",
v1.LabelInstanceType: "old-instance-type",
v1.LabelOSStable: "old-os",
@@ -1476,10 +1476,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: true,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1492,10 +1492,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1507,10 +1507,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1522,10 +1522,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: false,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1544,10 +1544,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1559,10 +1559,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: false,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1576,10 +1576,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1591,10 +1591,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1605,10 +1605,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: false,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1621,10 +1621,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1638,10 +1638,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
needsUpdate: true,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1654,10 +1654,10 @@ func TestUpdateDefaultLabels(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",
@@ -1668,20 +1668,20 @@ func TestUpdateDefaultLabels(t *testing.T) {
existingNode: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelHostname: "new-hostname",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
},
},
},
needsUpdate: true,
finalLabels: map[string]string{
v1.LabelHostname: "new-hostname",
v1.LabelZoneFailureDomainStable: "new-zone-failure-domain",
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelTopologyZone: "new-zone-failure-domain",
v1.LabelTopologyRegion: "new-zone-region",
v1.LabelFailureDomainBetaZone: "new-zone-failure-domain",
v1.LabelFailureDomainBetaRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOSStable: "new-os",