fix(installer): installer restconfig always nil (#1675)

tkestack · Nov 25, 2021 · d639abb · d639abb
1 parent 1888e23
commit d639abb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/pkg/platform/provider/baremetal/cluster/create.go b/pkg/platform/provider/baremetal/cluster/create.go
@@ -1115,6 +1115,10 @@ func (p *Provider) EnsureStoreCredential(ctx context.Context, c *v1.Cluster) err
 		c.IsCredentialChanged = true
 	}
 
+	if c.IsCredentialChanged {
+		c.RegisterRestConfig(c.ClusterCredential.RESTConfig(c.Cluster))
+	}
+
 	return nil
 }
 

diff --git a/pkg/platform/types/types.go b/pkg/platform/types/types.go
@@ -42,6 +42,9 @@ type Cluster struct {
 }
 
 func (c *Cluster) setRESTConfigDefaults() error {
+	if c.restConfig == nil {
+		c.restConfig = &rest.Config{}
+	}
 	if c.restConfig.Host == "" {
 		host, err := c.Host()
 		if err != nil {

diff --git a/pkg/platform/types/v1/types.go b/pkg/platform/types/v1/types.go
@@ -104,6 +104,9 @@ func (c *Cluster) RESTConfigForBootstrap() (*rest.Config, error) {
 }
 
 func (c *Cluster) setRESTConfigDefaults() error {
+	if c.restConfig == nil {
+		c.restConfig = &rest.Config{}
+	}
 	if c.restConfig.Host == "" {
 		host, err := c.Host()
 		if err != nil {