PANDARIA: Update CreateTKEHostedCluster

Author: GGGitBoy

extensions/clusters/tke/create.go

@@ -6,8 +6,8 @@ import (
 )
 
 // CreateTKEHostedCluster is a helper function that creates an TKE hosted cluster
-func CreateTKEHostedCluster(client *rancher.Client, displayName, cloudCredentialID string, enableClusterAlerting, enableClusterMonitoring, enableNetworkPolicy, windowsPreferedCluster bool, labels map[string]string) (*management.Cluster, error) {
-	tkeHostCluster := HostClusterConfig(displayName, cloudCredentialID)
+func CreateTKEHostedCluster(client *rancher.Client, displayName, cloudCredentialID string, clusterConfig ClusterConfig, enableClusterAlerting, enableClusterMonitoring, enableNetworkPolicy, windowsPreferedCluster bool, labels map[string]string) (*management.Cluster, error) {
+	tkeHostCluster := HostClusterConfig(displayName, cloudCredentialID, clusterConfig)
 	cluster := &management.Cluster{
 		DockerRootDir:          "/var/lib/docker",
 		TKEConfig:              tkeHostCluster,

extensions/clusters/tke/tke_cluster_config.go

@@ -2,7 +2,6 @@ package tke
 
 import (
 	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
-	"github.com/rancher/shepherd/pkg/config"
 )
 
 const (
@@ -208,10 +207,7 @@ func nodePoolsConstructor(nodePoolsConfig []NodePoolDetail) []management.NodePoo
 	return nodePoolList
 }
 
-func HostClusterConfig(name, cloudCredentialID string) *management.TKEClusterConfigSpec {
-	var tkeClusterConfig ClusterConfig
-	config.LoadConfig(TKEClusterConfigConfigurationFileKey, &tkeClusterConfig)
-
+func HostClusterConfig(name, cloudCredentialID string, tkeClusterConfig ClusterConfig) *management.TKEClusterConfigSpec {
 	return &management.TKEClusterConfigSpec{
 		Region:              tkeClusterConfig.Region,
 		TKECredentialSecret: cloudCredentialID,