[Backport release-1.7] Feat: The vela-apiserver supports displaying chart values stored in the OCI registry (#5509)

* support helm chart values

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

rebase

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

no lint

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

fix lint error

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

add test and deprecated API

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

fix url bug

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

fix tests panic

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

fix tests

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit fc1d8c248d)

* fix golint

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit 6c462b7850)

* return values.yaml

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit 70d8cc5d52)

* fix test

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit ef4574a188)

* fix return values

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit c1488eee77)

* add multiple valeus yaml in

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit 04436188ff)

* add old interface back

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit ae0ac9f50f)

* fix golint

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

fix test

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
(cherry picked from commit 00957744c0)

---------

Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

.krew.yaml

@@ -33,8 +33,8 @@ spec:
         arch: amd64
     {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-windows-amd64.zip" .TagName }}
     files:
-    - from: "*/kubectl-vela"
-      to: "kubectl-vela.exe"
+    - from: "*/kubectl-vela.exe"
+      to: "."
     - from: "*/LICENSE"
       to: "."
     bin: "kubectl-vela.exe"

charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml

@@ -116,7 +116,7 @@ spec:
         #ECProvider: {
         	type:   "ec"
         	apiKey: *"" | string
-        	name:   "ec-provider" | string
+        	name:   *"ec-provider" | string
         }
         #GCPProvider: {
         	credentials: string

charts/vela-core/templates/defwithtemplate/container-image.yaml

@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: *#PatchParams | close({
+        parameter: #PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

charts/vela-core/templates/defwithtemplate/expose.yaml

@@ -53,7 +53,10 @@ spec:
       }
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+      	isHealth: *false | bool
+      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+      		isHealth: true
+      	}
       	if !isHealth {
       		message: "ExternalIP: Pending"
       	}
@@ -62,10 +65,15 @@ spec:
       	}
       }
     healthPolicy: |-
-      isHealth: *true | bool
       service: context.outputs.service
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+      	isHealth: *false | bool
+      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+      		isHealth: true
+      	}
+      }
+      if service.spec.type != "LoadBalancer" {
+      	isHealth: true
       }
 

charts/vela-core/templates/defwithtemplate/read-only.yaml

@@ -13,7 +13,7 @@ spec:
       template: |
         #PolicyRule: {
         	// +usage=Specify how to select the targets of the rule
-        	selector: [...#RuleSelector]
+        	selector: #RuleSelector
         }
         #RuleSelector: {
         	// +usage=Select resources by component names

charts/vela-core/templates/kubevela-controller.yaml

@@ -272,8 +272,8 @@ spec:
             - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
             - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
             - "--feature-gates=MultiStageComponentApply= {{- .Values.featureGates.multiStageComponentApply | toString -}}"
-            - "--feature-gates=GzipApplicationRevision={{- .Values.featureGates.gzipResourceTracker | toString -}}"
-            - "--feature-gates=ZstdApplicationRevision={{- .Values.featureGates.zstdResourceTracker | toString -}}"
+            - "--feature-gates=GzipApplicationRevision={{- .Values.featureGates.gzipApplicationRevision | toString -}}"
+            - "--feature-gates=ZstdApplicationRevision={{- .Values.featureGates.zstdApplicationRevision | toString -}}"
             - "--feature-gates=PreDispatchDryRun={{- .Values.featureGates.preDispatchDryRun | toString -}}"
             {{ if .Values.authentication.enabled }}
             {{ if .Values.authentication.withUser }}

charts/vela-core/templates/velaql/component-pod.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   template: |
       import (
-      "vela/ql"
+        "vela/ql"
       )
 
       parameter: {
@@ -55,9 +55,15 @@ data:
               phase: pod.object.status.phase
               // refer to https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
               if phase != "Pending" && phase != "Unknown" {
-                podIP:    pod.object.status.podIP
-                hostIP:   pod.object.status.hostIP
-                nodeName: pod.object.spec.nodeName
+                if pod.object.podIP != _|_ {
+                  podIP: pod.object.status.podIP
+                }
+                if pod.object.hostIP != _|_ {
+                  hostIP: pod.object.status.hostIP
+                }
+                if pod.object.nodeName != _|_ {
+                  nodeName: pod.object.spec.nodeName
+                }
               }
             }
           }]

