github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6949 from roberthbailey/node-register

Browse Source 
Modify nodes to register directly with the master.
This commit is contained in:
Eric Tune
2015-05-19 11:29:43 -07:00
parent 349d8b1a67 8e356f8439
commit 1f4172d23c
12 changed files with 314 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/validation/validation.go
View File

@@ -1222,6 +1222,8 @@ func ValidateNodeUpdate(oldNode *api.Node, node *api.Node) errs.ValidationErrorL
oldNode.ObjectMeta = node.ObjectMeta
// Allow users to update capacity
oldNode.Status.Capacity = node.Status.Capacity
// Allow the controller manager to assign a CIDR to a node.
oldNode.Spec.PodCIDR = node.Spec.PodCIDR
// Allow users to unschedule node
oldNode.Spec.Unschedulable = node.Spec.Unschedulable
// Clear status