Fix: #4865 (#4867)

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

.github/workflows/release.yml

@@ -150,11 +150,15 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: cli-artifacts
+      - name: Get version
+        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - shell: bash
         working-directory: cli-artifacts
         run: |
           for file in *
           do
+            sed -i "s/\/vela/-${{ env.VELA_VERSION }}/g" ${file}
+            sed -i "s/\/kubectl-vela/-${{ env.VELA_VERSION }}/g" ${file}
             cat ${file} >> sha256sums.txt
           done
       - name: Upload Checksums

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

@@ -104,7 +104,7 @@ spec:
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
         	}
         }
         if igs[0].ip == _|_ {

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

@@ -28,8 +28,9 @@ spec:
         		}]
         	}]
         	initContainers: [{
-        		name:  parameter.name
-        		image: parameter.image
+        		name:            parameter.name
+        		image:           parameter.image
+        		imagePullPolicy: parameter.imagePullPolicy
         		if parameter.cmd != _|_ {
         			command: parameter.cmd
         		}
@@ -59,6 +60,9 @@ spec:
         	// +usage=Specify the image of init container
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
+
         	// +usage=Specify the commands run in the init container
         	cmd?: [...string]
 

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

@@ -104,7 +104,7 @@ spec:
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
         	}
         }
         if igs[0].ip == _|_ {

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

@@ -28,8 +28,9 @@ spec:
         		}]
         	}]
         	initContainers: [{
-        		name:  parameter.name
-        		image: parameter.image
+        		name:            parameter.name
+        		image:           parameter.image
+        		imagePullPolicy: parameter.imagePullPolicy
         		if parameter.cmd != _|_ {
         			command: parameter.cmd
         		}
@@ -59,6 +60,9 @@ spec:
         	// +usage=Specify the image of init container
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
+
         	// +usage=Specify the commands run in the init container
         	cmd?: [...string]
 

pkg/addon/render.go

@@ -48,6 +48,7 @@ const (
 	addonAllClusterPolicy              = "deploy-addon-to-all-clusters"
 	renderOutputCuePath                = "output"
 	renderAuxiliaryOutputsPath         = "outputs"
+	defaultCuePackageHeader            = "main"
 )
 
 type addonCueTemplateRender struct {
@@ -334,6 +335,13 @@ func renderResources(addon *InstallPackage, args map[string]interface{}) ([]comm
 	}
 
 	for _, tmpl := range addon.CUETemplates {
+		isMainCueTemplate, err := checkCueFileHasPackageHeader(tmpl)
+		if err != nil {
+			return nil, err
+		}
+		if isMainCueTemplate {
+			continue
+		}
 		comp, err := renderCompAccordingCUETemplate(tmpl, addon, args)
 		if err != nil && strings.Contains(err.Error(), "var(path=output) not exist") {
 			continue
@@ -367,3 +375,14 @@ func isDeployToRuntime(addon *InstallPackage) bool {
 	}
 	return addon.DeployTo.RuntimeCluster || addon.DeployTo.LegacyRuntimeCluster
 }
+
+func checkCueFileHasPackageHeader(cueTemplate ElementFile) (bool, error) {
+	cueFile, err := parser.ParseFile(cueTemplate.Name, cueTemplate.Data, parser.ParseComments)
+	if err != nil {
+		return false, err
+	}
+	if cueFile.PackageName() == defaultCuePackageHeader {
+		return true, nil
+	}
+	return false, nil
+}

pkg/addon/render_test.go

@@ -451,3 +451,99 @@ func TestRenderCueResourceError(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, len(comp), 2)
 }
+
+func TestCheckCueFileHasPackageHeader(t *testing.T) {
+	testCueTemplateWithPkg := `
+package main
+
+kustomizeController: {
+	// About this name, refer to #429 for details.
+	name: "fluxcd-kustomize-controller"
+	type: "webservice"
+	dependsOn: ["fluxcd-ns"]
+	properties: {
+		imagePullPolicy: "IfNotPresent"
+		image:           _base + "fluxcd/kustomize-controller:v0.26.0"
+		env: [
+			{
+				name:  "RUNTIME_NAMESPACE"
+				value: _targetNamespace
+			},
+		]
+		livenessProbe: {
+			httpGet: {
+				path: "/healthz"
+				port: 9440
+			}
+			timeoutSeconds: 5
+		}
+		readinessProbe: {
+			httpGet: {
+				path: "/readyz"
+				port: 9440
+			}
+			timeoutSeconds: 5
+		}
+		volumeMounts: {
+			emptyDir: [
+				{
+					name:      "temp"
+					mountPath: "/tmp"
+				},
+			]
+		}
+	}
+	traits: [
+		{
+			type: "service-account"
+			properties: {
+				name:       "sa-kustomize-controller"
+				create:     true
+				privileges: _rules
+			}
+		},
+		{
+			type: "labels"
+			properties: {
+				"control-plane": "controller"
+				// This label is kept to avoid breaking existing 
+				// KubeVela e2e tests (makefile e2e-setup).
+				"app": "kustomize-controller"
+			}
+		},
+		{
+			type: "command"
+			properties: {
+				args: controllerArgs
+			}
+		},
+	]
+}
+`
+
+	testCueTemplateWithoutPkg := `
+output: {
+   type: "helm"
+	name: "nginx-ingress"
+	properties: {
+		repoType: "helm"
+		url:      "https://kubernetes.github.io/ingress-nginx"
+		chart:    "ingress-nginx"
+		version:  "4.2.0"
+		values: {
+			controller: service: type: parameter["serviceType"]
+		}
+	}
+}
+`
+
+	cueTemplate := ElementFile{Name: "test-file.cue", Data: testCueTemplateWithPkg}
+	ok, err := checkCueFileHasPackageHeader(cueTemplate)
+	assert.NoError(t, err)
+	assert.Equal(t, true, ok)
+
+	cueTemplate = ElementFile{Name: "test-file-without-pkg.cue", Data: testCueTemplateWithoutPkg}
+	ok, err = checkCueFileHasPackageHeader(cueTemplate)
+	assert.NoError(t, err)
+	assert.Equal(t, false, ok)
+}

pkg/apiserver/utils/ui_schema.go

@@ -82,8 +82,8 @@ func (c Condition) Validate() error {
 	if c.JSONKey == "" {
 		return fmt.Errorf("the json key of the condition can not be empty")
 	}
-	if c.Action != "enable" && c.Action != "disable" {
-		return fmt.Errorf("the action of the condition must be enable or disable")
+	if c.Action != "enable" && c.Action != "disable" && c.Action != "" {
+		return fmt.Errorf("the action of the condition only supports enable, disable or leave it empty")
 	}
 	if c.Op != "" && !StringsContain([]string{"==", "!=", "in"}, c.Op) {
 		return fmt.Errorf("the op of the condition must be `==` 、`!=` and `in`")

pkg/controller/core.oam.dev/v1alpha2/application/revision.go

@@ -23,6 +23,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/hashicorp/go-version"
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -233,9 +234,6 @@ func (h *AppHandler) gatherRevisionSpec(af *appfile.Appfile) (*v1beta1.Applicati
 	copiedApp := h.app.DeepCopy()
 	// We better to remove all object status in the appRevision
 	copiedApp.Status = common.AppStatus{}
-	if !metav1.HasAnnotation(h.app.ObjectMeta, oam.AnnotationPublishVersion) {
-		copiedApp.Spec.Workflow = nil
-	}
 	appRev := &v1beta1.ApplicationRevision{
 		Spec: v1beta1.ApplicationRevisionSpec{
 			Application:             *copiedApp,
@@ -525,6 +523,28 @@ func deepEqualWorkflow(old, new v1alpha1.Workflow) bool {
 	return apiequality.Semantic.DeepEqual(old.Steps, new.Steps)
 }
 
+const velaVersionNumberToCompareWorkflow = "v1.5.7"
+
+func deepEqualAppSpec(old, new *v1beta1.Application) bool {
+	oldSpec, newSpec := old.Spec.DeepCopy(), new.Spec.DeepCopy()
+	// legacy code: KubeVela version before v1.5.7 & v1.6.0-alpha.4 does not
+	// record workflow in application spec in application revision. The comparison
+	// need to bypass the equality check of workflow to prevent unintended rerun
+	var curVerNum, publishVersion string
+	if annotations := old.GetAnnotations(); annotations != nil {
+		curVerNum = annotations[oam.AnnotationKubeVelaVersion]
+		publishVersion = annotations[oam.AnnotationPublishVersion]
+	}
+	if publishVersion == "" && curVerNum != "" {
+		cmpVer, _ := version.NewVersion(velaVersionNumberToCompareWorkflow)
+		if curVer, err := version.NewVersion(curVerNum); err == nil && curVer.LessThan(cmpVer) {
+			oldSpec.Workflow = nil
+			newSpec.Workflow = nil
+		}
+	}
+	return apiequality.Semantic.DeepEqual(oldSpec, newSpec)
+}
+
 func deepEqualAppInRevision(old, new *v1beta1.ApplicationRevision) bool {
 	if len(old.Spec.Policies) != len(new.Spec.Policies) {
 		return false
@@ -542,8 +562,10 @@ func deepEqualAppInRevision(old, new *v1beta1.ApplicationRevision) bool {
 			return false
 		}
 	}
-	return apiequality.Semantic.DeepEqual(filterSkipAffectAppRevTrait(old.Spec.Application.Spec, old.Spec.TraitDefinitions),
-		filterSkipAffectAppRevTrait(new.Spec.Application.Spec, new.Spec.TraitDefinitions))
+	oldApp, newApp := old.Spec.Application.DeepCopy(), new.Spec.Application.DeepCopy()
+	oldApp.Spec = filterSkipAffectAppRevTrait(oldApp.Spec, old.Spec.TraitDefinitions)
+	newApp.Spec = filterSkipAffectAppRevTrait(newApp.Spec, new.Spec.TraitDefinitions)
+	return deepEqualAppSpec(oldApp, newApp)
 }
 
 // HandleComponentsRevision manages Component revisions

pkg/controller/core.oam.dev/v1alpha2/application/revision_test.go

@@ -22,10 +22,12 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
+	"testing"
 	"time"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/require"
 
 	"github.com/google/go-cmp/cmp"
 	appsv1 "k8s.io/api/apps/v1"
@@ -1171,3 +1173,19 @@ status: {}
 		}()).Should(BeTrue())
 	})
 })
+
+func TestDeepEqualAppInRevision(t *testing.T) {
+	oldRev := &v1beta1.ApplicationRevision{}
+	newRev := &v1beta1.ApplicationRevision{}
+	newRev.Spec.Application.Spec.Workflow = &v1beta1.Workflow{
+		Steps: []v1beta1.WorkflowStep{{
+			Type: "deploy",
+			Name: "deploy",
+		}},
+	}
+	require.False(t, deepEqualAppInRevision(oldRev, newRev))
+	metav1.SetMetaDataAnnotation(&oldRev.Spec.Application.ObjectMeta, oam.AnnotationKubeVelaVersion, "v1.6.0-alpha.5")
+	require.False(t, deepEqualAppInRevision(oldRev, newRev))
+	metav1.SetMetaDataAnnotation(&oldRev.Spec.Application.ObjectMeta, oam.AnnotationKubeVelaVersion, "v1.5.0")
+	require.True(t, deepEqualAppInRevision(oldRev, newRev))
+}

pkg/stdlib/pkgs/query.cue

@@ -149,6 +149,7 @@
 			appProtocol?: string
 			host?:        string
 			port:         int
+			portName?:    string
 			path?:        string
 			inner?:       bool
 		}

pkg/utils/common/common.go

@@ -26,6 +26,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	neturl "net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -161,6 +162,9 @@ func GetClient() (client.Client, error) {
 // HTTPGetResponse use HTTP option and default client to send request and get raw response
 func HTTPGetResponse(ctx context.Context, url string, opts *HTTPOption) (*http.Response, error) {
 	// Change NewRequest to NewRequestWithContext and pass context it
+	if _, err := neturl.ParseRequestURI(url); err != nil {
+		return nil, err
+	}
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, err

pkg/utils/env/env.go

@@ -73,6 +73,17 @@ func CreateEnv(envArgs *types.EnvMeta) error {
 		}
 	}
 	ctx := context.TODO()
+
+	var nsList v1.NamespaceList
+	err = c.List(ctx, &nsList, client.MatchingLabels{oam.LabelControlPlaneNamespaceUsage: oam.VelaNamespaceUsageEnv,
+		oam.LabelNamespaceOfEnvName: envArgs.Name})
+	if err != nil {
+		return err
+	}
+	if len(nsList.Items) > 0 {
+		return fmt.Errorf("env name %s already exists", envArgs.Name)
+	}
+
 	namespace, err := utils.GetNamespace(ctx, c, envArgs.Namespace)
 	if err != nil && !apierrors.IsNotFound(err) {
 		return err

pkg/velaql/providers/query/endpoint.go

@@ -43,10 +43,10 @@ import (
 	"github.com/oam-dev/kubevela/pkg/workflow/types"
 )
 
-// GeneratorServiceEndpoints generator service endpoints is available for common component type,
+// CollectServiceEndpoints generator service endpoints is available for common component type,
 // such as webservice or helm
 // it can not support the cloud service component currently
-func (h *provider) GeneratorServiceEndpoints(wfctx wfContext.Context, v *value.Value, act types.Action) error {
+func (h *provider) CollectServiceEndpoints(wfctx wfContext.Context, v *value.Value, act types.Action) error {
 	ctx := context.Background()
 
 	val, err := v.LookupValue("app")
@@ -189,13 +189,14 @@ func generatorFromService(service corev1.Service, selectorNodeIP func() string,
 		ResourceVersion: service.ResourceVersion,
 	}
 
-	formatEndpoint := func(host, appProtocol string, portProtocol corev1.Protocol, portNum int32, inner bool) querytypes.ServiceEndpoint {
+	formatEndpoint := func(host, appProtocol string, portName string, portProtocol corev1.Protocol, portNum int32, inner bool) querytypes.ServiceEndpoint {
 		return querytypes.ServiceEndpoint{
 			Endpoint: querytypes.Endpoint{
 				Protocol:    portProtocol,
 				AppProtocol: &appProtocol,
 				Host:        host,
 				Port:        int(portNum),
+				PortName:    portName,
 				Path:        path,
 				Inner:       inner,
 			},
@@ -210,22 +211,22 @@ func generatorFromService(service corev1.Service, selectorNodeIP func() string,
 			appp := judgeAppProtocol(port.Port)
 			for _, ingress := range service.Status.LoadBalancer.Ingress {
 				if ingress.Hostname != "" {
-					serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.Hostname, appp, port.Protocol, port.NodePort, false))
+					serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.Hostname, appp, port.Name, port.Protocol, port.NodePort, false))
 				}
 				if ingress.IP != "" {
-					serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.IP, appp, port.Protocol, port.NodePort, false))
+					serviceEndpoints = append(serviceEndpoints, formatEndpoint(ingress.IP, appp, port.Name, port.Protocol, port.NodePort, false))
 				}
 			}
 		}
 	case corev1.ServiceTypeNodePort:
 		for _, port := range service.Spec.Ports {
 			appp := judgeAppProtocol(port.Port)
-			serviceEndpoints = append(serviceEndpoints, formatEndpoint(selectorNodeIP(), appp, port.Protocol, port.NodePort, false))
+			serviceEndpoints = append(serviceEndpoints, formatEndpoint(selectorNodeIP(), appp, port.Name, port.Protocol, port.NodePort, false))
 		}
 	case corev1.ServiceTypeClusterIP, corev1.ServiceTypeExternalName:
 		for _, port := range service.Spec.Ports {
 			appp := judgeAppProtocol(port.Port)
-			serviceEndpoints = append(serviceEndpoints, formatEndpoint(fmt.Sprintf("%s.%s", service.Name, service.Namespace), appp, port.Protocol, port.Port, true))
+			serviceEndpoints = append(serviceEndpoints, formatEndpoint(fmt.Sprintf("%s.%s", service.Name, service.Namespace), appp, port.Name, port.Protocol, port.Port, true))
 		}
 	}
 	return serviceEndpoints

pkg/velaql/providers/query/endpoint_test.go

@@ -244,7 +244,7 @@ var _ = Describe("Test Query Provider", func() {
 			pr := &provider{
 				cli: k8sClient,
 			}
-			err = pr.GeneratorServiceEndpoints(nil, v, nil)
+			err = pr.CollectServiceEndpoints(nil, v, nil)
 			Expect(err).Should(BeNil())
 
 			urls := []string{

pkg/velaql/providers/query/handler.go

@@ -305,6 +305,6 @@ func Install(p providers.Providers, cli client.Client, cfg *rest.Config) {
 		"collectResources":        prd.CollectResources,
 		"searchEvents":            prd.SearchEvents,
 		"collectLogsInPod":        prd.CollectLogsInPod,
-		"collectServiceEndpoints": prd.GeneratorServiceEndpoints,
+		"collectServiceEndpoints": prd.CollectServiceEndpoints,
 	})
 }

pkg/velaql/providers/query/handler_test.go

@@ -928,7 +928,7 @@ options: {
 		pr := &provider{
 			cli: k8sClient,
 		}
-		err = pr.GeneratorServiceEndpoints(nil, v, nil)
+		err = pr.CollectServiceEndpoints(nil, v, nil)
 		Expect(err).Should(BeNil())
 		gatewayIP := selectorNodeIP(ctx, "", k8sClient)
 		urls := []string{

pkg/velaql/providers/query/tree.go

@@ -879,8 +879,8 @@ func mergeCustomRules(ctx context.Context, k8sClient client.Client) error {
 			format      string
 			err         error
 		)
-		if item.Annotations != nil {
-			format = item.Annotations[oam.LabelResourceRuleFormat]
+		if item.Labels != nil {
+			format = item.Labels[oam.LabelResourceRuleFormat]
 		}
 		switch format {
 		case oam.ResourceTopologyFormatJSON:

pkg/velaql/providers/query/tree_test.go

@@ -1448,6 +1448,26 @@ var _ = Describe("test merge globalRules", func() {
       defaultLabelSelector: true
     - apiVersion: apps/v1
       kind: ControllerRevision
+`
+	clickhouseJsonStr := `
+[
+  {
+    "parentResourceType": {
+      "group": "clickhouse.altinity.com",
+      "kind": "ClickHouseInstallation"
+    },
+    "childrenResourceType": [
+      {
+        "apiVersion": "apps/v1",
+        "kind": "StatefulSet"
+      },
+      {
+        "apiVersion": "v1",
+        "kind": "Service"
+      }
+    ]
+  }
+]
 `
 	daemonSetStr := `
 - parentResourceType:
@@ -1481,20 +1501,29 @@ childrenResourceType:
 	It("test merge rules", func() {
 		Expect(k8sClient.Create(ctx, &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "vela-system"}})).Should(SatisfyAny(BeNil(), util.AlreadyExistMatcher{}))
 		cloneSetConfigMap := v1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "ConfigMap"},
-			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "cloneset", Labels: map[string]string{oam.LabelResourceRules: "true"}},
-			Data:       map[string]string{relationshipKey: cloneSetStr},
+			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "cloneset", Labels: map[string]string{
+				oam.LabelResourceRules:      "true",
+				oam.LabelResourceRuleFormat: oam.ResourceTopologyFormatYAML,
+			}},
+			Data: map[string]string{relationshipKey: cloneSetStr},
 		}
 		Expect(k8sClient.Create(ctx, &cloneSetConfigMap)).Should(BeNil())
 
 		daemonSetConfigMap := v1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "ConfigMap"},
-			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "daemonset", Labels: map[string]string{oam.LabelResourceRules: "true"}},
-			Data:       map[string]string{relationshipKey: daemonSetStr},
+			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "daemonset", Labels: map[string]string{
+				oam.LabelResourceRules:      "true",
+				oam.LabelResourceRuleFormat: oam.ResourceTopologyFormatYAML,
+			}},
+			Data: map[string]string{relationshipKey: daemonSetStr},
 		}
 		Expect(k8sClient.Create(ctx, &daemonSetConfigMap)).Should(BeNil())
 
 		stsConfigMap := v1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "ConfigMap"},
