From 17c63ee7843fa546346cb43ca8f4f85a499699ba Mon Sep 17 00:00:00 2001 From: Jing Ai Date: Wed, 22 Nov 2017 18:16:00 -0800 Subject: [PATCH] Synced the changed made in PR #56260. --- pkg/controller/node/ipam/sync/sync.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/node/ipam/sync/sync.go b/pkg/controller/node/ipam/sync/sync.go index 737826547c2..71489b8bac5 100644 --- a/pkg/controller/node/ipam/sync/sync.go +++ b/pkg/controller/node/ipam/sync/sync.go @@ -244,7 +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 { - fmt.Errorf("Detect mode %q while expect mode %q when syncing from cloud", sync.mode, SyncFromCloud) + 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) @@ -274,7 +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 { - fmt.Errorf("Detect mode %q while expect mode %q when syncing from cluster", sync.mode, SyncFromCluster) + glog.Warningf("Detect mode %q while expect to sync from cluster", sync.mode) } _, aliasRange, err := net.ParseCIDR(node.Spec.PodCIDR)