github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Synced the changed made in PR #56260.

pull/6/head
Jing Ai 2017-11-22 18:16:00 -08:00
parent 8cec6e03eb
commit 17c63ee784
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/node/ipam/sync/sync.go
View File

@ -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)