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

Merge pull request #8164 from cjcullen/cloudprovider

Browse Source 
Route creation reconciler loop.
This commit is contained in:
Dawn Chen
2015-05-22 12:27:50 -07:00
parent e0092a1c23 e6da5b9601
commit 677a4aa1a7
23 changed files with 825 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1241,6 +1241,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