PANDARIA: Update CreateCCEHostedCluster

Author: STARRY-S

extensions/clusters/cce/cce_cluster_config.go

@@ -2,7 +2,6 @@ package cce
 
 import (
 	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
-	"github.com/rancher/shepherd/pkg/config"
 )
 
 const (
@@ -134,10 +133,7 @@ func nodePoolsConstructor(nodePoolsConfig []NodePool) []management.CCENodePool {
 	return nodePools
 }
 
-func HostClusterConfig(name, cloudCredentialID string) *management.CCEClusterConfigSpec {
-	var cceClusterConfig ClusterConfig
-	config.LoadConfig(CCEClusterConfigConfigurationFileKey, &cceClusterConfig)
-
+func HostClusterConfig(name, cloudCredentialID string, cceClusterConfig ClusterConfig) *management.CCEClusterConfigSpec {
 	return &management.CCEClusterConfigSpec{
 		Authentication: &management.CCEAuthentication{
 			AuthenticatingProxy: &management.CCEAuthenticatingProxy{

extensions/clusters/cce/create.go

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