fix(platform): provider platform client nil

tkestack · Mar 29, 2022 · 9dd79aa · 9dd79aa
1 parent 70aab77
commit 9dd79aa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/cmd/tke-installer/app/installer/upgrader.go b/cmd/tke-installer/app/installer/upgrader.go
@@ -56,6 +56,7 @@ import (
 
 	// import platform schema
 	_ "tkestack.io/tke/api/platform/install"
+	baremetalcluster "tkestack.io/tke/pkg/platform/provider/baremetal/cluster"
 )
 
 const (
@@ -347,6 +348,14 @@ func (t *TKE) prepareForUpgrade(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+
+	baremetalcluster.ReRegisterProviderForUpgrade(&t.platformClient)
+	clusterProvider, err := clusterprovider.GetProvider("Baremetal")
+	if err != nil {
+		panic(err)
+	}
+	t.clusterProvider = clusterProvider
+
 	t.Cluster, err = clusterprovider.GetV1ClusterByName(ctx, t.platformClient, "global", clusterprovider.AdminUsername)
 	if err != nil {
 		return err

diff --git a/pkg/platform/provider/baremetal/cluster/provider.go b/pkg/platform/provider/baremetal/cluster/provider.go
@@ -53,6 +53,17 @@ func RegisterProvider() {
 	clusterprovider.Register(p.Name(), p)
 }
 
+// upgrade global cluster, baremetal provider dont have platformClient, so ReRegisterProviderForUpgrade add platformClient
+func ReRegisterProviderForUpgrade(platformClient *platformv1client.PlatformV1Interface) {
+	p, err := NewProvider()
+	if err != nil {
+		log.Errorf("init cluster provider error: %s", err)
+		return
+	}
+	p.PlatformClient = *platformClient
+	clusterprovider.ReRegisterForUpgrade(p.Name(), p)
+}
+
 type Provider struct {
 	*clusterprovider.DelegateProvider
 

diff --git a/pkg/platform/provider/cluster/cluster.go b/pkg/platform/provider/cluster/cluster.go
@@ -58,6 +58,15 @@ func Register(name string, provider Provider) {
 	providers[name] = provider
 }
 
+func ReRegisterForUpgrade(name string, provider Provider) {
+	providersMu.Lock()
+	defer providersMu.Unlock()
+	if provider == nil {
+		panic("cluster: Register provider is nil")
+	}
+	providers[name] = provider
+}
+
 // RegisterHandler register all provider's hanlder.
 func RegisterHandler(mux *mux.PathRecorderMux) {
 	for _, p := range providers {