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

Merge pull request #73333 from yujuhong/os-arch-labels

Browse Source 
kubelet: promote OS & arch labels to GA
This commit is contained in:
Kubernetes Prow Robot
2019-02-15 16:45:57 -08:00
committed by GitHub
parent d5b890ea46 5fd27c38da
commit 3e748958dc
5 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -49,6 +49,7 @@ import (
"k8s.io/client-go/rest"
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/features"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@@ -1253,11 +1254,11 @@ func TestRegisterWithApiServer(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: testKubeletHostname,
Labels: map[string]string{
v1.LabelHostname: testKubeletHostname,
v1.LabelOS: goruntime.GOOS,
v1.LabelArch: goruntime.GOARCH,
v1.LegacyLabelOS: goruntime.GOOS,
v1.LegacyLabelArch: goruntime.GOARCH,
v1.LabelHostname: testKubeletHostname,
v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
},
},
}, nil
@@ -1300,11 +1301,11 @@ func TestTryRegisterWithApiServer(t *testing.T) {
node := &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
v1.LabelHostname: testKubeletHostname,
v1.LabelOS: goruntime.GOOS,
v1.LabelArch: goruntime.GOARCH,
v1.LegacyLabelOS: goruntime.GOOS,
v1.LegacyLabelArch: goruntime.GOARCH,
v1.LabelHostname: testKubeletHostname,
v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
},
},
}
@@ -1536,8 +1537,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1552,8 +1553,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
{
@@ -1565,8 +1566,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1577,8 +1578,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "old-zone-failure-domain",
v1.LabelZoneRegion: "old-zone-region",
v1.LabelInstanceType: "old-instance-type",
v1.LabelOS: "old-os",
v1.LabelArch: "old-arch",
kubeletapis.LabelOS: "old-os",
kubeletapis.LabelArch: "old-arch",
},
},
},
@@ -1588,8 +1589,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
{
@@ -1601,8 +1602,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1613,8 +1614,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
"please-persist": "foo",
},
},
@@ -1625,8 +1626,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
"please-persist": "foo",
},
},
@@ -1644,8 +1645,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
"please-persist": "foo",
},
},
@@ -1656,8 +1657,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
"please-persist": "foo",
},
},
@@ -1670,8 +1671,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1682,8 +1683,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1693,8 +1694,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
{
@@ -1706,8 +1707,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
},
@@ -1720,8 +1721,8 @@ func TestUpdateDefaultLabels(t *testing.T) {
v1.LabelZoneFailureDomain: "new-zone-failure-domain",
v1.LabelZoneRegion: "new-zone-region",
v1.LabelInstanceType: "new-instance-type",
v1.LabelOS: "new-os",
v1.LabelArch: "new-arch",
kubeletapis.LabelOS: "new-os",
kubeletapis.LabelArch: "new-arch",
},
},
}