mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
Restore beta os/arch labels on initial node registration
This commit is contained in:
parent
248c116963
commit
5c88880584
@ -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",
|
||||||
|
@ -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
|
||||||
@ -266,6 +269,8 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
|
|||||||
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{
|
||||||
|
@ -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"
|
||||||
@ -1139,6 +1140,8 @@ func TestRegisterWithApiServer(t *testing.T) {
|
|||||||
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
|
||||||
@ -1184,6 +1187,8 @@ func TestTryRegisterWithApiServer(t *testing.T) {
|
|||||||
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,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user