github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert changes in sync.go and sync_test.go as the error it intends to resolve becomes transient.

Browse Source
This commit is contained in:
Jing Ai 2017-11-30 15:38:54 -08:00
parent 575a6ec19a
commit 492544b03f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,9 @@ func (op *updateOp) validateRange(ctx context.Context, sync *NodeSync, node *v1.
// alias. // alias.
func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, node *v1.Node, aliasRange *net.IPNet) error { func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, node *v1.Node, aliasRange *net.IPNet) error {
if sync.mode != SyncFromCloud { if sync.mode != SyncFromCloud {
glog.Warningf("Detect mode %q while expect to sync from cloud", sync.mode) 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.V(2).Infof("Updating node spec with alias range, node.PodCIDR = %v", aliasRange) glog.V(2).Infof("Updating node spec with alias range, node.PodCIDR = %v", aliasRange)
@ -274,7 +276,9 @@ func (op *updateOp) updateNodeFromAlias(ctx context.Context, sync *NodeSync, nod
// updateAliasFromNode updates the cloud alias given the node allocation. // updateAliasFromNode updates the cloud alias given the node allocation.
func (op *updateOp) updateAliasFromNode(ctx context.Context, sync *NodeSync, node *v1.Node) error { func (op *updateOp) updateAliasFromNode(ctx context.Context, sync *NodeSync, node *v1.Node) error {
if sync.mode != SyncFromCluster { if sync.mode != SyncFromCluster {
glog.Warningf("Detect mode %q while expect to sync from cluster", sync.mode) 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)
} }
_, aliasRange, err := net.ParseCIDR(node.Spec.PodCIDR) _, aliasRange, err := net.ParseCIDR(node.Spec.PodCIDR)

18
pkg/controller/node/ipam/sync/sync_test.go
View File

@ -145,9 +145,11 @@ func TestNodeSyncUpdate(t *testing.T) {
events: []fakeEvent{{"node1", "CloudCIDRAllocatorMismatch"}}, events: []fakeEvent{{"node1", "CloudCIDRAllocatorMismatch"}},
}, },
{ {
desc: "update alias from node", desc: "update alias from node",
mode: SyncFromCloud, mode: SyncFromCloud,
node: nodeWithCIDRRange, node: nodeWithCIDRRange,
events: []fakeEvent{{"node1", "CloudCIDRAllocatorInvalidMode"}},
wantError: true,
}, },
{ {
desc: "update alias from node", desc: "update alias from node",
@ -163,10 +165,12 @@ func TestNodeSyncUpdate(t *testing.T) {
// XXX/bowei -- validation // XXX/bowei -- validation
}, },
{ {
desc: "update node from alias", desc: "update node from alias",
mode: SyncFromCluster, mode: SyncFromCluster,
node: nodeWithoutCIDRRange, node: nodeWithoutCIDRRange,
fake: fakeAPIs{aliasRange: test.MustParseCIDR("10.1.2.3/16")}, fake: fakeAPIs{aliasRange: test.MustParseCIDR("10.1.2.3/16")},
events: []fakeEvent{{"node1", "CloudCIDRAllocatorInvalidMode"}},
wantError: true,
}, },
{ {
desc: "allocate range", desc: "allocate range",