github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: promote OS & arch labels to GA

Browse Source 
kubelet now applies both the beta and the GA labels to ensure backward
compatibility.
This commit is contained in:
Yu-Ju Hong 2019-02-11 11:24:58 -08:00
parent f7c4389b79
commit 04575f01b0
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/apis/well_known_labels.go
View File

@ -36,12 +36,12 @@ var kubeletLabels = sets.NewString(
v1.LabelZoneFailureDomain, v1.LabelZoneFailureDomain,
v1.LabelZoneRegion, v1.LabelZoneRegion,
v1.LabelInstanceType, v1.LabelInstanceType,
v1.LabelOSStable,
v1.LabelArchStable,
v1.LabelOS, v1.LabelOS,
v1.LabelArch, v1.LabelArch,
v1.LegacyLabelOS,
v1.LegacyLabelArch,
labelZoneFailureDomainGA, labelZoneFailureDomainGA,
labelZoneRegionGA, labelZoneRegionGA,
labelInstanceTypeGA, labelInstanceTypeGA,

8
pkg/kubelet/kubelet_node_status.go
View File

@ -148,10 +148,10 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool
v1.LabelZoneFailureDomain, v1.LabelZoneFailureDomain,
v1.LabelZoneRegion, v1.LabelZoneRegion,
v1.LabelInstanceType, v1.LabelInstanceType,
v1.LabelOSStable,
v1.LabelArchStable,
v1.LabelOS, v1.LabelOS,
v1.LabelArch, v1.LabelArch,
v1.LegacyLabelOS,
v1.LegacyLabelArch,
} }
needsUpdate := false needsUpdate := false
@ -215,10 +215,10 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
Name: string(kl.nodeName), Name: string(kl.nodeName),
Labels: map[string]string{ Labels: map[string]string{
v1.LabelHostname: kl.hostname, v1.LabelHostname: kl.hostname,
v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH,
v1.LabelOS: goruntime.GOOS, v1.LabelOS: goruntime.GOOS,
v1.LabelArch: goruntime.GOARCH, v1.LabelArch: goruntime.GOARCH,
v1.LegacyLabelOS: goruntime.GOOS,
v1.LegacyLabelArch: goruntime.GOARCH,
}, },
}, },
Spec: v1.NodeSpec{ Spec: v1.NodeSpec{

8
pkg/kubelet/kubelet_node_status_test.go
View File

@ -1046,10 +1046,10 @@ func TestRegisterWithApiServer(t *testing.T) {
Name: testKubeletHostname, Name: testKubeletHostname,
Labels: map[string]string{ Labels: map[string]string{
v1.LabelHostname: testKubeletHostname, v1.LabelHostname: testKubeletHostname,
v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH,
v1.LabelOS: goruntime.GOOS, v1.LabelOS: goruntime.GOOS,
v1.LabelArch: goruntime.GOARCH, v1.LabelArch: goruntime.GOARCH,
v1.LegacyLabelOS: goruntime.GOOS,
v1.LegacyLabelArch: goruntime.GOARCH,
}, },
}, },
}, nil }, nil
@ -1093,10 +1093,10 @@ func TestTryRegisterWithApiServer(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
v1.LabelHostname: testKubeletHostname, v1.LabelHostname: testKubeletHostname,
v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH,
v1.LabelOS: goruntime.GOOS, v1.LabelOS: goruntime.GOOS,
v1.LabelArch: goruntime.GOARCH, v1.LabelArch: goruntime.GOARCH,
v1.LegacyLabelOS: goruntime.GOOS,
v1.LegacyLabelArch: goruntime.GOARCH,
}, },
}, },
} }

10
staging/src/k8s.io/api/core/v1/well_known_labels.go
View File

@ -23,14 +23,14 @@ const (
LabelInstanceType = "beta.kubernetes.io/instance-type" LabelInstanceType = "beta.kubernetes.io/instance-type"
LabelOS = "kubernetes.io/os"
LabelArch = "kubernetes.io/arch"
// The OS/Arch labels are promoted to GA in 1.14. kubelet applies both beta // The OS/Arch labels are promoted to GA in 1.14. kubelet applies both beta
// and GA labels to ensure backward compatibility. // and GA labels to ensure backward compatibility.
// TODO: stop applying the beta OS/Arch labels in Kubernetes 1.17. // TODO: stop applying the beta OS/Arch labels in Kubernetes 1.18.
LegacyLabelOS = "beta.kubernetes.io/os" LabelOSStable = "kubernetes.io/os"
LegacyLabelArch = "beta.kubernetes.io/arch" LabelArchStable = "kubernetes.io/arch"
LabelOS = "beta.kubernetes.io/os"
LabelArch = "beta.kubernetes.io/arch"
// LabelNamespaceSuffixKubelet is an allowed label namespace suffix kubelets can self-set ([*.]kubelet.kubernetes.io/*) // LabelNamespaceSuffixKubelet is an allowed label namespace suffix kubelets can self-set ([*.]kubelet.kubernetes.io/*)
LabelNamespaceSuffixKubelet = "kubelet.kubernetes.io" LabelNamespaceSuffixKubelet = "kubelet.kubernetes.io"
// LabelNamespaceSuffixNode is an allowed label namespace suffix kubelets can self-set ([*.]node.kubernetes.io/*) // LabelNamespaceSuffixNode is an allowed label namespace suffix kubelets can self-set ([*.]node.kubernetes.io/*)