charts/vela-minimal/templates/defwithtemplate/apply-terraform-provider.yaml

@@ -116,7 +116,7 @@ spec:
         #ECProvider: {
         	type:   "ec"
         	apiKey: *"" | string
-        	name:   "ec-provider" | string
+        	name:   *"ec-provider" | string
         }
         #GCPProvider: {
         	credentials: string

charts/vela-minimal/templates/defwithtemplate/container-image.yaml

@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: *#PatchParams | close({
+        parameter: #PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

charts/vela-minimal/templates/defwithtemplate/expose.yaml

@@ -53,7 +53,10 @@ spec:
       }
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+      	isHealth: *false | bool
+      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+      		isHealth: true
+      	}
       	if !isHealth {
       		message: "ExternalIP: Pending"
       	}
@@ -62,10 +65,15 @@ spec:
       	}
       }
     healthPolicy: |-
-      isHealth: *true | bool
       service: context.outputs.service
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+      	isHealth: *false | bool
+      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+      		isHealth: true
+      	}
+      }
+      if service.spec.type != "LoadBalancer" {
+      	isHealth: true
       }
 

charts/vela-minimal/templates/defwithtemplate/read-only.yaml

@@ -13,7 +13,7 @@ spec:
       template: |
         #PolicyRule: {
         	// +usage=Specify how to select the targets of the rule
-        	selector: [...#RuleSelector]
+        	selector: #RuleSelector
         }
         #RuleSelector: {
         	// +usage=Select resources by component names

go.mod

