scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-01 13:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #56260 again.

Browse Source
This commit is contained in:
Jing Ai
2017-11-24 18:23:56 -08:00
parent ba577bb5dd
commit ce5d158f22
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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",