github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26207 from zmerlynn/fix-unneeded-updated

Browse Source 
nodecontroller: Fix log message on successful update
This commit is contained in:
Alex Robinson
2016-05-27 09:56:28 -07:00
parent 4047ca1d97 cb69960742
commit 7522389d8d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/node/nodecontroller.go
View File

@@ -375,8 +375,9 @@ func (nc *NodeController) allocateOrOccupyCIDR(obj interface{}) {
glog.V(4).Infof("Assigning node %s CIDR %s", node.Name, podCIDR)
for rep := 0; rep < podCIDRUpdateRetry; rep++ {
node.Spec.PodCIDR = podCIDR.String()
if _, err := nc.kubeClient.Core().Nodes().Update(node); err == nil {
glog.Errorf("Failed while updating Node.Spec.PodCIDR : %v", err)
if _, err := nc.kubeClient.Core().Nodes().Update(node); err != nil {
glog.Errorf("Failed while updating Node.Spec.PodCIDR (%d retries left): %v", podCIDRUpdateRetry-rep-1, err)
} else {
break
}
node, err = nc.kubeClient.Core().Nodes().Get(node.Name)