Merge pull request #53418 from jingax10/node_ipam_branch

Automatic merge from submit-queue (batch tested with PRs 53418, 53366, 53115, 53402, 53130). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Minior cleanup in pkg/controller/node/ipam/sync/sync.go **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #53418 from jingax10/node_ipam_branch
793ee6f4 · Kubernetes Submit Queue · GitHub · eee34e13 · 5f40a423 · 793ee6f4
Commit 793ee6f4 authored Oct 05, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

sync.go pkg/controller/node/ipam/sync/sync.go +1 -6

No files found.
--- a/pkg/controller/node/ipam/sync/sync.go
+++ b/pkg/controller/node/ipam/sync/sync.go
@@ -56,7 +56,7 @@ type kubeAPI interface {
 	UpdateNodePodCIDR(ctx context.Context, node *v1.Node, cidrRange *net.IPNet) error
 	// UpdateNodeNetworkUnavailable updates the network unavailable status for the node.
 	UpdateNodeNetworkUnavailable(nodeName string, unavailable bool) error
-	// EmitNodeEvent emits an event for the given node.
+	// EmitNodeWarningEvent emits an event for the given node.
 	EmitNodeWarningEvent(nodeName, reason, fmt string, args ...interface{})
 }
@@ -264,11 +264,6 @@ func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, nod
 	glog.V(2).Infof("Node %q PodCIDR set to %v", node.Name, aliasRange)
 	if err := sync.kubeAPI.UpdateNodeNetworkUnavailable(node.Name, false); err != nil {
-		glog.Errorf("Error setting route status for node %q: %v", node.Name, err)
-		return err
-	}
-	if err := sync.kubeAPI.UpdateNodeNetworkUnavailable(node.Name, false); err != nil {
 		glog.Errorf("Could not update node NetworkUnavailable status to false: %v", err)
 		return err
 	}