@@ -3,7 +3,7 @@ module github.com/oam-dev/kubevela
 go 1.19
 
 require (
-	cuelang.org/go v0.5.0-alpha.1
+	cuelang.org/go v0.5.0-beta.5
 	github.com/AlecAivazis/survey/v2 v2.1.1
 	github.com/FogDong/uitable v0.0.5
 	github.com/Masterminds/semver/v3 v3.1.1
@@ -348,7 +348,6 @@ require (
 
 replace (
 	cloud.google.com/go => cloud.google.com/go v0.100.2
-	cuelang.org/go => github.com/kubevela/cue v0.4.4-0.20221107123854-a976b0e340be
 	github.com/docker/cli => github.com/docker/cli v20.10.9+incompatible
 	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
 	github.com/wercker/stern => github.com/oam-dev/stern v1.13.2

go.sum

@@ -34,6 +34,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
+cuelang.org/go v0.5.0-beta.5 h1:TAV4ZjXw2M6xf6jI8XyAAXCqWJ82Y0oxhlf9w3l544A=
+cuelang.org/go v0.5.0-beta.5/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AlecAivazis/survey/v2 v2.1.1 h1:LEMbHE0pLj75faaVEKClEX1TM4AJmmnOh9eimREzLWI=
 github.com/AlecAivazis/survey/v2 v2.1.1/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk=
@@ -1283,8 +1285,6 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubevela/cue v0.4.4-0.20221107123854-a976b0e340be h1:0xj/Rh4yVy54mUD2nLmAuN1AYgBkkHxBh4PoLGbIg5g=
-github.com/kubevela/cue v0.4.4-0.20221107123854-a976b0e340be/go.mod h1:Ya12qn7FZc+LSN0qgEhzEpnzQsvnGHVgoDrqe9i3eNg=
 github.com/kubevela/pkg v0.0.0-20230105054759-263dc191bf51 h1:xrcNNaAjqC6tr1leSYcjLFgrXKpZ8u87jpB5TolhUIc=
 github.com/kubevela/pkg v0.0.0-20230105054759-263dc191bf51/go.mod h1:ZRnxY/gOcg/8FilZA+eYr+rtVXb1ijT5HFTe8zrv9zo=
 github.com/kubevela/prism v1.7.0-alpha.1 h1:oeZFn1Oy6gxSSFzMTfsWjLOCKaaooMVm1JGNK4j4Mlo=

pkg/apiserver/domain/service/helm.go

@@ -45,8 +45,9 @@ func NewHelmService() HelmService {
 type HelmService interface {
 	ListChartNames(ctx context.Context, url string, secretName string, skipCache bool) ([]string, error)
 	ListChartVersions(ctx context.Context, url string, chartName string, secretName string, skipCache bool) (repo.ChartVersions, error)
-	GetChartValues(ctx context.Context, url string, chartName string, version string, secretName string, skipCache bool) (map[string]interface{}, error)
+	ListChartValuesFiles(ctx context.Context, url string, chartName string, version string, secretName string, repoType string, skipCache bool) (map[string]string, error)
 	ListChartRepo(ctx context.Context, projectName string) (*v1.ChartRepoResponseList, error)
+	GetChartValues(ctx context.Context, repoURL string, chartName string, version string, secretName string, repoType string, skipCache bool) (map[string]interface{}, error)
 }
 
 type defaultHelmImpl struct {
@@ -99,7 +100,7 @@ func (d defaultHelmImpl) ListChartVersions(ctx context.Context, repoURL string,
 	return chartVersions, nil
 }
 
-func (d defaultHelmImpl) GetChartValues(ctx context.Context, repoURL string, chartName string, version string, secretName string, skipCache bool) (map[string]interface{}, error) {
+func (d defaultHelmImpl) ListChartValuesFiles(ctx context.Context, repoURL string, chartName string, version string, secretName string, repoType string, skipCache bool) (map[string]string, error) {
 	if !utils.IsValidURL(repoURL) {
 		return nil, bcode.ErrRepoInvalidURL
 	}
@@ -111,13 +112,33 @@ func (d defaultHelmImpl) GetChartValues(ctx context.Context, repoURL string, cha
 			return nil, bcode.ErrRepoBasicAuth
 		}
 	}
-	v, err := d.helper.GetValuesFromChart(repoURL, chartName, version, skipCache, opts)
+	v, err := d.helper.GetValuesFromChart(repoURL, chartName, version, skipCache, repoType, opts)
 	if err != nil {
 		klog.Errorf("cannot fetch chart values repo: %s, chart: %s, version: %s, error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), utils.Sanitize(version), err.Error())
 		return nil, bcode.ErrGetChartValues
 	}
-	res := make(map[string]interface{}, len(v))
-	flattenKey("", v, res)
+	return v.Data, nil
+}
+
+func (d defaultHelmImpl) GetChartValues(ctx context.Context, repoURL string, chartName string, version string, secretName string, repoType string, skipCache bool) (map[string]interface{}, error) {
+	if !utils.IsValidURL(repoURL) {
+		return nil, bcode.ErrRepoInvalidURL
+	}
+	var opts *common.HTTPOption
+	var err error
+	if len(secretName) != 0 {
+		opts, err = helm.SetHTTPOption(ctx, d.K8sClient, types2.NamespacedName{Namespace: types.DefaultKubeVelaNS, Name: secretName})
+		if err != nil {
+			return nil, bcode.ErrRepoBasicAuth
+		}
+	}
+	v, err := d.helper.GetValuesFromChart(repoURL, chartName, version, skipCache, repoType, opts)
+	if err != nil {
+		klog.Errorf("cannot fetch chart values repo: %s, chart: %s, version: %s, error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), utils.Sanitize(version), err.Error())
+		return nil, bcode.ErrGetChartValues
+	}
+	res := make(map[string]interface{}, len(v.Values))
+	flattenKey("", v.Values, res)
 	return res, nil
 }
 

pkg/apiserver/domain/service/helm_test.go

@@ -213,7 +213,7 @@ var _ = Describe("test helm usecasae", func() {
 		Expect(len(versions)).Should(BeEquivalentTo(1))
 		Expect(versions[0].Version).Should(BeEquivalentTo("8.8.23"))
 
-		values, err := u.GetChartValues(ctx, mockServer.URL, "mysql", "8.8.23", "repo-secret", false)
+		values, err := u.ListChartValuesFiles(ctx, mockServer.URL, "mysql", "8.8.23", "repo-secret", "helm", false)
 		Expect(err).Should(BeNil())
 		Expect(values).ShouldNot(BeNil())
 		Expect(len(values)).ShouldNot(BeEquivalentTo(0))
@@ -228,7 +228,7 @@ var _ = Describe("test helm usecasae", func() {
 		_, err = u.ListChartVersions(ctx, "http://127.0.0.1:8080", "mysql", "repo-secret-notExist", false)
 		Expect(err).ShouldNot(BeNil())
 
-		_, err = u.GetChartValues(ctx, "http://127.0.0.1:8080", "mysql", "8.8.23", "repo-secret-notExist", false)
+		_, err = u.ListChartValuesFiles(ctx, "http://127.0.0.1:8080", "mysql", "8.8.23", "repo-secret-notExist", "helm", false)
 		Expect(err).ShouldNot(BeNil())
 	})
 })

pkg/apiserver/interfaces/api/repository.go

@@ -69,9 +69,19 @@ func (h repository) GetWebServiceRoute() *restful.WebService {
 		Writes([]string{}))
 
 	// List available chart versions
-	ws.Route(ws.GET("/charts/{chart}/versions").To(h.listVersions).
+	ws.Route(ws.GET("/chart/versions").To(h.listVersionsFromQuery).
 		Doc("list versions").
 		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.QueryParameter("chart", "helm chart").DataType("string").Required(true)).
+		Param(ws.QueryParameter("repoUrl", "helm repository url").DataType("string").Required(true)).
+		Param(ws.QueryParameter("secretName", "secret of the repo").DataType("string")).
+		Returns(200, "OK", v1.ChartVersionListResponse{}).
+		Returns(400, "Bad Request", bcode.Bcode{}).
+		Writes([]string{}))
+
+	ws.Route(ws.GET("/charts/{chart}/versions").To(h.listChartVersions).
+		Doc("list versions").Deprecate().
+		Metadata(restfulspec.KeyOpenAPITags, tags).
 		Param(ws.QueryParameter("repoUrl", "helm repository url").DataType("string")).
 		Param(ws.QueryParameter("secretName", "secret of the repo").DataType("string")).
 		Returns(200, "OK", v1.ChartVersionListResponse{}).
@@ -79,14 +89,26 @@ func (h repository) GetWebServiceRoute() *restful.WebService {
 		Writes([]string{}))
 
 	// List available chart versions
-	ws.Route(ws.GET("/charts/{chart}/versions/{version}/values").To(h.chartValues).
+	ws.Route(ws.GET("/chart/values").To(h.chartValues).
 		Doc("get chart value").
 		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.QueryParameter("chart", "helm chart").DataType("string").Required(true)).
+		Param(ws.QueryParameter("version", "helm chart version").DataType("string").Required(true)).
+		Param(ws.QueryParameter("repoUrl", "helm repository url").DataType("string").Required(true)).
+		Param(ws.QueryParameter("repoType", "helm repository type").DataType("string").Required(true)).
+		Param(ws.QueryParameter("secretName", "secret of the repo").DataType("string")).
+		Returns(200, "OK", "").
+		Returns(400, "Bad Request", bcode.Bcode{}).
+		Writes(map[string]string{}))
+
+	ws.Route(ws.GET("/charts/{chart}/versions/{version}/values").To(h.getChartValues).
+		Doc("get chart value").Deprecate().
+		Metadata(restfulspec.KeyOpenAPITags, tags).
 		Param(ws.QueryParameter("repoUrl", "helm repository url").DataType("string")).
 		Param(ws.QueryParameter("secretName", "secret of the repo").DataType("string")).
 		Returns(200, "OK", map[string]interface{}{}).
 		Returns(400, "Bad Request", bcode.Bcode{}).
-		Writes([]string{}))
+		Writes(map[string]interface{}{}))
 
 	ws.Route(ws.GET("/image/repos").To(h.getImageRepos).
 		Doc("get the oci repos").
@@ -132,9 +154,9 @@ func (h repository) listCharts(req *restful.Request, res *restful.Response) {
 	}
 }
 
-func (h repository) listVersions(req *restful.Request, res *restful.Response) {
+func (h repository) listVersionsFromQuery(req *restful.Request, res *restful.Response) {
 	url := req.QueryParameter("repoUrl")
-	chartName := req.PathParameter("chart")
+	chartName := req.QueryParameter("chart")
 	secName := req.QueryParameter("secretName")
 	skipCache, err := isSkipCache(req)
 	if err != nil {
@@ -154,7 +176,7 @@ func (h repository) listVersions(req *restful.Request, res *restful.Response) {
 	}
 }
 
-func (h repository) chartValues(req *restful.Request, res *restful.Response) {
+func (h repository) getChartValues(req *restful.Request, res *restful.Response) {
 	url := req.QueryParameter("repoUrl")
 	secName := req.QueryParameter("secretName")
 	chartName := req.PathParameter("chart")
@@ -165,12 +187,57 @@ func (h repository) chartValues(req *restful.Request, res *restful.Response) {
 		return
 	}
 
-	versions, err := h.HelmService.GetChartValues(req.Request.Context(), url, chartName, version, secName, skipCache)
+	values, err := h.HelmService.GetChartValues(req.Request.Context(), url, chartName, version, secName, "helm", skipCache)
 	if err != nil {
 		bcode.ReturnError(req, res, err)
 		return
 	}
-	err = res.WriteEntity(versions)
+	err = res.WriteEntity(values)
+	if err != nil {
+		bcode.ReturnError(req, res, err)
+		return
+	}
+}
+
+func (h repository) listChartVersions(req *restful.Request, res *restful.Response) {
+	url := req.QueryParameter("repoUrl")
+	chartName := req.PathParameter("chart")
+	secName := req.QueryParameter("secretName")
+	skipCache, err := isSkipCache(req)
+	if err != nil {
+		bcode.ReturnError(req, res, bcode.ErrSkipCacheParameter)
+		return
+	}
+	versions, err := h.HelmService.ListChartVersions(req.Request.Context(), url, chartName, secName, skipCache)
+	if err != nil {
+		bcode.ReturnError(req, res, err)
+		return
+	}
+	err = res.WriteEntity(v1.ChartVersionListResponse{Versions: versions})
+	if err != nil {
+		bcode.ReturnError(req, res, err)
+		return
+	}
+}
+
+func (h repository) chartValues(req *restful.Request, res *restful.Response) {
+	url := req.QueryParameter("repoUrl")
+	secName := req.QueryParameter("secretName")
+	chartName := req.QueryParameter("chart")
+	version := req.QueryParameter("version")
+	repoType := req.QueryParameter("repoType")
+	skipCache, err := isSkipCache(req)
+	if err != nil {
+		bcode.ReturnError(req, res, bcode.ErrSkipCacheParameter)
+		return
+	}
+
+	values, err := h.HelmService.ListChartValuesFiles(req.Request.Context(), url, chartName, version, secName, repoType, skipCache)
+	if err != nil {
+		bcode.ReturnError(req, res, err)
+		return
+	}
+	err = res.WriteEntity(values)
 	if err != nil {
 		bcode.ReturnError(req, res, err)
 		return

pkg/utils/helm/helm_helper.go

@@ -24,6 +24,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
 
@@ -32,6 +33,9 @@ import (
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
 	"helm.sh/helm/v3/pkg/kube"
 	"helm.sh/helm/v3/pkg/release"
 	relutil "helm.sh/helm/v3/pkg/releaseutil"
@@ -56,6 +60,12 @@ const (
 	valuesPatten = "repoUrl: %s, chart: %s, version: %s"
 )
 
+// ChartValues contain all values files in chart and default chart values
+type ChartValues struct {
+	Data   map[string]string
+	Values map[string]interface{}
+}
+
 // Helper provides helper functions for common Helm operations
 type Helper struct {
 	cache *utils2.MemoryCacheStore
@@ -309,12 +319,22 @@ func (h *Helper) ListChartsFromRepo(repoURL string, skipCache bool, opts *common
 }
 
 // GetValuesFromChart will extract the parameter from a helm chart
-func (h *Helper) GetValuesFromChart(repoURL string, chartName string, version string, skipCache bool, opts *common.HTTPOption) (map[string]interface{}, error) {
+func (h *Helper) GetValuesFromChart(repoURL string, chartName string, version string, skipCache bool, repoType string, opts *common.HTTPOption) (*ChartValues, error) {
 	if h.cache != nil && !skipCache {
 		if v := h.cache.Get(fmt.Sprintf(valuesPatten, repoURL, chartName, version)); v != nil {
-			return v.(map[string]interface{}), nil
+			return v.(*ChartValues), nil
 		}
 	}
+	if repoType == "oci" {
+		v, err := fetchChartValuesFromOciRepo(repoURL, chartName, version, opts)
+		if err != nil {
+			return nil, err
+		}
+		if h.cache != nil {
+			h.cache.Put(fmt.Sprintf(valuesPatten, repoURL, chartName, version), v, 20*time.Minute)
+		}
+		return v, nil
+	}
 	i, err := h.GetIndexInfo(repoURL, skipCache, opts)
 	if err != nil {
 		return nil, err
@@ -334,10 +354,17 @@ func (h *Helper) GetValuesFromChart(repoURL string, chartName string, version st
 		if err != nil {
 			continue
 		}
-		if h.cache != nil {
-			h.cache.Put(fmt.Sprintf(valuesPatten, repoURL, chartName, version), c.Values, calculateCacheTimeFromIndex(len(i.Entries)))
+		v := &ChartValues{
+			Data:   loadValuesYamlFile(c),
+			Values: c.Values,
 		}
-		return c.Values, nil
+		if err != nil {
+			return nil, err
+		}
+		if h.cache != nil {
+			h.cache.Put(fmt.Sprintf(valuesPatten, repoURL, chartName, version), v, calculateCacheTimeFromIndex(len(i.Entries)))
+		}
+		return v, nil
 	}
 	return nil, fmt.Errorf("cannot load chart from chart repo")
 }
@@ -351,3 +378,49 @@ func calculateCacheTimeFromIndex(length int) time.Duration {
 	}
 	return cacheTime
 }
+
+// nolint
+func fetchChartValuesFromOciRepo(repoURL string, chartName string, version string, opts *common.HTTPOption) (*ChartValues, error) {
+	d := downloader.ChartDownloader{
+		Verify:  downloader.VerifyNever,
+		Getters: getter.All(cli.New()),
+	}
+
+	if opts != nil {
+		d.Options = append(d.Options, getter.WithInsecureSkipVerifyTLS(opts.InsecureSkipTLS),
+			getter.WithTLSClientConfig(opts.CertFile, opts.KeyFile, opts.CaFile),
+			getter.WithBasicAuth(opts.Username, opts.Password))
+	}
+
+	var err error
+	dest, err := os.MkdirTemp("", "helm-")
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to fetch values file")
+	}
+	defer os.RemoveAll(dest)
+
+	chartRef := fmt.Sprintf("%s/%s", repoURL, chartName)
+	saved, _, err := d.DownloadTo(chartRef, version, dest)
+	if err != nil {
+		return nil, err
+	}
+	c, err := loader.Load(saved)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to fetch values file")
+	}
+	return &ChartValues{
+		Data:   loadValuesYamlFile(c),
+		Values: c.Values,
+	}, nil
+}
+
+func loadValuesYamlFile(chart *chart.Chart) map[string]string {
+	result := map[string]string{}
+	re := regexp.MustCompile(`.*yaml$`)
+	for _, f := range chart.Raw {
+		if re.MatchString(f.Name) && !strings.Contains(f.Name, "/") && f.Name != "Chart.yaml" {
+			result[f.Name] = string(f.Data)
+		}
+	}
+	return result
+}

pkg/utils/helm/helm_helper_test.go

@@ -114,9 +114,9 @@ var _ = Describe("Test helm helper", func() {
 
 	It("Test getValues from chart", func() {
 		helper := NewHelper()
-		values, err := helper.GetValuesFromChart("./testdata", "autoscalertrait", "0.2.0", true, nil)
+		values, err := helper.GetValuesFromChart("./testdata", "autoscalertrait", "0.2.0", true, "helm", nil)
 		Expect(err).Should(BeNil())
-		Expect(values).ShouldNot(BeEmpty())
+		Expect(values).ShouldNot(BeNil())
 	})
 })
 

references/cli/adopt.go

@@ -301,6 +301,12 @@ func (opt *AdoptOptions) render() (*v1beta1.Application, error) {
 	if err = json.Unmarshal(bs, app); err != nil {
 		return nil, fmt.Errorf("failed to parse template $returns into application: %w", err)
 	}
+	if app.Name == "" {
+		app.Name = opt.AppName
+	}
+	if app.Namespace == "" {
+		app.Namespace = opt.AppNamespace
+	}
 	return app, nil
 }
 

test/e2e-apiserver-test/repository_test.go

@@ -0,0 +1,42 @@
+/*
+Copyright 2022 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e_apiserver_test
+
+import (
+	"io"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Helm rest api test", func() {
+
+	Describe("helm repo api test", func() {
+		It("test fetching chart values in OCI registry", func() {
+			resp := getWithQuery("/repository/chart/values", map[string]string{
+				"repoUrl":  "oci://ghcr.io",
+				"chart":    "stefanprodan/charts/podinfo",
+				"repoType": "oci",
+				"version":  "6.1.0",
+			})
+			defer resp.Body.Close()
+			values, err := io.ReadAll(resp.Body)
+			Expect(err).Should(BeNil())
+			Expect(len(values)).ShouldNot(BeEquivalentTo(0))
+		})
+	})
+})

test/e2e-apiserver-test/suite_test.go

@@ -191,6 +191,26 @@ func get(path string) *http.Response {
 	return response
 }
 
+func getWithQuery(path string, params map[string]string) *http.Response {
+	client := &http.Client{}
+	if !strings.HasPrefix(path, "/v1") {
+		path = baseURL + path
+	} else {
+		path = baseDomain + path
+	}
+	req, err := http.NewRequest(http.MethodGet, path, nil)
+	Expect(err).Should(BeNil())
+	req.Header.Add("Authorization", token)
+	query := req.URL.Query()
+	for k, v := range params {
+		query.Set(k, v)
+	}
+	req.URL.RawQuery = query.Encode()
+	response, err := client.Do(req)
+	Expect(err).Should(BeNil())
+	return response
+}
+
 func delete(path string) *http.Response {
 	client := &http.Client{}
 	if !strings.HasPrefix(path, "/v1") {

vela-templates/definitions/internal/policy/read-only.cue

@@ -9,7 +9,7 @@
 template: {
 	#PolicyRule: {
 		// +usage=Specify how to select the targets of the rule
-		selector: [...#RuleSelector]
+		selector: #RuleSelector
 	}
 
 	#RuleSelector: {

vela-templates/definitions/internal/trait/container-image.cue

@@ -64,7 +64,7 @@ template: {
 		}
 	}
 
-	parameter: *#PatchParams | close({
+	parameter: #PatchParams | close({
 		// +usage=Specify the container image for multiple containers
 		containers: [...#PatchParams]
 	})

vela-templates/definitions/internal/trait/expose.cue

@@ -18,7 +18,10 @@ expose: {
 				}
 				if service.spec.type == "LoadBalancer" {
 					status: service.status
-					isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+					isHealth: *false | bool
+					if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+						isHealth: true
+					}
 					if !isHealth {
 						message: "ExternalIP: Pending"
 					}
@@ -28,11 +31,16 @@ expose: {
 				}
 				"""#
 			healthPolicy: #"""
-				isHealth: *true | bool
 				service: context.outputs.service
 				if service.spec.type == "LoadBalancer" {
 					status: service.status
-					isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
+					isHealth: *false | bool
+					if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
+						isHealth: true
+					}
+				}
+				if service.spec.type != "LoadBalancer" {
+					isHealth: true
 				}
 				"""#
 		}

vela-templates/definitions/internal/workflowstep/apply-terraform-provider.cue

@@ -113,7 +113,7 @@ template: {
 	#ECProvider: {
 		type:   "ec"
 		apiKey: *"" | string
-		name:   "ec-provider" | string
+		name:   *"ec-provider" | string
 	}
 	#GCPProvider: {
 		credentials: string