kubelet: promote OS & arch labels to GA

kubelet now applies both the beta and the GA labels to ensure backward
compatibility.
This commit is contained in:
Yu-Ju Hong
2019-01-17 14:57:43 -08:00
parent 4531ce692a
commit 00d93f0cc3
3 changed files with 27 additions and 15 deletions

View File

@@ -1046,9 +1046,11 @@ func TestRegisterWithApiServer(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: testKubeletHostname,
Labels: map[string]string{
kubeletapis.LabelHostname: testKubeletHostname,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
kubeletapis.LabelHostname: testKubeletHostname,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
kubeletapis.LegacyLabelOS: goruntime.GOOS,
kubeletapis.LegacyLabelArch: goruntime.GOARCH,
},
},
}, nil
@@ -1091,9 +1093,11 @@ func TestTryRegisterWithApiServer(t *testing.T) {
node := &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
kubeletapis.LabelHostname: testKubeletHostname,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
kubeletapis.LabelHostname: testKubeletHostname,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
kubeletapis.LegacyLabelOS: goruntime.GOOS,
kubeletapis.LegacyLabelArch: goruntime.GOARCH,
},
},
}