github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Update user guide and scheduler documentation to describe node affinity.

Browse Source 
Register image priority locality function, which the original PR that introduced
it forgot to do. Change zone and region labels to beta.
This commit is contained in:
David Oppenheimer
2016-02-14 16:56:40 -08:00
parent 5fe856c749
commit 053f1c6008
6 changed files with 107 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@@ -970,7 +970,7 @@ func (kl *Kubelet) initialNodeStatus() (*api.Node, error) {
node := &api.Node{
ObjectMeta: api.ObjectMeta{
Name: kl.nodeName,
Labels: map[string]string{"kubernetes.io/hostname": kl.hostname},
Labels: map[string]string{unversioned.LabelHostname: kl.hostname},
},
Spec: api.NodeSpec{
Unschedulable: !kl.registerSchedulable,