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

Merge pull request #82049 from andrewsykim/ga-node-instance-type-label

Browse Source 
Promote Node Instance Type Label to GA
This commit is contained in:
Kubernetes Prow Robot
2019-11-08 13:47:58 -08:00
committed by GitHub
parent 8b123b1f4f 560b8efb79
commit 9cf309ed59
9 changed files with 126 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -1414,6 +1414,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1432,6 +1433,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1447,6 +1449,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1461,6 +1464,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "old-zone-region",
v1.LabelZoneFailureDomain: "old-zone-failure-domain",
v1.LabelZoneRegion: "old-zone-region",
v1.LabelInstanceTypeStable: "old-instance-type",
v1.LabelInstanceType: "old-instance-type",
kubeletapis.LabelOS: "old-os",
kubeletapis.LabelArch: "old-arch",
@@ -1474,6 +1478,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1489,6 +1494,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1503,6 +1509,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1517,6 +1524,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1538,6 +1546,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1552,6 +1561,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1568,6 +1578,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1582,6 +1593,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1595,6 +1607,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1610,6 +1623,7 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
@@ -1626,11 +1640,58 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneRegionStable: "new-zone-region",
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
{
name: "backfill required for new stable labels for os/arch/zones/regions/instance-type",
initialNode: &v1.Node{
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.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
v1.LabelOSStable: "new-os",
v1.LabelArchStable: "new-arch",
},
},
},
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",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
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.LabelInstanceTypeStable: "new-instance-type",
v1.LabelInstanceType: "new-instance-type",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
v1.LabelOSStable: "new-os",
v1.LabelArchStable: "new-arch",
},
},
}
for _, tc := range cases {