diff --git a/pkg/platform/provider/baremetal/cluster/util.go b/pkg/platform/provider/baremetal/cluster/util.go index af013662f..ef11eec6a 100644 --- 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 index 8c832d28b..c02b8fcb4 100644 --- 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/pkg/platform/provider/baremetal/util/allocator/bitmap.go b/pkg/util/allocator/bitmap.go similarity index 100% rename from pkg/platform/provider/baremetal/util/allocator/bitmap.go rename to pkg/util/allocator/bitmap.go diff --git a/pkg/platform/provider/baremetal/util/allocator/bitmap_test.go b/pkg/util/allocator/bitmap_test.go similarity index 100% rename from pkg/platform/provider/baremetal/util/allocator/bitmap_test.go rename to pkg/util/allocator/bitmap_test.go diff --git a/pkg/platform/provider/baremetal/util/allocator/interfaces.go b/pkg/util/allocator/interfaces.go similarity index 100% rename from pkg/platform/provider/baremetal/util/allocator/interfaces.go rename to pkg/util/allocator/interfaces.go diff --git a/pkg/platform/provider/baremetal/util/allocator/utils.go b/pkg/util/allocator/utils.go similarity index 100% rename from pkg/platform/provider/baremetal/util/allocator/utils.go rename to pkg/util/allocator/utils.go diff --git a/pkg/platform/provider/baremetal/util/ipallocator/allocator.go b/pkg/util/ipallocator/allocator.go similarity index 99% rename from pkg/platform/provider/baremetal/util/ipallocator/allocator.go rename to pkg/util/ipallocator/allocator.go index af1be42a8..6c413b4f6 100644 --- a/pkg/platform/provider/baremetal/util/ipallocator/allocator.go +++ b/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 index cda4d0195..b0770796e 100644 --- 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.