refactor(platform): add register provider func (tkestack#1664)

leoryu · Nov 18, 2021 · c3028d6 · c3028d6
1 parent fa659cb
commit c3028d6
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 21 deletions.
diff --git a/cmd/tke-installer/installer.go b/cmd/tke-installer/installer.go
@@ -26,7 +26,7 @@ import (
 
  "tkestack.io/tke/cmd/tke-installer/app"
 
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
+ baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
 )
 
 func main() {
@@ -35,5 +35,7 @@ func main() {
  runtime.GOMAXPROCS(runtime.NumCPU())
  }
 
+ baremetalcluster.RegisterProvider()
+
  app.NewApp("tke-installer").Run()
 }
diff --git a/cmd/tke-platform-api/apiserver.go b/cmd/tke-platform-api/apiserver.go
@@ -25,9 +25,9 @@ import (
  "time"
 
  "tkestack.io/tke/cmd/tke-platform-api/app"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
- _ "tkestack.io/tke/pkg/platform/provider/imported/cluster"
+ baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
+ baremetalmachine "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
+ importedcluster "tkestack.io/tke/pkg/platform/provider/imported/cluster"
 )
 
 func main() {
@@ -36,5 +36,9 @@ func main() {
  runtime.GOMAXPROCS(runtime.NumCPU())
  }
 
+ baremetalcluster.RegisterProvider()
+ baremetalmachine.RegisterProvider()
+ importedcluster.RegisterProvider()
+
  app.NewApp("tke-platform-api").Run()
 }
diff --git a/cmd/tke-platform-controller/controller-manager.go b/cmd/tke-platform-controller/controller-manager.go
@@ -25,9 +25,9 @@ import (
  "time"
 
  "tkestack.io/tke/cmd/tke-platform-controller/app"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
- _ "tkestack.io/tke/pkg/platform/provider/imported/cluster"
+ baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
+ baremetalmachine "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
+ importedcluster "tkestack.io/tke/pkg/platform/provider/imported/cluster"
 )
 
 func main() {
@@ -36,5 +36,9 @@ func main() {
  runtime.GOMAXPROCS(runtime.NumCPU())
  }
 
+ baremetalcluster.RegisterProvider()
+ baremetalmachine.RegisterProvider()
+ importedcluster.RegisterProvider()
+
  app.NewApp("tke-platform-controller").Run()
 }
diff --git a/pkg/platform/provider/baremetal/cluster/provider.go b/pkg/platform/provider/baremetal/cluster/provider.go
@@ -44,7 +44,7 @@ const (
  name = "Baremetal"
 )
 
-func init() {
+func RegisterProvider() {
  p, err := NewProvider()
  if err != nil {
  log.Errorf("init cluster provider error: %s", err)

diff --git a/pkg/platform/provider/baremetal/machine/provider.go b/pkg/platform/provider/baremetal/machine/provider.go
@@ -40,7 +40,7 @@ const (
  name = "Baremetal"
 )
 
-func init() {
+func RegisterProvider() {
  p, err := NewProvider()
  if err != nil {
  log.Errorf("init machine provider error: %s", err)

diff --git a/pkg/platform/provider/imported/cluster/provider.go b/pkg/platform/provider/imported/cluster/provider.go
@@ -28,7 +28,7 @@ import (
  "tkestack.io/tke/pkg/util/log"
 )
 
-func init() {
+func RegisterProvider() {
  p, err := NewProvider()
  if err != nil {
  log.Errorf("init cluster provider error: %s", err)

diff --git a/test/cmd/tke-up/main.go b/test/cmd/tke-up/main.go
@@ -38,9 +38,9 @@ import (
  "tkestack.io/tke/test/util/cloudprovider"
 
  // import platform schema
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
- _ "tkestack.io/tke/pkg/platform/provider/imported/cluster"
+ baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
+ baremetalmachine "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
+ importedcluster "tkestack.io/tke/pkg/platform/provider/imported/cluster"
 )
 
 func quickConfig(nodes []cloudprovider.Instance) []byte {
@@ -74,6 +74,9 @@ func quickConfig(nodes []cloudprovider.Instance) []byte {
 }
 
 func main() {
+ baremetalcluster.RegisterProvider()
+ baremetalmachine.RegisterProvider()
+ importedcluster.RegisterProvider()
  provider := tencent.NewTencentProvider()
  nodes, err := provider.CreateInstances(3)
  if err != nil {

diff --git a/test/e2e/platform/platform_test.go b/test/e2e/platform/platform_test.go
@@ -30,9 +30,9 @@ import (
  tkeclientset "tkestack.io/tke/api/client/clientset/versioned"
  platformv1 "tkestack.io/tke/api/platform/v1"
  "tkestack.io/tke/pkg/platform/apiserver/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
- _ "tkestack.io/tke/pkg/platform/provider/imported/cluster"
+ baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
+ baremetalmachine "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
+ importedcluster "tkestack.io/tke/pkg/platform/provider/imported/cluster"
  "tkestack.io/tke/test/e2e/tke"
  tke2 "tkestack.io/tke/test/tke"
  "tkestack.io/tke/test/util"
@@ -52,6 +52,9 @@ var (
 )
 
 var _ = BeforeSuite(func() {
+ baremetalcluster.RegisterProvider()
+ baremetalmachine.RegisterProvider()
+ importedcluster.RegisterProvider()
  t.Create()
 
  tkeKubeConfigFile = t.GetKubeConfigFile()

diff --git a/test/tke/tke.go b/test/tke/tke.go
@@ -20,11 +20,6 @@ import (
  "tkestack.io/tke/test/util"
  "tkestack.io/tke/test/util/cloudprovider"
  "tkestack.io/tke/test/util/env"
-
- // import platform provider
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
- _ "tkestack.io/tke/pkg/platform/provider/baremetal/machine"
- _ "tkestack.io/tke/pkg/platform/provider/imported/cluster"
 )
 
 type TestTKE struct {