refactor: move ipallocator

leoryu · Apr 22, 2020 · 2b49218 · 2b49218
1 parent ef33d2d
commit 2b49218
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/pkg/platform/provider/baremetal/cluster/util.go b/pkg/platform/provider/baremetal/cluster/util.go
@@ -24,7 +24,7 @@ import (
  "net"
 
  "github.com/pkg/errors"
- "tkestack.io/tke/pkg/platform/provider/baremetal/util/ipallocator"
+ "tkestack.io/tke/pkg/util/ipallocator"
 )
 
 func GetNodeCIDRMaskSize(clusterCIDR string, maxNodePodNum int32) (int32, error) {

diff --git a/pkg/platform/provider/baremetal/validation/cluster.go b/pkg/platform/provider/baremetal/validation/cluster.go
@@ -27,8 +27,8 @@ import (
  "k8s.io/apimachinery/pkg/util/validation/field"
  "tkestack.io/tke/api/platform"
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/gpu"
- "tkestack.io/tke/pkg/platform/provider/baremetal/util/ipallocator"
  "tkestack.io/tke/pkg/spec"
+ "tkestack.io/tke/pkg/util/ipallocator"
  "tkestack.io/tke/pkg/util/validation"
 )
 

diff --git a/...ovider/baremetal/util/allocator/bitmap.go → pkg/util/allocator/bitmap.go b/...ovider/baremetal/util/allocator/bitmap.go → pkg/util/allocator/bitmap.go
diff --git a/...r/baremetal/util/allocator/bitmap_test.go → pkg/util/allocator/bitmap_test.go b/...r/baremetal/util/allocator/bitmap_test.go → pkg/util/allocator/bitmap_test.go
diff --git a/...er/baremetal/util/allocator/interfaces.go → pkg/util/allocator/interfaces.go b/...er/baremetal/util/allocator/interfaces.go → pkg/util/allocator/interfaces.go
diff --git a/...rovider/baremetal/util/allocator/utils.go → pkg/util/allocator/utils.go b/...rovider/baremetal/util/allocator/utils.go → pkg/util/allocator/utils.go
diff --git a/...r/baremetal/util/ipallocator/allocator.go → pkg/util/ipallocator/allocator.go b/...r/baremetal/util/ipallocator/allocator.go → pkg/util/ipallocator/allocator.go
@@ -25,7 +25,7 @@ import (
  "net"
 
  api "k8s.io/api/core/v1"
- "tkestack.io/tke/pkg/platform/provider/baremetal/util/allocator"
+ "tkestack.io/tke/pkg/util/allocator"
 )
 
 // Interface manages the allocation of IP addresses out of a range. Interface

diff --git a/pkg/util/validation/validation.go b/pkg/util/validation/validation.go
@@ -26,7 +26,7 @@ import (
  "time"
 
  "github.com/pkg/errors"
- "tkestack.io/tke/pkg/platform/provider/baremetal/util/ipallocator"
+ "tkestack.io/tke/pkg/util/ipallocator"
 )
 
 // IsHTTPSReachle tests that https://host:port is reachble in timeout.