-			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "sts", Labels: map[string]string{oam.LabelResourceRules: "true"}},
-			Data:       map[string]string{relationshipKey: stsStr},
+			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "sts", Labels: map[string]string{
+				oam.LabelResourceRules:      "true",
+				oam.LabelResourceRuleFormat: oam.ResourceTopologyFormatYAML,
+			}},
+			Data: map[string]string{relationshipKey: stsStr},
 		}
 		Expect(k8sClient.Create(ctx, &stsConfigMap)).Should(BeNil())
 
@@ -1504,6 +1533,15 @@ childrenResourceType:
 		}
 		Expect(k8sClient.Create(ctx, &missConfigedCm)).Should(BeNil())
 
+		clickhouseJsonCm := v1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "ConfigMap"},
+			ObjectMeta: metav1.ObjectMeta{Namespace: types3.DefaultKubeVelaNS, Name: "clickhouse", Labels: map[string]string{
+				oam.LabelResourceRules:      "true",
+				oam.LabelResourceRuleFormat: oam.ResourceTopologyFormatJSON,
+			}},
+			Data: map[string]string{relationshipKey: clickhouseJsonStr},
+		}
+		Expect(k8sClient.Create(ctx, &clickhouseJsonCm)).Should(BeNil())
+
 		Expect(mergeCustomRules(ctx, k8sClient)).Should(BeNil())
 		childrenResources, ok := globalRule.GetRule(GroupResourceType{Group: "apps.kruise.io", Kind: "CloneSet"})
 		Expect(ok).Should(BeTrue())
