From ce5d158f224263fa79c2bcb11050e91534eede12 Mon Sep 17 00:00:00 2001
From: Jing Ai <jinga@google.com>
Date: Fri, 24 Nov 2017 18:23:56 -0800
Subject: [PATCH] Merge PR #56260 again.

---
 pkg/controller/node/ipam/sync/sync.go      |  8 ++------
 pkg/controller/node/ipam/sync/sync_test.go | 18 +++++++-----------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkg/controller/node/ipam/sync/sync.go b/pkg/controller/node/ipam/sync/sync.go
index 4995f425543..eeff4a6d5fc 100644
--- a/pkg/controller/node/ipam/sync/sync.go
+++ b/pkg/controller/node/ipam/sync/sync.go
@@ -244,9 +244,7 @@ func (op *updateOp) validateRange(ctx context.Context, sync *NodeSync, node *v1.
 // alias.
 func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, node *v1.Node, aliasRange *net.IPNet) error {
 	if sync.mode != SyncFromCloud {
-		sync.kubeAPI.EmitNodeWarningEvent(node.Name, InvalidModeEvent,
-			"Cannot sync from cloud in mode %q", sync.mode)
-		return fmt.Errorf("cannot sync from cloud in mode %q", sync.mode)
+		glog.Warningf("Detect mode %q while expect to sync from cloud", sync.mode)
 	}
 
 	glog.V(2).Infof("Updating node spec with alias range, node.PodCIDR = %v", aliasRange)
@@ -276,9 +274,7 @@ func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, nod
 // updateAliasFromNode updates the cloud alias given the node allocation.
 func (op *updateOp) updateAliasFromNode(ctx context.Context, sync *NodeSync, node *v1.Node) error {
 	if sync.mode != SyncFromCluster {
-		sync.kubeAPI.EmitNodeWarningEvent(
-			node.Name, InvalidModeEvent, "Cannot sync to cloud in mode %q", sync.mode)
-		return fmt.Errorf("cannot sync to cloud in mode %q", sync.mode)
+		glog.Warningf("Detect mode %q while expect to sync from cluster", sync.mode)
 	}
 
 	_, aliasRange, err := net.ParseCIDR(node.Spec.PodCIDR)
diff --git a/pkg/controller/node/ipam/sync/sync_test.go b/pkg/controller/node/ipam/sync/sync_test.go
index d3268480439..18e1335366e 100644
--- a/pkg/controller/node/ipam/sync/sync_test.go
+++ b/pkg/controller/node/ipam/sync/sync_test.go
@@ -145,11 +145,9 @@ func TestNodeSyncUpdate(t *testing.T) {
 			events: []fakeEvent{{"node1", "CloudCIDRAllocatorMismatch"}},
 		},
 		{
-			desc:      "update alias from node",
-			mode:      SyncFromCloud,
-			node:      nodeWithCIDRRange,
-			events:    []fakeEvent{{"node1", "CloudCIDRAllocatorInvalidMode"}},
-			wantError: true,
+			desc: "update alias from node",
+			mode: SyncFromCloud,
+			node: nodeWithCIDRRange,
 		},
 		{
 			desc: "update alias from node",
@@ -165,12 +163,10 @@ func TestNodeSyncUpdate(t *testing.T) {
 			// XXX/bowei -- validation
 		},
 		{
-			desc:      "update node from alias",
-			mode:      SyncFromCluster,
-			node:      nodeWithoutCIDRRange,
-			fake:      fakeAPIs{aliasRange: test.MustParseCIDR("10.1.2.3/16")},
-			events:    []fakeEvent{{"node1", "CloudCIDRAllocatorInvalidMode"}},
-			wantError: true,
+			desc: "update node from alias",
+			mode: SyncFromCluster,
+			node: nodeWithoutCIDRRange,
+			fake: fakeAPIs{aliasRange: test.MustParseCIDR("10.1.2.3/16")},
 		},
 		{
 			desc:      "allocate range",