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

Restore beta os/arch labels on initial node registration

Browse Source
This commit is contained in:
Jordan Liggitt 2020-11-23 11:22:44 -05:00
parent 248c116963
commit 5c88880584
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/BUILD
View File

@ -44,6 +44,7 @@ go_library(
"//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/apis/core/v1/helper/qos:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/fieldpath:go_default_library", "//pkg/fieldpath:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/apis/podresources:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library",
"//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cadvisor:go_default_library",
@ -195,6 +196,7 @@ go_test(
deps = [ deps = [
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library",
"//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/config:go_default_library", "//pkg/kubelet/config:go_default_library",

11
pkg/kubelet/kubelet_node_status.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/nodestatus" "k8s.io/kubernetes/pkg/kubelet/nodestatus"
"k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/kubelet/util"
@ -201,6 +202,8 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool
v1.LabelOSStable, v1.LabelOSStable,
v1.LabelArchStable, v1.LabelArchStable,
v1.LabelWindowsBuild, v1.LabelWindowsBuild,
kubeletapis.LabelOS,
kubeletapis.LabelArch,
} }
needsUpdate := false needsUpdate := false
@ -263,9 +266,11 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
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.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH, v1.LabelArchStable: goruntime.GOARCH,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
}, },
}, },
Spec: v1.NodeSpec{ Spec: v1.NodeSpec{

17
pkg/kubelet/kubelet_node_status_test.go
View File

@ -49,6 +49,7 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/component-base/version" "k8s.io/component-base/version"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@ -1136,9 +1137,11 @@ func TestRegisterWithApiServer(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: testKubeletHostname, Name: testKubeletHostname,
Labels: map[string]string{ Labels: map[string]string{
v1.LabelHostname: testKubeletHostname, v1.LabelHostname: testKubeletHostname,
v1.LabelOSStable: goruntime.GOOS, v1.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH, v1.LabelArchStable: goruntime.GOARCH,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
}, },
}, },
}, nil }, nil
@ -1181,9 +1184,11 @@ func TestTryRegisterWithApiServer(t *testing.T) {
node := &v1.Node{ node := &v1.Node{
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.LabelOSStable: goruntime.GOOS,
v1.LabelArchStable: goruntime.GOARCH, v1.LabelArchStable: goruntime.GOARCH,
kubeletapis.LabelOS: goruntime.GOOS,
kubeletapis.LabelArch: goruntime.GOARCH,
}, },
}, },
} }