@@ -1539,6 +1577,19 @@ childrenResourceType:
 		Expect(revisionCR).ShouldNot(BeNil())
 		Expect(revisionCR.listOptions).Should(BeNil())
 
+		chChildrenResources, ok := globalRule.GetRule(GroupResourceType{Group: "clickhouse.altinity.com", Kind: "ClickHouseInstallation"})
+		Expect(ok).Should(BeTrue())
+		Expect(chChildrenResources.DefaultGenListOptionFunc).Should(BeNil())
+		Expect(len(*chChildrenResources.SubResources)).Should(BeEquivalentTo(2))
+
+		chSts := chChildrenResources.SubResources.Get(ResourceType{APIVersion: "apps/v1", Kind: "StatefulSet"})
+		Expect(chSts).ShouldNot(BeNil())
+		Expect(chSts.listOptions).Should(BeNil())
+
+		chSvc := chChildrenResources.SubResources.Get(ResourceType{APIVersion: "v1", Kind: "Service"})
+		Expect(chSvc).ShouldNot(BeNil())
+		Expect(chSvc.listOptions).Should(BeNil())
+
 		// clear data
 		Expect(k8sClient.Delete(context.TODO(), &missConfigedCm)).Should(BeNil())
 		Expect(k8sClient.Delete(context.TODO(), &stsConfigMap)).Should(BeNil())

