fix chart deploy service preview (#4536)

Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>

Author: PetrusZ

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

@@ -952,7 +952,12 @@ func GetHelmChartManifest(service *commonmodels.Service, valuesYaml, chartName,
 		ValuesYaml:   valuesYaml,
 	}
 
-	manifestBytes, err := helmClient.TemplateChart(chartSpec, nil)
+	var templateOptions *helmclient.HelmTemplateOptions
+	if helmClient != nil && helmClient.KubeVersion != nil {
+		templateOptions = &helmclient.HelmTemplateOptions{KubeVersion: helmClient.KubeVersion}
+	}
+
+	manifestBytes, err := helmClient.TemplateChart(chartSpec, templateOptions)
 	if err != nil {
 		return nil, fmt.Errorf("failed to template chart %s/%s, chartPath: %s, err: %s", chartName, chartVersion, chartPath, err)
 	}

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

@@ -1605,19 +1605,27 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 	if scene == EstimateValuesSceneCreateEnv || scene == EstimateValuesSceneCreateService {
 		// service already exists in the current environment, create it
 
-		currentReleaseName = util.GeneReleaseName(latestTmplSvc.GetReleaseNaming(), projectName, prod.Namespace, envName, latestTmplSvc.ServiceName)
-		latestReleaseName = currentReleaseName
+		if !isHelmChartDeploy {
+			currentReleaseName = util.GeneReleaseName(latestTmplSvc.GetReleaseNaming(), projectName, prod.Namespace, envName, latestTmplSvc.ServiceName)
+			latestReleaseName = currentReleaseName
+		} else {
+			currentReleaseName = serviceOrReleaseName
+			latestReleaseName = serviceOrReleaseName
+		}
 
 		currentYaml = ""
 	} else if scene == EstimateValuesSceneUpdateService {
 		// service exists in the current environment, update it
 		if isHelmChartDeploy {
+			currentReleaseName = serviceOrReleaseName
+			latestReleaseName = serviceOrReleaseName
+
 			render := prodSvc.GetServiceRender()
 			chartRepo, err := commonrepo.NewHelmRepoColl().Find(&commonrepo.HelmRepoFindOption{RepoName: render.ChartRepo})
 			if err != nil {
 				return nil, fmt.Errorf("failed to query chart-repo info, repoName: %s", render.ChartRepo)
 			}
-			client, err := commonutil.NewHelmClient(chartRepo)
+			client, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 			if err != nil {
 				return nil, fmt.Errorf("failed to new helm client, err %s", err)
 			}
@@ -1646,7 +1654,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 					return nil, fmt.Errorf("failed to download instantiate chart, err: %w", err)
 				}
 
-				helmClient, err := helmtool.NewClient()
+				helmClient, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 				if err != nil {
 					return nil, fmt.Errorf("failed to new helm client, err %s", err)
 				}
@@ -1672,7 +1680,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 
 			if contextType == EstimateContentTypeManifest {
 				render := prodSvc.GetServiceRender()
-				helmClient, err := helmtool.NewClient()
+				helmClient, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 				if err != nil {
 					return nil, fmt.Errorf("failed to new helm client, err %s", err)
 				}
@@ -1691,7 +1699,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 		if err != nil {
 			return nil, fmt.Errorf("failed to query chart-repo info, repoName: %s", arg.ChartRepo)
 		}
-		client, err := commonutil.NewHelmClient(chartRepo)
+		client, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 		if err != nil {
 			return nil, fmt.Errorf("failed to new helm client, err %s", err)
 		}
@@ -1724,7 +1732,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 				return nil, fmt.Errorf("failed to download instantiate chart, err: %w", err)
 			}
 
-			helmClient, err := helmtool.NewClient()
+			helmClient, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 			if err != nil {
 				return nil, fmt.Errorf("failed to new helm client, err %s", err)
 			}
@@ -1777,7 +1785,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
 
 		if contextType == EstimateContentTypeManifest {
 			render := prodSvc.GetServiceRender()
-			helmClient, err := helmtool.NewClient()
+			helmClient, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
 			if err != nil {
 				return nil, fmt.Errorf("failed to new helm client, err %s", err)
 			}

pkg/tool/helmclient/helmclient.go

@@ -39,6 +39,7 @@ import (
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
+	helmchartutil "helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/downloader"
 	"helm.sh/helm/v3/pkg/getter"
@@ -55,7 +56,7 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
-	"k8s.io/helm/pkg/chartutil"
+	k8schartutil "k8s.io/helm/pkg/chartutil"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
@@ -88,6 +89,7 @@ type HelmClient struct {
 	*hc.HelmClient
 	kubeClient     client.Client
 	Namespace      string
+	KubeVersion    *helmchartutil.KubeVersion
 	lock           *sync.Mutex
 	RestConfig     *rest.Config
 	RegistryClient *registry.Client
@@ -111,21 +113,24 @@ func NewClient() (*HelmClient, error) {
 		HelmClient:     helmClient,
 		kubeClient:     nil,
 		Namespace:      "",
+		KubeVersion:    nil,
 		lock:           &sync.Mutex{},
 		RestConfig:     nil,
 		RegistryClient: nil,
 	}, nil
 }
 
-// NewClientFromNamespace returns a new Helm client constructed with the provided clusterID and namespace
-// a kubeClient will be initialized to support necessary k8s operations when install/upgrade helm charts
+// NewClientFromNamespace returns a new Helm client constructed with the provided clusterID and namespace.
+// A kubeClient will be initialized to support necessary k8s operations when install/upgrade helm charts.
 func NewClientFromNamespace(clusterID, namespace string) (*HelmClient, error) {
-	restConfig, err := clientmanager.NewKubeClientManager().GetRestConfig(clusterID)
+	kubeManager := clientmanager.NewKubeClientManager()
+
+	restConfig, err := kubeManager.GetRestConfig(clusterID)
 	if err != nil {
 		return nil, err
 	}
 
-	kubeClient, err := clientmanager.NewKubeClientManager().GetControllerRuntimeClient(clusterID)
+	kubeClient, err := kubeManager.GetControllerRuntimeClient(clusterID)
 	if err != nil {
 		return nil, err
 	}
@@ -142,10 +147,26 @@ func NewClientFromNamespace(clusterID, namespace string) (*HelmClient, error) {
 	}
 
 	helmClient := hcClient.(*hc.HelmClient)
+	clientset, err := kubeManager.GetKubernetesClientSet(clusterID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get kubernetes clientset for cluster %s: %v", clusterID, err)
+	}
+
+	versionInfo, err := clientset.Discovery().ServerVersion()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get kubernetes server version for cluster %s: %v", clusterID, err)
+	}
+
+	kubeVersion, err := helmchartutil.ParseKubeVersion(versionInfo.GitVersion)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse kubernetes server version %q for cluster %s: %v", versionInfo.GitVersion, clusterID, err)
+	}
+
 	return &HelmClient{
 		HelmClient:     helmClient,
 		kubeClient:     kubeClient,
 		Namespace:      namespace,
+		KubeVersion:    kubeVersion,
 		lock:           &sync.Mutex{},
 		RestConfig:     restConfig,
 		RegistryClient: nil,
@@ -171,6 +192,7 @@ func NewClientFromRestConf(restConfig *rest.Config, ns string) (*HelmClient, err
 		HelmClient:     helmClient,
 		kubeClient:     nil,
 		Namespace:      ns,
+		KubeVersion:    nil,
 		lock:           &sync.Mutex{},
 		RestConfig:     restConfig,
 		RegistryClient: nil,
@@ -817,7 +839,7 @@ func (hClient *HelmClient) runPull(p *action.Pull, chartRef string) (string, err
 			return out.String(), errors.Errorf("failed to untar: a file or directory with the name %s already exists", udCheck)
 		}
 
-		return out.String(), chartutil.ExpandFile(ud, saved)
+		return out.String(), k8schartutil.ExpandFile(ud, saved)
 	}
 	return out.String(), nil
 }