fix: get correct cluster for perview

Signed-off-by: YuTang Song <2313186065@qq.com>

Author: leebrouse

pkg/microservice/aslan/core/common/service/kube/render.go

@@ -387,10 +387,10 @@ func FetchCurrentAppliedYaml(option *GeneSvcYamlOption) (string, int, error) {
 	}
 
 	// return structured cluster name
-	// cluster, err := GetCluster(productInfo.ClusterID)
-	// if err != nil {
-	// 	return "", 0, errors.Wrapf(err, "failed to get cluster name by cluster id %s", productInfo.ClusterID)
-	// }
+	cluster, err := GetCluster(productInfo.ClusterID)
+	if err != nil {
+		return "", 0, errors.Wrapf(err, "failed to get cluster name by cluster id %s", productInfo.ClusterID)
+	}
 
 	curProductSvc := productInfo.GetServiceMap()[option.ServiceName]
 
@@ -419,7 +419,7 @@ func FetchCurrentAppliedYaml(option *GeneSvcYamlOption) (string, int, error) {
 		if err != nil {
 			return "", 0, err
 		}
-		fullRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, option.ClusterName, fullRenderedYaml)
+		fullRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, cluster.Name, fullRenderedYaml)
 		mergedContainers := mergeContainers(prodSvcTemplate.Containers, curProductSvc.Containers)
 		fullRenderedYaml, _, err = ReplaceWorkloadImages(fullRenderedYaml, mergedContainers)
 		if err != nil {
@@ -807,6 +807,12 @@ func GenerateRenderedYaml(option *GeneSvcYamlOption) (string, int, []*WorkloadRe
 		return "", 0, nil, errors.Wrapf(err, "failed to find latest service template %s", option.ServiceName)
 	}
 
+	// get cluster name by id
+	cluster, err := GetCluster(productInfo.ClusterID)
+	if err != nil {
+		return "", 0, nil, errors.Wrapf(err, "failed to get cluster %s", productInfo.ClusterID)
+	}
+
 	var svcContainersInProduct []*models.Container
 	if curProductSvc != nil {
 		svcContainersInProduct = curProductSvc.Containers
@@ -848,7 +854,7 @@ func GenerateRenderedYaml(option *GeneSvcYamlOption) (string, int, []*WorkloadRe
 		if renderErr != nil {
 			return "", 0, nil, fmt.Errorf("failed to render current service yaml: %v", renderErr)
 		}
-		currentRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, option.ClusterName, currentRenderedYaml)
+		currentRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, cluster.Name, currentRenderedYaml)
 		currentBaseReplicaMap, err = ExtractWorkloadReplicas(currentRenderedYaml)
 		if err != nil {
 			return "", 0, nil, fmt.Errorf("failed to extract workload replicas: %v", err)
@@ -877,7 +883,7 @@ func GenerateRenderedYaml(option *GeneSvcYamlOption) (string, int, []*WorkloadRe
 	if err != nil {
 		return "", 0, nil, fmt.Errorf("failed to render service yaml: %v", err)
 	}
-	fullRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, option.ClusterName, fullRenderedYaml)
+	fullRenderedYaml = ParseSysKeys(productInfo.Namespace, productInfo.EnvName, option.ProductName, option.ServiceName, cluster.Name, fullRenderedYaml)
 
 	// service may not be deployed in environment, we need to extract containers again, since image related variables may be changed
 	latestSvcTemplate.KubeYamls = util.SplitYaml(fullRenderedYaml)

pkg/microservice/aslan/core/common/service/version.go

@@ -136,7 +136,6 @@ func buildEnvServiceVersionYamlOption(env *commonmodels.Product, envSvcVersion *
 		ProductName:           env.ProductName,
 		EnvName:               envName,
 		ServiceName:           serviceName,
-		ClusterName:           clusterName,
 		UpdateServiceRevision: false,
 		VariableYaml:          envSvcVersion.Service.GetServiceRender().GetOverrideYaml(),
 		VariableKVs:           envSvcVersion.Service.GetServiceRender().OverrideYaml.RenderVariableKVs,

pkg/microservice/aslan/core/environment/service/service.go

@@ -433,7 +433,6 @@ func PreviewService(args *PreviewServiceArgs, _ *zap.SugaredLogger) (*SvcDiffRes
 		ProductName:                   args.ProductName,
 		EnvName:                       args.EnvName,
 		ServiceName:                   args.ServiceName,
-		ClusterName:                   args.ClusterName,
 		UpdateServiceRevision:         args.UpdateServiceRevision,
 		VariableYaml:                  newVariableYaml,
 		VariableKVs:                   args.VariableKVs,