pkg/velaql/providers/query/types/type.go

@@ -92,6 +92,10 @@ type Endpoint struct {
 	// Default is 80.
 	Port int `json:"port"`
 
+	// +optional
+	// the name of the port
+	PortName string `json:"portName,omitempty"`
+
 	// the path for the endpoint
 	Path string `json:"path,omitempty"`
 

test/e2e-multicluster-test/multicluster_test.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -124,7 +123,7 @@ var _ = Describe("Test multicluster scenario", func() {
 			_, err := execCommand("cluster", "join", "/tmp/worker.kubeconfig", "--name", testClusterName)
 			Expect(err).Should(Succeed())
 			app := &v1beta1.Application{}
-			bs, err := ioutil.ReadFile("./testdata/app/example-lite-envbinding-app.yaml")
+			bs, err := os.ReadFile("./testdata/app/example-lite-envbinding-app.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(string(bs), "TEST_CLUSTER_NAME", testClusterName)
 			Expect(yaml.Unmarshal([]byte(appYaml), app)).Should(Succeed())
@@ -230,7 +229,7 @@ var _ = Describe("Test multicluster scenario", func() {
 			// 4. Component selector.
 			By("apply application")
 			app := &v1beta1.Application{}
-			bs, err := ioutil.ReadFile("./testdata/app/example-envbinding-app.yaml")
+			bs, err := os.ReadFile("./testdata/app/example-envbinding-app.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(strings.ReplaceAll(string(bs), "TEST_NAMESPACE", testNamespace), "PROD_NAMESPACE", prodNamespace)
 			Expect(yaml.Unmarshal([]byte(appYaml), app)).Should(Succeed())
@@ -277,7 +276,7 @@ var _ = Describe("Test multicluster scenario", func() {
 			// 5. add env
 			By("apply application")
 			app := &v1beta1.Application{}
-			bs, err := ioutil.ReadFile("./testdata/app/example-envbinding-app-wo-workflow.yaml")
+			bs, err := os.ReadFile("./testdata/app/example-envbinding-app-wo-workflow.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(string(bs), "TEST_NAMESPACE", testNamespace)
 			Expect(yaml.Unmarshal([]byte(appYaml), app)).Should(Succeed())
@@ -364,7 +363,7 @@ var _ = Describe("Test multicluster scenario", func() {
 		It("Test helm addon relied feature", func() {
 			By("apply application")
 			app := &v1beta1.Application{}
-			bs, err := ioutil.ReadFile("./testdata/app/app-apply-in-order.yaml")
+			bs, err := os.ReadFile("./testdata/app/app-apply-in-order.yaml")
 			Expect(err).Should(Succeed())
 			Expect(yaml.Unmarshal([]byte(bs), app)).Should(Succeed())
 			app.SetNamespace(testNamespace)
@@ -568,7 +567,7 @@ var _ = Describe("Test multicluster scenario", func() {
 		})
 
 		It("Test applications with bad resource", func() {
-			bs, err := ioutil.ReadFile("./testdata/app/app-bad-resource.yaml")
+			bs, err := os.ReadFile("./testdata/app/app-bad-resource.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(string(bs), "TEST_NAMESPACE", testNamespace)
 			app := &v1beta1.Application{}
@@ -588,7 +587,7 @@ var _ = Describe("Test multicluster scenario", func() {
 		})
 
 		It("Test applications with env and storage trait", func() {
-			bs, err := ioutil.ReadFile("./testdata/app/app-with-env-and-storage.yaml")
+			bs, err := os.ReadFile("./testdata/app/app-with-env-and-storage.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(string(bs), "TEST_NAMESPACE", testNamespace)
 			app := &v1beta1.Application{}
@@ -601,7 +600,7 @@ var _ = Describe("Test multicluster scenario", func() {
 		})
 
 		It("Test applications with gc policy change (onAppUpdate -> never)", func() {
-			bs, err := ioutil.ReadFile("./testdata/app/app-gc-policy-change.yaml")
+			bs, err := os.ReadFile("./testdata/app/app-gc-policy-change.yaml")
 			Expect(err).Should(Succeed())
 			appYaml := strings.ReplaceAll(string(bs), "TEST_NAMESPACE", testNamespace)
 			app := &v1beta1.Application{}
@@ -657,7 +656,7 @@ var _ = Describe("Test multicluster scenario", func() {
 		})
 
 		It("Test Application with env in webservice and labels & storage trait", func() {
-			bs, err := ioutil.ReadFile("./testdata/app/app-with-env-labels-storage.yaml")
+			bs, err := os.ReadFile("./testdata/app/app-with-env-labels-storage.yaml")
 			Expect(err).Should(Succeed())
 			app := &v1beta1.Application{}
 			Expect(yaml.Unmarshal(bs, app)).Should(Succeed())
@@ -673,5 +672,29 @@ var _ = Describe("Test multicluster scenario", func() {
 			Expect(deploy.Spec.Template.Spec.Containers[0].Env[0].Value).Should(Equal("testValue"))
 			Expect(len(deploy.Spec.Template.Spec.Volumes)).Should(Equal(1))
 		})
+
+		It("Test application with workflow change will rerun", func() {
+			By("create application")
+			bs, err := os.ReadFile("./testdata/app/app-lite-with-workflow.yaml")
+			Expect(err).Should(Succeed())
+			app := &v1beta1.Application{}
+			Expect(yaml.Unmarshal(bs, app)).Should(Succeed())
+			app.SetNamespace(testNamespace)
+			Expect(k8sClient.Create(hubCtx, app)).Should(Succeed())
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(hubCtx, client.ObjectKeyFromObject(app), app)).Should(Succeed())
+				g.Expect(app.Status.Phase).Should(Equal(common.ApplicationRunning))
+			}, 20*time.Second).Should(Succeed())
+			Expect(k8sClient.Get(hubCtx, client.ObjectKey{Namespace: testNamespace, Name: "data-worker"}, &appsv1.Deployment{})).Should(Succeed())
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(hubCtx, client.ObjectKeyFromObject(app), app)).Should(Succeed())
+				app.Spec.Workflow.Steps[0].Properties = &runtime.RawExtension{Raw: []byte(`{"policies":["worker"]}`)}
+				g.Expect(k8sClient.Update(hubCtx, app)).Should(Succeed())
+			}, 10*time.Second).Should(Succeed())
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Get(hubCtx, client.ObjectKey{Namespace: testNamespace, Name: "data-worker"}, &appsv1.Deployment{})).Should(Satisfy(kerrors.IsNotFound))
+				g.Expect(k8sClient.Get(workerCtx, client.ObjectKey{Namespace: testNamespace, Name: "data-worker"}, &appsv1.Deployment{})).Should(Succeed())
+			}, 20*time.Second).Should(Succeed())
+		})
 	})
 })

test/e2e-multicluster-test/testdata/app/app-lite-with-workflow.yaml

@@ -0,0 +1,28 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: example-lite-app
+spec:
+  components:
+    - name: data-worker
+      type: worker
+      properties:
+        image: busybox
+        cmd:
+          - sleep
+          - '1000000'
+  policies:
+    - name: local
+      type: topology
+      properties:
+        clusters: ["local"]
+    - name: worker
+      type: topology
+      properties:
+        clusters: ["cluster-worker"]
+  workflow:
+    steps:
+      - name: deploy
+        type: deploy
+        properties:
+          policies: ["local"]

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

@@ -19,7 +19,7 @@ gateway: {
 					    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
 				  	}
 				  	if igs[0].host == _|_ {
-					    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
+					    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
 				  	}
 				  }
 				  if igs[0].ip == _|_ {

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

@@ -19,8 +19,9 @@ template: {
 			}]
 		}]
 		initContainers: [{
-			name:  parameter.name
-			image: parameter.image
+			name:            parameter.name
+			image:           parameter.image
+			imagePullPolicy: parameter.imagePullPolicy
 			if parameter.cmd != _|_ {
 				command: parameter.cmd
 			}
@@ -50,6 +51,9 @@ template: {
 		// +usage=Specify the image of init container
 		image: string
 
+		// +usage=Specify image pull policy for your service
+		imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
+
 		// +usage=Specify the commands run in the init container
 		cmd?: [...string]