Skip to content

Commit d11425f

Browse files
authored
fix helm chart preivew (#4608)
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent 330bd12 commit d11425f

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,7 @@ func DownloadInstantiateChart(projectName, chartRepo, chartName, chartVersion, r
688688
if err != nil {
689689
return err
690690
}
691+
691692
err = hClient.DownloadChart(commonutil.GeneHelmRepo(chartRepoEntry), chartRef, chartVersion, localPath, true)
692693
if err != nil {
693694
return fmt.Errorf("failed to download chart, chartName: %s, chartRepo: %+v, err: %s", chartName, chartRepo, err)
@@ -948,9 +949,9 @@ func GetHelmChartManifest(env *commonmodels.Product, service *commonmodels.Servi
948949
releaseName := util.GeneReleaseName(service.GetReleaseNaming(), env.ProductName, env.Namespace, env.EnvName, service.ServiceName)
949950
chartSpec := &helmclient.ChartSpec{
950951
ReleaseName: releaseName,
951-
ChartName: chartPath,
952-
Version: chartVersion,
953-
ValuesYaml: valuesYaml,
952+
ChartName: chartPath,
953+
Version: chartVersion,
954+
ValuesYaml: valuesYaml,
954955
}
955956

956957
var templateOptions *helmclient.HelmTemplateOptions

pkg/microservice/aslan/core/common/util/helm.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ func NewHelmClient(chartRepo *commonmodels.HelmRepo) (*helmtool.HelmClient, erro
363363
return nil, fmt.Errorf("enabled proxy for helm client, but no proxy found")
364364
}
365365

366+
log.Debugf("add proxy to helm client, proxy url: %s", proxy[0].GetProxyURL())
367+
366368
transport, err := util.NewTransport(chartRepo.URL, "", "", "", false, proxy[0].GetProxyURL())
367369
if err != nil {
368370
return nil, fmt.Errorf("failed to new transport, err: %s", err)

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,10 +536,10 @@ func generateMobileCustomWorkflow(projectName, workflowName string, focalBasicIm
536536
}
537537

538538
type UpdateServiceArg struct {
539-
ServiceName string `json:"service_name"`
540-
DeployStrategy string `json:"deploy_strategy"`
541-
VariableKVs []*commontypes.RenderVariableKV `json:"variable_kvs"`
542-
OverrideResource bool `json:"override_resource"`
539+
ServiceName string `json:"service_name"`
540+
DeployStrategy string `json:"deploy_strategy"`
541+
VariableKVs []*commontypes.RenderVariableKV `json:"variable_kvs"`
542+
OverrideResource bool `json:"override_resource"`
543543
}
544544

545545
type UpdateEnv struct {
@@ -1630,7 +1630,7 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
16301630
if err != nil {
16311631
return nil, fmt.Errorf("failed to query chart-repo info, repoName: %s", render.ChartRepo)
16321632
}
1633-
client, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
1633+
client, err := commonutil.NewHelmClient(chartRepo)
16341634
if err != nil {
16351635
return nil, fmt.Errorf("failed to new helm client, err %s", err)
16361636
}
@@ -1704,7 +1704,8 @@ func GenEstimatedValues(projectName, envName, namespace, serviceOrReleaseName st
17041704
if err != nil {
17051705
return nil, fmt.Errorf("failed to query chart-repo info, repoName: %s", arg.ChartRepo)
17061706
}
1707-
client, err := helmtool.NewClientFromNamespace(prod.ClusterID, prod.Namespace)
1707+
1708+
client, err := commonutil.NewHelmClient(chartRepo)
17081709
if err != nil {
17091710
return nil, fmt.Errorf("failed to new helm client, err %s", err)
17101711
}

0 commit comments

Comments
 (0)