Fix: The apply failure error is ignored when the workflow is executed (#4462)

Signed-off-by: yangsoon <songyang.song@alibaba-inc.com>
(cherry picked from commit b1d8e6c88b)

Co-authored-by: yangsoon <songyang.song@alibaba-inc.com>

.github/CODEOWNERS

@@ -1,13 +1,7 @@
 # This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
 
-*                                  @barnettZQG @wonderflow @leejanee @Somefive @jefree-cat
-design/                            @barnettZQG @leejanee @wonderflow @Somefive @jefree-cat
-
-# Owner of Core Controllers
-pkg/controller/core.oam.dev       @Somefive @FogDong @barnettZQG @wonderflow
-
-# Owner of Standard Controllers
-pkg/controller/standard.oam.dev   @wangyikewxgm @barnettZQG @wonderflow
+*                                  @barnettZQG @wonderflow @leejanee @Somefive
+design/                            @barnettZQG @leejanee @wonderflow @Somefive
 
 # Owner of CUE
 pkg/cue                            @leejanee @FogDong @Somefive
@@ -17,21 +11,26 @@ pkg/stdlib                         @leejanee @FogDong @Somefive
 pkg/workflow                       @leejanee @FogDong @Somefive
 
 # Owner of rollout
-pkg/controller/common/rollout/     @wangyikewxgm @wonderflow
-runtime/rollout                    @wangyikewxgm @wonderflow
+pkg/controller/common/rollout/                              @wangyikewxgm @wonderflow
+pkg/controller/core.oam.dev/v1alpha2/applicationrollout     @wangyikewxgm @wonderflow
+pkg/controller/standard.oam.dev/v1alpha1/rollout            @wangyikewxgm @wonderflow
+runtime/rollout                                             @wangyikewxgm @wonderflow
+
+# Owner of definition controller
+pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition  @yangsoon @Somefive @FogDong
+pkg/controller/core.oam.dev/v1alpha2/core/policies/policydefinition        @yangsoon @Somefive @FogDong
+pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition   @yangsoon @zzxwill @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/traits/traitdefinition           @yangsoon @zzxwill @Somefive
+
+# Owner of health scope controller
+pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope     @captainroy-hy @zzxwill @yangsoon
 
 # Owner of vela templates
 vela-templates/                     @Somefive @barnettZQG @wonderflow
 
 # Owner of vela CLI
-references/cli/                     @Somefive @zzxwill @StevenLeiZhang @charlie0129 @chivalryq
+references/cli/                     @Somefive @zzxwill @StevenLeiZhang
 
 # Owner of vela APIServer
 pkg/apiserver/                     @barnettZQG @yangsoon @FogDong
 
-# Owner of vela addon framework
-pkg/addon/                         @wangyikewxgm @wonderflow @charlie0129
-
-# Owner of resource keeper and tracker
-pkg/resourcekeeper                 @Somefive @FogDong
-pkg/resourcetracker                @Somefive @FogDong

.github/workflows/apiserver-test.yaml

@@ -19,8 +19,9 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -47,9 +48,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
           fi
 
   apiserver-unit-tests:
@@ -110,9 +111,6 @@ jobs:
     strategy:
       matrix:
         k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
 
     steps:
       - name: Set up Go
@@ -130,50 +128,35 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@v1.0.8
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
 
-
-      - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-name: worker
-          k3d-args: --kubeconfig-update-default=false --network=k3d-k3s-default ${{ env.EGRESS_ARG }}
-
-
-      - name: Kind Cluster (Worker)
+      - name: Setup Kind Cluster (Worker)
         run: |
-          internal_ip=$(docker network inspect k3d-k3s-default|jq ".[0].Containers"| jq -r '.[]| select(.Name=="k3d-worker-server-0")|.IPv4Address' | cut -d/ -f1)
-          k3d kubeconfig get worker > /tmp/worker.client.kubeconfig
-          cp /tmp/worker.client.kubeconfig /tmp/worker.kubeconfig
-          sed -i "s/0.0.0.0:[0-9]\+/$internal_ip:6443/"  /tmp/worker.kubeconfig
+          kind delete cluster --name worker
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }} --name worker
+          kubectl version
+          kubectl cluster-info
+          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
+          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
 
-      - name: Load image to k3d cluster
-        run: make image-load
+      - name: Setup Kind Cluster (Hub)
+        run: |
+          kind delete cluster
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster
+        run: make kind-load
 
       - name: Cleanup for e2e tests
         run: |
-          make vela-cli
           make e2e-cleanup
+          make vela-cli
           make e2e-setup-core
           bin/vela addon enable fluxcd
           timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'

.github/workflows/chart.yaml

@@ -21,11 +21,7 @@ jobs:
       MINIMAL_HELM_CHART: charts/vela-minimal
       LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
       VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
-      LOCAL_OSS_DIRECTORY: .oss
-      HELM_CHART_NAME: vela-core
-      MINIMAL_HELM_CHART_NAME: vela-minimal
-      LEGACY_HELM_CHART_NAME: vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART_NAME: vela-rollout
+      LOCAL_OSS_DIRECTORY: .oss/
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
@@ -90,11 +86,4 @@ jobs:
           helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
           helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
       - name: sync local to cloud
-        run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
-          chart_semver=${image_tag#"v"}
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/index.yaml oss://$BUCKET/core/index.yaml
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$HELM_CHART_NAME-${chart_semver}.tgz 
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$MINIMAL_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$MINIMAL_HELM_CHART_NAME-${chart_semver}.tgz
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz
+        run: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f

.github/workflows/e2e-multicluster-test.yml

@@ -17,8 +17,9 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -45,9 +46,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
           fi
 
 
@@ -58,9 +59,6 @@ jobs:
     strategy:
       matrix:
         k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
 
 
     steps:
@@ -76,49 +74,37 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@v1.0.8
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
 
-      - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-name: worker
-          k3d-args: --kubeconfig-update-default=false --network=k3d-k3s-default ${{ env.EGRESS_ARG }}
-
-      - name: Generating internal worker kubeconfig
+      - name: Setup Kind Cluster (Worker)
         run: |
-          internal_ip=$(docker network inspect k3d-k3s-default|jq ".[0].Containers"| jq -r '.[]| select(.Name=="k3d-worker-server-0")|.IPv4Address' | cut -d/ -f1)
-          k3d kubeconfig get worker > /tmp/worker.client.kubeconfig
-          cp /tmp/worker.client.kubeconfig /tmp/worker.kubeconfig
-          sed -i "s/0.0.0.0:[0-9]\+/$internal_ip:6443/"  /tmp/worker.kubeconfig
+          kind delete cluster --name worker
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }} --name worker
+          kubectl version
+          kubectl cluster-info
+          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
+          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
 
-      - name: Load image to k3d cluster (hub and worker)
-        run: make image-load image-load-runtime-cluster
+      - name: Setup Kind Cluster (Hub)
+        run: |
+          kind delete cluster
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster (Hub)
+        run: make kind-load
 
       - name: Cleanup for e2e tests
         run: |
-          make vela-cli
           make e2e-cleanup
+          make vela-cli
           make e2e-setup-core-auth
+          make
           make setup-runtime-e2e-cluster
 
       - name: Run e2e multicluster tests

.github/workflows/e2e-rollout-test.yml

@@ -17,8 +17,9 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -45,9 +46,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
           fi
 
   e2e-rollout-tests:
@@ -57,10 +58,6 @@ jobs:
     strategy:
       matrix:
         k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
 
     steps:
       - name: Check out code into the Go module directory
@@ -75,35 +72,33 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
 
-      - name: Load image to k3d cluster
-        run: make image-load image-load-runtime-cluster
+      - name: Setup Kind Cluster
+        run: |
+          kind delete cluster
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster
+        run: make kind-load
+
+      - name: Run Make
+        run: make
+
+      - name: Run Make Manager
+        run: make manager
 
       - name: Prepare for e2e tests
         run: |
-          make vela-cli
           make e2e-cleanup
-          make e2e-setup-core
-          make setup-runtime-e2e-cluster
+          make e2e-setup
+          helm lint ./charts/vela-core
           helm test -n vela-system kubevela --timeout 5m
 
       - name: Run e2e tests

.github/workflows/e2e-test.yml

@@ -17,8 +17,9 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -45,9 +46,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
           fi
 
   e2e-tests:
@@ -57,10 +58,6 @@ jobs:
     strategy:
       matrix:
         k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
 
     steps:
       - name: Check out code into the Go module directory
@@ -75,36 +72,33 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
 
-      - name: Load image to k3d cluster
-        run: make image-load
+      - name: Setup Kind Cluster
+        run: |
+          kind delete cluster
+          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster
+        run: make kind-load
 
       - name: Run Make
         run: make
 
+      - name: Run Make Manager
+        run: make manager
+
       - name: Prepare for e2e tests
         run: |
           make e2e-cleanup
-          make e2e-setup-core
+          make e2e-setup
+          helm lint ./charts/vela-core
           helm test -n vela-system kubevela --timeout 5m
 
       - name: Run api e2e tests

.github/workflows/go.yml

@@ -15,6 +15,7 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
 
 jobs:
 

.github/workflows/issue-commands.yml

@@ -30,7 +30,7 @@ jobs:
           configPath: issue-commands
 
   backport:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/backport')
     steps:
       - name: Extract Command
@@ -65,11 +65,11 @@ jobs:
             })
             console.log("Added '" + label + "' label.")
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.8
+        uses: zeebe-io/backport-action@v0.0.6
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/registry.yml

@@ -167,6 +167,25 @@ jobs:
             docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository_owner }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
             ${{ secrets.ACR_DOMAIN }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+      
+      - uses: docker/build-push-action@v2
+        name: Build & Pushing CloudShell for Dockerhub, GHCR and ACR
+        with:
+          context: .
+          file: Dockerfile.cloudshell
+          labels: |-
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
+            VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
+          tags: |-
+            docker.io/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository_owner }}/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
+            ${{ secrets.ACR_DOMAIN }}/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
 
   publish-capabilities:
     env:

.github/workflows/unit-test.yml

@@ -15,6 +15,7 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
 
 jobs:
 
@@ -60,11 +61,10 @@ jobs:
         run: |
           sudo apt-get install -y golang-ginkgo-dev
 
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
+      - name: Setup Kind Cluster
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: v1.20
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          version: ${{ env.KIND_VERSION }}
 
       - name: install Kubebuilder
         uses: RyanSiu1995/kubebuilder-action@v1.2

.gitignore

@@ -33,7 +33,6 @@ vendor/
 
 # Vscode files
 .vscode
-.history
 
 pkg/test/vela
 config/crd/bases

Dockerfile.cli

@@ -39,5 +39,6 @@ RUN apk add --no-cache ca-certificates bash expat
 WORKDIR /
 
 ARG TARGETARCH
-COPY --from=builder /workspace/vela-${TARGETARCH} /bin/vela
-ENTRYPOINT ["/bin/vela"]
+COPY --from=builder /workspace/vela-${TARGETARCH} /vela
+COPY /vela /bin/
+ENTRYPOINT ["/vela"]

Dockerfile.cloudshell

@@ -0,0 +1,31 @@
+ARG BASE_IMAGE
+# Build the cli binary
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+ARG GOPROXY
+ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
+WORKDIR /workspace
+# Copy the Go Modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+# cache deps before building and copying source so that we don't need to re-download as much
+# and so that source changes don't invalidate our downloaded layer
+RUN go mod download
+
+# Copy the go source
+COPY apis/ apis/
+COPY pkg/ pkg/
+COPY version/ version/
+COPY references/ references/
+
+# Build
+ARG VERSION
+ARG GITVERSION
+
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
+    -o vela ./references/cmd/cli/main.go
+
+FROM ghcr.io/cloudtty/cloudshell:v0.2.0
+RUN apt-get install -y vim
+ENV API_TOKEN_PATH=/usr/local/kubeconfig/token
+COPY --from=builder /workspace/vela  /usr/local/bin/vela

Makefile

@@ -9,7 +9,7 @@ include makefiles/e2e.mk
 all: build
 
 # Run tests
-test: unit-test-core test-cli-gen
+test: vet lint staticcheck unit-test-core test-cli-gen
 	@$(OK) unit-tests pass
 
 test-cli-gen: 
@@ -22,7 +22,7 @@ unit-test-apiserver:
 	go test -gcflags=all=-l -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/...  | grep -E 'apiserver|velaql')
 
 # Build vela cli binary
-build: vela-cli kubectl-vela
+build: fmt vet lint staticcheck vela-cli kubectl-vela
 	@$(OK) build succeed
 
 build-cleanup:
@@ -82,28 +82,28 @@ endif
 
 
 
-# load docker image to the k3d cluster
-image-load:
+# load docker image to the kind cluster
+kind-load: kind-load-runtime-cluster
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
-	k3d image import $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
+	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
-image-load-runtime-cluster:
+kind-load-runtime-cluster:
 	/bin/sh hack/e2e/build_runtime_rollout.sh
 	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
 	rm -rf runtime/rollout/e2e/tmp
-	k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
-	k3d cluster get $(RUNTIME_CLUSTER_NAME) && k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --cluster=$(RUNTIME_CLUSTER_NAME) || echo "no worker cluster"
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
 
 # Run tests
-core-test:
+core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
 
 # Build vela core manager and apiserver binary
-manager:
+manager: fmt vet lint manifests
 	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go
 	$(GOBUILD_ENV) go build -o bin/apiserver -a -ldflags $(LDFLAGS) ./cmd/apiserver/main.go
 
-vela-runtime-rollout-manager:
+vela-runtime-rollout-manager: fmt vet lint manifests
 	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go
 
 # Generate manifests e.g. CRD, RBAC etc.

apis/core.oam.dev/common/types.go

@@ -26,8 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/oam"
@@ -270,6 +268,33 @@ type RawComponent struct {
 	Raw runtime.RawExtension `json:"raw"`
 }
 
+// StepStatus record the base status of workflow step, which could be workflow step or subStep
+type StepStatus struct {
+	ID    string            `json:"id"`
+	Name  string            `json:"name,omitempty"`
+	Type  string            `json:"type,omitempty"`
+	Phase WorkflowStepPhase `json:"phase,omitempty"`
+	// A human readable message indicating details about why the workflowStep is in this state.
+	Message string `json:"message,omitempty"`
+	// A brief CamelCase message indicating details about why the workflowStep is in this state.
+	Reason string `json:"reason,omitempty"`
+	// FirstExecuteTime is the first time this step execution.
+	FirstExecuteTime metav1.Time `json:"firstExecuteTime,omitempty"`
+	// LastExecuteTime is the last time this step execution.
+	LastExecuteTime metav1.Time `json:"lastExecuteTime,omitempty"`
+}
+
+// WorkflowStepStatus record the status of a workflow step, include step status and subStep status
+type WorkflowStepStatus struct {
+	StepStatus     `json:",inline"`
+	SubStepsStatus []WorkflowSubStepStatus `json:"subSteps,omitempty"`
+}
+
+// WorkflowSubStepStatus record the status of a workflow subStep
+type WorkflowSubStepStatus struct {
+	StepStatus `json:",inline"`
+}
+
 // AppStatus defines the observed state of Application
 type AppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
@@ -299,12 +324,10 @@ type AppStatus struct {
 	AppliedResources []ClusterObjectReference `json:"appliedResources,omitempty"`
 
 	// PolicyStatus records the status of policy
-	// Deprecated This field is only used by EnvBinding Policy which is deprecated.
 	PolicyStatus []PolicyStatus `json:"policy,omitempty"`
 }
 
 // PolicyStatus records the status of policy
-// Deprecated
 type PolicyStatus struct {
 	Name string `json:"name"`
 	Type string `json:"type"`
@@ -312,26 +335,95 @@ type PolicyStatus struct {
 	Status *runtime.RawExtension `json:"status,omitempty"`
 }
 
+// WorkflowStep defines how to execute a workflow step.
+type WorkflowStep struct {
+	// Name is the unique name of the workflow step.
+	Name string `json:"name"`
+
+	Type string `json:"type"`
+
+	Meta *WorkflowStepMeta `json:"meta,omitempty"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+
+	SubSteps []WorkflowSubStep `json:"subSteps,omitempty"`
+
+	If string `json:"if,omitempty"`
+
+	Timeout string `json:"timeout,omitempty"`
+
+	DependsOn []string `json:"dependsOn,omitempty"`
+
+	Inputs StepInputs `json:"inputs,omitempty"`
+
+	Outputs StepOutputs `json:"outputs,omitempty"`
+}
+
+// WorkflowStepMeta contains the meta data of a workflow step
+type WorkflowStepMeta struct {
+	Alias string `json:"alias,omitempty"`
+}
+
+// WorkflowSubStep defines how to execute a workflow subStep.
+type WorkflowSubStep struct {
+	// Name is the unique name of the workflow step.
+	Name string `json:"name"`
+
+	Type string `json:"type"`
+
+	Meta *WorkflowStepMeta `json:"meta,omitempty"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+
+	If string `json:"if,omitempty"`
+
+	Timeout string `json:"timeout,omitempty"`
+
+	DependsOn []string `json:"dependsOn,omitempty"`
+
+	Inputs StepInputs `json:"inputs,omitempty"`
+
+	Outputs StepOutputs `json:"outputs,omitempty"`
+}
+
 // WorkflowStatus record the status of workflow
 type WorkflowStatus struct {
-	AppRevision string                            `json:"appRevision,omitempty"`
-	Mode        string                            `json:"mode"`
-	Phase       workflowv1alpha1.WorkflowRunPhase `json:"status,omitempty"`
-	Message     string                            `json:"message,omitempty"`
+	AppRevision string       `json:"appRevision,omitempty"`
+	Mode        WorkflowMode `json:"mode"`
+	Message     string       `json:"message,omitempty"`
 
-	Suspend      bool   `json:"suspend"`
 	SuspendState string `json:"suspendState,omitempty"`
 
+	Suspend    bool `json:"suspend"`
 	Terminated bool `json:"terminated"`
 	Finished   bool `json:"finished"`
 
-	ContextBackend *corev1.ObjectReference               `json:"contextBackend,omitempty"`
-	Steps          []workflowv1alpha1.WorkflowStepStatus `json:"steps,omitempty"`
+	ContextBackend *corev1.ObjectReference `json:"contextBackend,omitempty"`
+	Steps          []WorkflowStepStatus    `json:"steps,omitempty"`
 
 	StartTime metav1.Time `json:"startTime,omitempty"`
-	EndTime   metav1.Time `json:"endTime,omitempty"`
 }
 
+// WorkflowStepPhase describes the phase of a workflow step.
+type WorkflowStepPhase string
+
+const (
+	// WorkflowStepPhaseSucceeded will make the controller run the next step.
+	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
+	// WorkflowStepPhaseFailed will report error in `message`.
+	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
+	// WorkflowStepPhaseSkipped will make the controller skip the step.
+	WorkflowStepPhaseSkipped WorkflowStepPhase = "skipped"
+	// WorkflowStepPhaseStopped will make the controller stop the workflow.
+	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
+	// WorkflowStepPhaseRunning will make the controller continue the workflow.
+	WorkflowStepPhaseRunning WorkflowStepPhase = "running"
+	// WorkflowStepPhasePending will make the controller wait for the step to run.
+	WorkflowStepPhasePending WorkflowStepPhase = "pending"
+)
+
 // DefinitionType describes the type of DefinitionRevision.
 // +kubebuilder:validation:Enum=Component;Trait;Policy;WorkflowStep
 type DefinitionType string
@@ -350,6 +442,16 @@ const (
 	WorkflowStepType DefinitionType = "WorkflowStep"
 )
 
+// WorkflowMode describes the mode of workflow
+type WorkflowMode string
+
+const (
+	// WorkflowModeDAG describes the DAG mode of workflow
+	WorkflowModeDAG WorkflowMode = "DAG"
+	// WorkflowModeStep describes the step by step mode of workflow
+	WorkflowModeStep WorkflowMode = "StepByStep"
+)
+
 // AppRolloutStatus defines the observed state of AppRollout
 type AppRolloutStatus struct {
 	v1alpha1.RolloutStatus `json:",inline"`
@@ -379,9 +481,9 @@ type ApplicationComponent struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Properties *runtime.RawExtension `json:"properties,omitempty"`
 
-	DependsOn []string                     `json:"dependsOn,omitempty"`
-	Inputs    workflowv1alpha1.StepInputs  `json:"inputs,omitempty"`
-	Outputs   workflowv1alpha1.StepOutputs `json:"outputs,omitempty"`
+	DependsOn []string    `json:"dependsOn,omitempty"`
+	Inputs    StepInputs  `json:"inputs,omitempty"`
+	Outputs   StepOutputs `json:"outputs,omitempty"`
 
 	// Traits define the trait of one component, the type must be array to keep the order.
 	Traits []ApplicationTrait `json:"traits,omitempty"`
@@ -390,10 +492,22 @@ type ApplicationComponent struct {
 	// scopes in ApplicationComponent defines the component-level scopes
 	// the format is <scope-type:scope-instance-name> pairs, the key represents type of `ScopeDefinition` while the value represent the name of scope instance.
 	Scopes map[string]string `json:"scopes,omitempty"`
+}
 
-	// ReplicaKey is not empty means the component is replicated. This field is designed so that it can't be specified in application directly.
-	// So we set the json tag as "-". Instead, this will be filled when using replication policy.
-	ReplicaKey string `json:"-"`
+// StepOutputs defines output variable of WorkflowStep
+type StepOutputs []outputItem
+
+// StepInputs defines variable input of WorkflowStep
+type StepInputs []inputItem
+
+type inputItem struct {
+	ParameterKey string `json:"parameterKey"`
+	From         string `json:"from"`
+}
+
+type outputItem struct {
+	ValueFrom string `json:"valueFrom"`
+	Name      string `json:"name"`
 }
 
 // ClusterSelector defines the rules to select a Cluster resource.
@@ -422,13 +536,16 @@ type ClusterPlacement struct {
 	Distribution Distribution `json:"distribution,omitempty"`
 }
 
+// ResourceCreatorRole defines the resource creator.
+type ResourceCreatorRole string
+
 const (
 	// PolicyResourceCreator create the policy resource.
-	PolicyResourceCreator string = "policy"
+	PolicyResourceCreator ResourceCreatorRole = "policy"
 	// WorkflowResourceCreator create the resource in workflow.
-	WorkflowResourceCreator string = "workflow"
+	WorkflowResourceCreator ResourceCreatorRole = "workflow"
 	// DebugResourceCreator create the debug resource.
-	DebugResourceCreator string = "debug"
+	DebugResourceCreator ResourceCreatorRole = "debug"
 )
 
 // OAMObjectReference defines the object reference for an oam resource
@@ -475,8 +592,8 @@ func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
 
 // ClusterObjectReference defines the object reference with cluster.
 type ClusterObjectReference struct {
-	Cluster                string `json:"cluster,omitempty"`
-	Creator                string `json:"creator,omitempty"`
+	Cluster                string              `json:"cluster,omitempty"`
+	Creator                ResourceCreatorRole `json:"creator,omitempty"`
 	corev1.ObjectReference `json:",inline"`
 }
 

apis/core.oam.dev/common/zz_generated.deepcopy.go

@@ -22,7 +22,6 @@ limitations under the License.
 package common
 
 import (
-	"github.com/kubevela/workflow/api/v1alpha1"
 	crossplane_runtime "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -109,12 +108,12 @@ func (in *ApplicationComponent) DeepCopyInto(out *ApplicationComponent) {
 	}
 	if in.Inputs != nil {
 		in, out := &in.Inputs, &out.Inputs
-		*out = make(v1alpha1.StepInputs, len(*in))
+		*out = make(StepInputs, len(*in))
 		copy(*out, *in)
 	}
 	if in.Outputs != nil {
 		in, out := &in.Outputs, &out.Outputs
-		*out = make(v1alpha1.StepOutputs, len(*in))
+		*out = make(StepOutputs, len(*in))
 		copy(*out, *in)
 	}
 	if in.Traits != nil {
@@ -574,6 +573,61 @@ func (in *Status) DeepCopy() *Status {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepInputs) DeepCopyInto(out *StepInputs) {
+	{
+		in := &in
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepInputs.
+func (in StepInputs) DeepCopy() StepInputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepInputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepOutputs) DeepCopyInto(out *StepOutputs) {
+	{
+		in := &in
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepOutputs.
+func (in StepOutputs) DeepCopy() StepOutputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepOutputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *StepStatus) DeepCopyInto(out *StepStatus) {
+	*out = *in
+	in.FirstExecuteTime.DeepCopyInto(&out.FirstExecuteTime)
+	in.LastExecuteTime.DeepCopyInto(&out.LastExecuteTime)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepStatus.
+func (in *StepStatus) DeepCopy() *StepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(StepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Terraform) DeepCopyInto(out *Terraform) {
 	*out = *in
@@ -609,13 +663,12 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
 	}
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
-		*out = make([]v1alpha1.WorkflowStepStatus, len(*in))
+		*out = make([]WorkflowStepStatus, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 	in.StartTime.DeepCopyInto(&out.StartTime)
-	in.EndTime.DeepCopyInto(&out.EndTime)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
@@ -628,6 +681,147 @@ func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
+	*out = *in
+	if in.Meta != nil {
+		in, out := &in.Meta, &out.Meta
+		*out = new(WorkflowStepMeta)
+		**out = **in
+	}
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.SubSteps != nil {
+		in, out := &in.SubSteps, &out.SubSteps
+		*out = make([]WorkflowSubStep, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.DependsOn != nil {
+		in, out := &in.DependsOn, &out.DependsOn
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStep.
+func (in *WorkflowStep) DeepCopy() *WorkflowStep {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStep)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepMeta) DeepCopyInto(out *WorkflowStepMeta) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepMeta.
+func (in *WorkflowStepMeta) DeepCopy() *WorkflowStepMeta {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepMeta)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
+	*out = *in
+	in.StepStatus.DeepCopyInto(&out.StepStatus)
+	if in.SubStepsStatus != nil {
+		in, out := &in.SubStepsStatus, &out.SubStepsStatus
+		*out = make([]WorkflowSubStepStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.
+func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowSubStep) DeepCopyInto(out *WorkflowSubStep) {
+	*out = *in
+	if in.Meta != nil {
+		in, out := &in.Meta, &out.Meta
+		*out = new(WorkflowStepMeta)
+		**out = **in
+	}
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.DependsOn != nil {
+		in, out := &in.DependsOn, &out.DependsOn
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStep.
+func (in *WorkflowSubStep) DeepCopy() *WorkflowSubStep {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowSubStep)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowSubStepStatus) DeepCopyInto(out *WorkflowSubStepStatus) {
+	*out = *in
+	in.StepStatus.DeepCopyInto(&out.StepStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStepStatus.
+func (in *WorkflowSubStepStatus) DeepCopy() *WorkflowSubStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowSubStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
 	*out = *in

apis/core.oam.dev/v1alpha1/applyonce_types.go

@@ -53,7 +53,15 @@ func (in ApplyOncePolicySpec) FindStrategy(manifest *unstructured.Unstructured)
 		return nil
 	}
 	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
+		match := func(src []string, val string) (found bool) {
+			for _, _val := range src {
+				found = found || _val == val
+			}
+			return val != "" && found
+		}
+		if (match(rule.Selector.CompNames, manifest.GetName()) && match(rule.Selector.ResourceTypes, manifest.GetKind())) ||
+			(rule.Selector.CompNames == nil && match(rule.Selector.ResourceTypes, manifest.GetKind()) ||
+				(rule.Selector.ResourceTypes == nil && match(rule.Selector.CompNames, manifest.GetName()))) {
 			return rule.Strategy
 		}
 	}

apis/core.oam.dev/v1alpha1/envbinding_types.go

@@ -97,7 +97,6 @@ type EnvSelector struct {
 }
 
 // EnvConfig is the configuration for different environments.
-// Deprecated
 type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
@@ -106,7 +105,6 @@ type EnvConfig struct {
 }
 
 // EnvBindingSpec defines a list of envs
-// Deprecated This spec is deprecated and replaced by Topology/Override Policy
 type EnvBindingSpec struct {
 	Envs []EnvConfig `json:"envs"`
 }
@@ -126,21 +124,18 @@ func (in PlacementDecision) String() string {
 }
 
 // EnvStatus records the status of one env
-// Deprecated
 type EnvStatus struct {
 	Env        string              `json:"env"`
 	Placements []PlacementDecision `json:"placements"`
 }
 
 // ClusterConnection records the connection with clusters and the last active app revision when they are active (still be used)
-// Deprecated
 type ClusterConnection struct {
 	ClusterName        string `json:"clusterName"`
 	LastActiveRevision string `json:"lastActiveRevision"`
 }
 
 // EnvBindingStatus records the status of all env
-// Deprecated
 type EnvBindingStatus struct {
 	Envs               []EnvStatus         `json:"envs"`
 	ClusterConnections []ClusterConnection `json:"clusterConnections"`

apis/core.oam.dev/v1alpha1/external_types.go

@@ -19,6 +19,8 @@ package v1alpha1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // +kubebuilder:object:root=true
@@ -47,3 +49,27 @@ type PolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Policy `json:"items"`
 }
+
+// +kubebuilder:object:root=true
+
+// Workflow is the Schema for the policy API
+// +kubebuilder:storageversion
+// +kubebuilder:resource:categories={oam}
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Workflow struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Steps []common.WorkflowStep `json:"steps,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// WorkflowList contains a list of Workflow
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type WorkflowList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Workflow `json:"items"`
+}

apis/core.oam.dev/v1alpha1/garbagecollect_types.go

@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/pointer"
 	"k8s.io/utils/strings/slices"
 
 	"github.com/oam-dev/kubevela/pkg/oam"
@@ -58,19 +57,20 @@ type GarbageCollectPolicyRule struct {
 }
 
 // ResourcePolicyRuleSelector select the targets of the rule
-// if multiple conditions are specified, combination logic is AND
+// 1) for GarbageCollectPolicyRule
+// if both traitTypes, oamTypes and componentTypes are specified, combination logic is OR
+// if one resource is specified with conflict strategies, strategy as component go first.
+// 2) for ApplyOncePolicyRule only CompNames and ResourceTypes are used
 type ResourcePolicyRuleSelector struct {
-	CompNames        []string `json:"componentNames,omitempty"`
-	CompTypes        []string `json:"componentTypes,omitempty"`
-	OAMResourceTypes []string `json:"oamTypes,omitempty"`
-	TraitTypes       []string `json:"traitTypes,omitempty"`
-	ResourceTypes    []string `json:"resourceTypes,omitempty"`
-	ResourceNames    []string `json:"resourceNames,omitempty"`
+	CompNames        []string `json:"componentNames"`
+	CompTypes        []string `json:"componentTypes"`
+	OAMResourceTypes []string `json:"oamTypes"`
+	TraitTypes       []string `json:"traitTypes"`
+	ResourceTypes    []string `json:"resourceTypes"`
+	ResourceNames    []string `json:"resourceNames"`
 }
 
 // Match check if current rule selector match the target resource
-// If at least one condition is matched and no other condition failed (could be empty), return true
-// Otherwise, return false
 func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured) bool {
 	var compName, compType, oamType, traitType, resourceType, resourceName string
 	if labels := manifest.GetLabels(); labels != nil {
@@ -81,33 +81,15 @@ func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured)
 	}
 	resourceType = manifest.GetKind()
 	resourceName = manifest.GetName()
-	match := func(src []string, val string) (found *bool) {
-		if len(src) == 0 {
-			return nil
-		}
-		return pointer.Bool(val != "" && slices.Contains(src, val))
+	match := func(src []string, val string) (found bool) {
+		return val != "" && slices.Contains(src, val)
 	}
-	conditions := []*bool{
-		match(in.CompNames, compName),
-		match(in.CompTypes, compType),
-		match(in.OAMResourceTypes, oamType),
-		match(in.TraitTypes, traitType),
-		match(in.ResourceTypes, resourceType),
-		match(in.ResourceNames, resourceName),
-	}
-	hasMatched := false
-	for _, cond := range conditions {
-		// if any non-empty condition failed, return false
-		if cond != nil && !*cond {
-			return false
-		}
-		// if condition succeed, record it
-		if cond != nil && *cond {
-			hasMatched = true
-		}
-	}
-	// if at least one condition is met, return true
-	return hasMatched
+	return match(in.CompNames, compName) ||
+		match(in.CompTypes, compType) ||
+		match(in.OAMResourceTypes, oamType) ||
+		match(in.TraitTypes, traitType) ||
+		match(in.ResourceTypes, resourceType) ||
+		match(in.ResourceNames, resourceName)
 }
 
 // GarbageCollectStrategy the strategy for target resource to recycle

apis/core.oam.dev/v1alpha1/policy_types.go

@@ -27,8 +27,6 @@ const (
 	DebugPolicyType = "debug"
 	// SharedResourcePolicyType refers to the type of shared resource policy
 	SharedResourcePolicyType = "shared-resource"
-	// ReplicationPolicyType refers to the type of replication policy
-	ReplicationPolicyType = "replication"
 )
 
 // TopologyPolicySpec defines the spec of topology policy
@@ -79,11 +77,3 @@ func (in SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructu
 	}
 	return false
 }
-
-// ReplicationPolicySpec defines the spec of replication policy
-// Override policy should be used together with replication policy to select the deployment target components
-type ReplicationPolicySpec struct {
-	Keys []string `json:"keys,omitempty"`
-	// Selector is the subset of selected components which will be replicated.
-	Selector []string `json:"selector,omitempty"`
-}

apis/core.oam.dev/v1alpha1/register.go

@@ -20,8 +20,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
@@ -56,5 +54,5 @@ var (
 
 func init() {
 	SchemeBuilder.Register(&Policy{}, &PolicyList{})
-	SchemeBuilder.Register(&workflowv1alpha1.Workflow{}, &workflowv1alpha1.WorkflowList{})
+	SchemeBuilder.Register(&Workflow{}, &WorkflowList{})
 }

apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go

@@ -612,31 +612,6 @@ func (in *RefObjectsComponentSpec) DeepCopy() *RefObjectsComponentSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReplicationPolicySpec) DeepCopyInto(out *ReplicationPolicySpec) {
-	*out = *in
-	if in.Keys != nil {
-		in, out := &in.Keys, &out.Keys
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReplicationPolicySpec.
-func (in *ReplicationPolicySpec) DeepCopy() *ReplicationPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ReplicationPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourcePolicyRuleSelector) DeepCopyInto(out *ResourcePolicyRuleSelector) {
 	*out = *in
@@ -735,3 +710,67 @@ func (in *TopologyPolicySpec) DeepCopy() *TopologyPolicySpec {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Workflow) DeepCopyInto(out *Workflow) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]common.WorkflowStep, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Workflow.
+func (in *Workflow) DeepCopy() *Workflow {
+	if in == nil {
+		return nil
+	}
+	out := new(Workflow)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Workflow) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowList) DeepCopyInto(out *WorkflowList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Workflow, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowList.
+func (in *WorkflowList) DeepCopy() *WorkflowList {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *WorkflowList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}

apis/core.oam.dev/v1beta1/application_types.go

@@ -23,8 +23,6 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
@@ -51,11 +49,20 @@ type AppPolicy struct {
 	Properties *runtime.RawExtension `json:"properties,omitempty"`
 }
 
+// WorkflowStep defines how to execute a workflow step.
+type WorkflowStep common.WorkflowStep
+
 // Workflow defines workflow steps and other attributes
 type Workflow struct {
-	Ref   string                                `json:"ref,omitempty"`
-	Mode  *workflowv1alpha1.WorkflowExecuteMode `json:"mode,omitempty"`
-	Steps []workflowv1alpha1.WorkflowStep       `json:"steps,omitempty"`
+	Ref   string               `json:"ref,omitempty"`
+	Mode  *WorkflowExecuteMode `json:"mode,omitempty"`
+	Steps []WorkflowStep       `json:"steps,omitempty"`
+}
+
+// WorkflowExecuteMode defines the mode of workflow execution
+type WorkflowExecuteMode struct {
+	Steps    common.WorkflowMode `json:"steps,omitempty"`
+	SubSteps common.WorkflowMode `json:"subSteps,omitempty"`
 }
 
 // ApplicationSpec is the spec of Application

apis/core.oam.dev/v1beta1/applicationrevision_types.go

@@ -19,8 +19,6 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 )
@@ -57,7 +55,7 @@ type ApplicationRevisionSpec struct {
 	Policies map[string]v1alpha1.Policy `json:"policies,omitempty"`
 
 	// Workflow records the external workflow
-	Workflow *workflowv1alpha1.Workflow `json:"workflow,omitempty"`
+	Workflow *v1alpha1.Workflow `json:"workflow,omitempty"`
 
 	// ReferredObjects records the referred objects used in the ref-object typed components
 	// +kubebuilder:pruning:PreserveUnknownFields

apis/core.oam.dev/v1beta1/core_types.go

@@ -120,7 +120,7 @@ type TraitDefinitionSpec struct {
 	PodDisruptive bool `json:"podDisruptive,omitempty"`
 
 	// AppliesToWorkloads specifies the list of workload kinds this trait
-	// applies to. Workload kinds are specified in resource.group/version format,
+	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
 	// all workload kinds.
 	// +optional

apis/core.oam.dev/v1beta1/resourcetracker_types.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
+	errors2 "github.com/pkg/errors"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -33,8 +33,7 @@ import (
 	"github.com/oam-dev/kubevela/apis/interfaces"
 	velatypes "github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/compression"
-	velaerr "github.com/oam-dev/kubevela/pkg/utils/errors"
+	"github.com/oam-dev/kubevela/pkg/utils/errors"
 )
 
 // +kubebuilder:object:root=true
@@ -70,80 +69,9 @@ const (
 
 // ResourceTrackerSpec define the spec of resourceTracker
 type ResourceTrackerSpec struct {
-	Type                  ResourceTrackerType        `json:"type,omitempty"`
-	ApplicationGeneration int64                      `json:"applicationGeneration"`
-	ManagedResources      []ManagedResource          `json:"managedResources,omitempty"`
-	Compression           ResourceTrackerCompression `json:"compression,omitempty"`
-}
-
-// ResourceTrackerCompression the compression for ResourceTracker ManagedResources
-type ResourceTrackerCompression struct {
-	Type compression.Type `json:"type,omitempty"`
-	Data string           `json:"data,omitempty"`
-}
-
-// MarshalJSON will encode ResourceTrackerSpec according to the compression type. If type specified,
-// it will encode data to compression data.
-// Note: this is not the standard json Marshal process but re-use the framework function.
-func (in *ResourceTrackerSpec) MarshalJSON() ([]byte, error) {
-	type Alias ResourceTrackerSpec
-	tmp := &struct{ *Alias }{}
-	switch in.Compression.Type {
-	case compression.Uncompressed:
-		tmp.Alias = (*Alias)(in)
-	case compression.Gzip:
-		cpy := in.DeepCopy()
-		data, err := compression.GzipObjectToString(in.ManagedResources)
-		if err != nil {
-			return nil, err
-		}
-		cpy.ManagedResources = nil
-		cpy.Compression.Data = data
-		tmp.Alias = (*Alias)(cpy)
-	case compression.Zstd:
-		cpy := in.DeepCopy()
-		data, err := compression.ZstdObjectToString(in.ManagedResources)
-		if err != nil {
-			return nil, err
-		}
-		cpy.ManagedResources = nil
-		cpy.Compression.Data = data
-		tmp.Alias = (*Alias)(cpy)
-	default:
-		return nil, compression.NewUnsupportedCompressionTypeError(string(in.Compression.Type))
-	}
-	return json.Marshal(tmp.Alias)
-}
-
-// UnmarshalJSON will decode ResourceTrackerSpec according to the compression type. If type specified,
-// it will decode data from compression data.
-// Note: this is not the standard json Unmarshal process but re-use the framework function.
-func (in *ResourceTrackerSpec) UnmarshalJSON(src []byte) error {
-	type Alias ResourceTrackerSpec
-	tmp := &struct{ *Alias }{}
-	if err := json.Unmarshal(src, tmp); err != nil {
-		return err
-	}
-	switch tmp.Compression.Type {
-	case compression.Uncompressed:
-		break
-	case compression.Gzip:
-		tmp.ManagedResources = []ManagedResource{}
-		if err := compression.GunzipStringToObject(tmp.Compression.Data, &tmp.ManagedResources); err != nil {
-			return err
-		}
-		tmp.Compression.Data = ""
-	case compression.Zstd:
-		tmp.ManagedResources = []ManagedResource{}
-		if err := compression.UnZstdStringToObject(tmp.Compression.Data, &tmp.ManagedResources); err != nil {
-			return err
-		}
-		tmp.Compression.Data = ""
-	default:
-		return compression.NewUnsupportedCompressionTypeError(string(in.Compression.Type))
-	}
-	(*ResourceTrackerSpec)(tmp.Alias).DeepCopyInto(in)
-	return nil
+	Type                  ResourceTrackerType `json:"type,omitempty"`
+	ApplicationGeneration int64               `json:"applicationGeneration"`
+	ManagedResources      []ManagedResource   `json:"managedResources,omitempty"`
 }
 
 // ManagedResource define the resource to be managed by ResourceTracker
@@ -154,8 +82,6 @@ type ManagedResource struct {
 	Data *runtime.RawExtension `json:"raw,omitempty"`
 	// Deleted marks the resource to be deleted
 	Deleted bool `json:"deleted,omitempty"`
-	// SkipGC marks the resource to skip gc
-	SkipGC bool `json:"skipGC,omitempty"`
 }
 
 // Equal check if two managed resource equals
@@ -195,13 +121,12 @@ func (in ManagedResource) NamespacedName() types.NamespacedName {
 
 // ResourceKey computes the key for managed resource, resources with the same key points to the same resource
 func (in ManagedResource) ResourceKey() string {
-	group := in.GroupVersionKind().Group
-	kind := in.GroupVersionKind().Kind
+	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
 	cluster := in.Cluster
 	if cluster == "" {
 		cluster = velatypes.ClusterLocalName
 	}
-	return strings.Join([]string{group, kind, cluster, in.Namespace, in.Name}, "/")
+	return strings.Join([]string{gv, kind, cluster, in.Namespace, in.Name}, "/")
 }
 
 // ComponentKey computes the key for the component which managed resource belongs to
@@ -212,7 +137,7 @@ func (in ManagedResource) ComponentKey() string {
 // UnmarshalTo unmarshal ManagedResource into target object
 func (in ManagedResource) UnmarshalTo(obj interface{}) error {
 	if in.Data == nil || in.Data.Raw == nil {
-		return velaerr.ManagedResourceHasNoDataError{}
+		return errors.ManagedResourceHasNoDataError{}
 	}
 	return json.Unmarshal(in.Data.Raw, obj)
 }
@@ -233,7 +158,7 @@ func (in ManagedResource) ToUnstructured() *unstructured.Unstructured {
 func (in ManagedResource) ToUnstructuredWithData() (*unstructured.Unstructured, error) {
 	obj := in.ToUnstructured()
 	if err := in.UnmarshalTo(obj); err != nil {
-		if errors.Is(err, velaerr.ManagedResourceHasNoDataError{}) {
+		if errors2.Is(err, errors.ManagedResourceHasNoDataError{}) {
 			return nil, err
 		}
 	}
@@ -270,7 +195,7 @@ func newManagedResourceFromResource(rsc client.Object) ManagedResource {
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	return ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: corev1.ObjectReference{
+			ObjectReference: v1.ObjectReference{
 				APIVersion: gvk.GroupVersion().String(),
 				Kind:       gvk.Kind,
 				Name:       rsc.GetName(),
@@ -290,9 +215,8 @@ func (in *ResourceTracker) ContainsManagedResource(rsc client.Object) bool {
 }
 
 // AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, skipGC bool, creator string) (updated bool) {
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, creator common.ResourceCreatorRole) (updated bool) {
 	mr := newManagedResourceFromResource(rsc)
-	mr.SkipGC = skipGC
 	if !metaOnly {
 		mr.Data = &runtime.RawExtension{Object: rsc}
 	}
@@ -318,7 +242,7 @@ func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool)
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	mr := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: corev1.ObjectReference{
+			ObjectReference: v1.ObjectReference{
 				APIVersion: gvk.GroupVersion().String(),
 				Kind:       gvk.Kind,
 				Name:       rsc.GetName(),
@@ -361,7 +285,7 @@ func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectRef
 // Deprecated
 func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
 	return in.addClusterObjectReference(common.ClusterObjectReference{
-		ObjectReference: corev1.ObjectReference{
+		ObjectReference: v1.ObjectReference{
 			APIVersion: rsc.GetAPIVersion(),
 			Kind:       rsc.GetKind(),
 			Name:       rsc.GetName(),

apis/core.oam.dev/v1beta1/resourcetracker_types_test.go

@@ -18,23 +18,18 @@ package v1beta1
 
 import (
 	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	v12 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/compression"
 	"github.com/oam-dev/kubevela/pkg/utils/errors"
 )
 
@@ -116,10 +111,10 @@ func TestManagedResourceKeys(t *testing.T) {
 	input := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
 			Cluster: "cluster",
-			ObjectReference: corev1.ObjectReference{
+			ObjectReference: v1.ObjectReference{
 				Namespace:  "namespace",
 				Name:       "name",
-				APIVersion: appsv1.SchemeGroupVersion.String(),
+				APIVersion: v12.SchemeGroupVersion.String(),
 				Kind:       "Deployment",
 			},
 		},
@@ -130,10 +125,10 @@ func TestManagedResourceKeys(t *testing.T) {
 		},
 	}
 	r.Equal("namespace/name", input.NamespacedName().String())
-	r.Equal("apps/Deployment/cluster/namespace/name", input.ResourceKey())
+	r.Equal("apps/v1/Deployment/cluster/namespace/name", input.ResourceKey())
 	r.Equal("env/component", input.ComponentKey())
 	r.Equal("Deployment name (Cluster: cluster, Namespace: namespace)", input.DisplayName())
-	var deploy1, deploy2 appsv1.Deployment
+	var deploy1, deploy2 v12.Deployment
 	deploy1.Spec.Replicas = pointer.Int32(5)
 	bs, err := json.Marshal(deploy1)
 	r.NoError(err)
@@ -160,17 +155,17 @@ func TestManagedResourceKeys(t *testing.T) {
 func TestResourceTracker_ManagedResource(t *testing.T) {
 	r := require.New(t)
 	input := &ResourceTracker{}
-	deploy1 := appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true, false, "")
+	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
+	input.AddManagedResource(&deploy1, true, "")
 	r.Equal(1, len(input.Spec.ManagedResources))
-	cm2 := corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false, false, "")
+	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
+	input.AddManagedResource(&cm2, false, "")
 	r.Equal(2, len(input.Spec.ManagedResources))
-	pod3 := corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false, false, "")
+	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
+	input.AddManagedResource(&pod3, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false, false, "")
+	input.AddManagedResource(&deploy1, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&cm2, false)
 	r.Equal(3, len(input.Spec.ManagedResources))
@@ -181,171 +176,9 @@ func TestResourceTracker_ManagedResource(t *testing.T) {
 	r.Equal(1, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&pod3, true)
 	r.Equal(0, len(input.Spec.ManagedResources))
-	secret4 := corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "secret4"}}
+	secret4 := v1.Secret{ObjectMeta: v13.ObjectMeta{Name: "secret4"}}
 	input.DeleteManagedResource(&secret4, true)
 	r.Equal(0, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&secret4, false)
 	r.Equal(1, len(input.Spec.ManagedResources))
 }
-
-func TestResourceTrackerCompression(t *testing.T) {
-	count := 20
-	r := require.New(t)
-
-	// Load some real CRDs, and other test data to simulate real use-cases.
-	// The user must have some large resourcetrackers if they use compression,
-	// so we load some large CRDs.
-	var data []string
-	paths := []string{
-		"../../../charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_applications.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_healthscopes.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml",
-		"../../../charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml",
-		"../../../charts/vela-core/crds/standard.oam.dev_rollouts.yaml",
-		"../../../charts/vela-core/templates/addon/fluxcd.yaml",
-		"../../../charts/vela-core/templates/kubevela-controller.yaml",
-		"../../../charts/vela-core/README.md",
-		"../../../pkg/velaql/providers/query/testdata/machinelearning.seldon.io_seldondeployments.yaml",
-		"../../../legacy/charts/vela-core-legacy/crds/standard.oam.dev_podspecworkloads.yaml",
-	}
-	for _, p := range paths {
-		b, err := ioutil.ReadFile(p)
-		r.NoError(err)
-		data = append(data, string(b))
-	}
-	size := len(data)
-
-	// Gzip
-	var (
-		gzipCompressTime int64
-		gzipSize         int
-		gzipBs           []byte
-	)
-	for c := 0; c < count; c++ {
-		var err error
-		rtGzip := &ResourceTracker{}
-		for i := 0; i < size; i++ {
-			rtGzip.AddManagedResource(&corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("cm%d", i)}, Data: map[string]string{"1": data[i]}}, false, false, "")
-			rtGzip.AddManagedResource(&corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("secret%d", i)}}, true, false, "")
-		}
-		rtGzip.Spec.Compression.Type = compression.Gzip
-		// Compress
-		t0 := time.Now()
-		gzipBs, err = json.Marshal(rtGzip)
-		elapsed := time.Since(t0).Nanoseconds()
-		if gzipCompressTime == 0 {
-			gzipCompressTime = elapsed
-		} else {
-			gzipCompressTime = (elapsed + gzipCompressTime) / 2
-		}
-		if gzipSize == 0 {
-			gzipSize = len(gzipBs)
-		} else {
-			gzipSize = (len(gzipBs) + gzipSize) / 2
-		}
-		r.NoError(err)
-		r.Contains(string(gzipBs), `"type":"gzip","data":`)
-	}
-
-	// Zstd
-	var (
-		zstdCompressTime int64
-		zstdSize         int
-		zstdBs           []byte
-	)
-	for c := 0; c < count; c++ {
-		var err error
-		rtZstd := &ResourceTracker{}
-		for i := 0; i < size; i++ {
-			rtZstd.AddManagedResource(&corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("cm%d", i)}, Data: map[string]string{"1": data[i]}}, false, false, "")
-			rtZstd.AddManagedResource(&corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("secret%d", i)}}, true, false, "")
-		}
-		rtZstd.Spec.Compression.Type = compression.Zstd
-		t0 := time.Now()
-		zstdBs, err = json.Marshal(rtZstd)
-		elapsed := time.Since(t0).Nanoseconds()
-		if zstdCompressTime == 0 {
-			zstdCompressTime = elapsed
-		} else {
-			zstdCompressTime = (elapsed + zstdCompressTime) / 2
-		}
-		if zstdSize == 0 {
-			zstdSize = len(zstdBs)
-		} else {
-			zstdSize = (len(zstdBs) + zstdSize) / 2
-		}
-		r.NoError(err)
-		r.Contains(string(zstdBs), `"type":"zstd","data":`)
-	}
-
-	rtUncmp := &ResourceTracker{}
-	r.NoError(json.Unmarshal(gzipBs, rtUncmp))
-	r.Equal(size*2, len(rtUncmp.Spec.ManagedResources))
-	for i, rsc := range rtUncmp.Spec.ManagedResources {
-		r.Equal(i%2 == 1, rsc.Data == nil)
-	}
-	r.NoError(json.Unmarshal(zstdBs, rtUncmp))
-	r.Equal(size*2, len(rtUncmp.Spec.ManagedResources))
-	for i, rsc := range rtUncmp.Spec.ManagedResources {
-		r.Equal(i%2 == 1, rsc.Data == nil)
-	}
-	// No compression
-	var (
-		uncmpTime int64
-		uncmpSize int
-	)
-	rtUncmp.Spec.Compression.Type = compression.Uncompressed
-	for c := 0; c < count; c++ {
-		t0 := time.Now()
-		_bs, err := json.Marshal(rtUncmp)
-		if uncmpTime == 0 {
-			uncmpTime = time.Since(t0).Nanoseconds()
-		} else {
-			uncmpTime = (time.Since(t0).Nanoseconds() + uncmpTime) / 2
-		}
-		if uncmpSize == 0 {
-			uncmpSize = len(_bs)
-		} else {
-			uncmpSize = (len(_bs) + uncmpSize) / 2
-		}
-		r.NoError(err)
-		before, after := len(_bs), len(zstdBs)
-		r.Less(after, before)
-		before, after = len(_bs), len(gzipBs)
-		r.Less(after, before)
-	}
-
-	fmt.Printf(`Compressed Size:
-  uncompressed: %d bytes	100.00%%
-  gzip:         %d bytes	%.2f%%
-  zstd:         %d bytes	%.2f%%
-`,
-		uncmpSize,
-		gzipSize, float64(gzipSize)*100.0/float64(uncmpSize),
-		zstdSize, float64(zstdSize)*100.0/float64(uncmpSize))
-
-	fmt.Printf(`Marshal Time:
-  no compression: %d ns	1.00x
-  gzip:           %d ns	%.2fx
-  zstd:           %d ns	%.2fx
-`,
-		uncmpTime,
-		gzipCompressTime, float64(gzipCompressTime)/float64(uncmpTime),
-		zstdCompressTime, float64(zstdCompressTime)/float64(uncmpTime),
-	)
-}
-
-func TestResourceTrackerInvalidMarshal(t *testing.T) {
-	r := require.New(t)
-	rt := &ResourceTracker{}
-	rt.Spec.Compression.Type = "invalid"
-	_, err := json.Marshal(rt)
-	r.ErrorIs(err, compression.NewUnsupportedCompressionTypeError("invalid"))
-	r.True(strings.Contains(err.Error(), "invalid"))
-	r.ErrorIs(json.Unmarshal([]byte(`{"spec":{"compression":{"type":"invalid"}}}`), rt), compression.NewUnsupportedCompressionTypeError("invalid"))
-	r.NotNil(json.Unmarshal([]byte(`{"spec":{"compression":{"type":"gzip","data":"xxx"}}}`), rt))
-	r.NotNil(json.Unmarshal([]byte(`{"spec":["invalid"]}`), rt))
-}

apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go

@@ -22,12 +22,11 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/kubevela/workflow/api/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	core_oam_devv1alpha1 "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -223,7 +222,7 @@ func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 	}
 	if in.Policies != nil {
 		in, out := &in.Policies, &out.Policies
-		*out = make(map[string]core_oam_devv1alpha1.Policy, len(*in))
+		*out = make(map[string]v1alpha1.Policy, len(*in))
 		for key, val := range *in {
 			(*out)[key] = *val.DeepCopy()
 		}
@@ -651,21 +650,6 @@ func (in *ResourceTracker) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourceTrackerCompression) DeepCopyInto(out *ResourceTrackerCompression) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerCompression.
-func (in *ResourceTrackerCompression) DeepCopy() *ResourceTrackerCompression {
-	if in == nil {
-		return nil
-	}
-	out := new(ResourceTrackerCompression)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTrackerList) DeepCopyInto(out *ResourceTrackerList) {
 	*out = *in
@@ -708,7 +692,6 @@ func (in *ResourceTrackerSpec) DeepCopyInto(out *ResourceTrackerSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	out.Compression = in.Compression
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerSpec.
@@ -946,12 +929,12 @@ func (in *Workflow) DeepCopyInto(out *Workflow) {
 	*out = *in
 	if in.Mode != nil {
 		in, out := &in.Mode, &out.Mode
-		*out = new(v1alpha1.WorkflowExecuteMode)
+		*out = new(WorkflowExecuteMode)
 		**out = **in
 	}
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
-		*out = make([]v1alpha1.WorkflowStep, len(*in))
+		*out = make([]WorkflowStep, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -968,6 +951,68 @@ func (in *Workflow) DeepCopy() *Workflow {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowExecuteMode) DeepCopyInto(out *WorkflowExecuteMode) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowExecuteMode.
+func (in *WorkflowExecuteMode) DeepCopy() *WorkflowExecuteMode {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowExecuteMode)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
+	*out = *in
+	if in.Meta != nil {
+		in, out := &in.Meta, &out.Meta
+		*out = new(common.WorkflowStepMeta)
+		**out = **in
+	}
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.SubSteps != nil {
+		in, out := &in.SubSteps, &out.SubSteps
+		*out = make([]common.WorkflowSubStep, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.DependsOn != nil {
+		in, out := &in.DependsOn, &out.DependsOn
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(common.StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(common.StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStep.
+func (in *WorkflowStep) DeepCopy() *WorkflowStep {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStep)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkflowStepDefinition) DeepCopyInto(out *WorkflowStepDefinition) {
 	*out = *in

apis/types/types.go

@@ -106,7 +106,6 @@ type Config map[string]string
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
-	Labels    string `json:"labels"`
 	Current   string `json:"current"`
 }
 

charts/vela-core/README.md

@@ -81,22 +81,19 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 
 ### KubeVela controller optimization parameters
 
-| Name                                              | Description                                                                                                                                                                          | Value   |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
-| `optimize.cachedGvks`                             | Optimize types of resources to be cached.                                                                                                                                            | `""`    |
-| `optimize.resourceTrackerListOp`                  | Optimize ResourceTracker List Op by adding index.                                                                                                                                    | `true`  |
-| `optimize.controllerReconcileLoopReduction`       | Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.                                                                                   | `false` |
-| `optimize.markWithProb`                           | Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately.                                    | `0.1`   |
-| `optimize.disableComponentRevision`               | Optimize componentRevision by disabling the creation and gc                                                                                                                          | `false` |
-| `optimize.disableApplicationRevision`             | Optimize ApplicationRevision by disabling the creation and gc.                                                                                                                       | `false` |
-| `optimize.disableWorkflowRecorder`                | Optimize workflow recorder by disabling the creation and gc.                                                                                                                         | `false` |
-| `optimize.enableInMemoryWorkflowContext`          | Optimize workflow by use in-memory context.                                                                                                                                          | `false` |
-| `optimize.disableResourceApplyDoubleCheck`        | Optimize workflow by ignoring resource double check after apply.                                                                                                                     | `false` |
-| `optimize.enableResourceTrackerDeleteOnlyTrigger` | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                                                                  | `true`  |
-| `featureGates.enableLegacyComponentRevision`      | if disabled, only component with rollout trait will create component revisions                                                                                                       | `false` |
-| `featureGates.gzipResourceTracker`                | if enabled, resourceTracker will be compressed using gzip before being stored                                                                                                        | `false` |
-| `featureGates.zstdResourceTracker`                | if enabled, resourceTracker will be compressed using zstd before being stored. It is much faster and more efficient than gzip. If both gzip and zstd are enabled, zstd will be used. | `false` |
-| `featureGates.applyOnce`                          | if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker                                                | `false` |
+| Name                                              | Description                                                                                                                                       | Value   |
+| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `optimize.cachedGvks`                             | Optimize types of resources to be cached.                                                                                                         | `""`    |
+| `optimize.resourceTrackerListOp`                  | Optimize ResourceTracker List Op by adding index.                                                                                                 | `true`  |
+| `optimize.controllerReconcileLoopReduction`       | Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.                                                | `false` |
+| `optimize.markWithProb`                           | Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately. | `0.1`   |
+| `optimize.disableComponentRevision`               | Optimize componentRevision by disabling the creation and gc                                                                                       | `false` |
+| `optimize.disableApplicationRevision`             | Optimize ApplicationRevision by disabling the creation and gc.                                                                                    | `false` |
+| `optimize.disableWorkflowRecorder`                | Optimize workflow recorder by disabling the creation and gc.                                                                                      | `false` |
+| `optimize.enableInMemoryWorkflowContext`          | Optimize workflow by use in-memory context.                                                                                                       | `false` |
+| `optimize.disableResourceApplyDoubleCheck`        | Optimize workflow by ignoring resource double check after apply.                                                                                  | `false` |
+| `optimize.enableResourceTrackerDeleteOnlyTrigger` | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                               | `true`  |
+| `featureGates.enableLegacyComponentRevision`      | if disabled, only component with rollout trait will create component revisions                                                                    | `false` |
 
 
 ### MultiCluster parameters

charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml

@@ -461,6 +461,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -621,10 +623,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -842,22 +843,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -893,9 +888,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -2223,16 +2217,14 @@ spec:
                                 step.
                               properties:
                                 dependsOn:
-                                  description: DependsOn is the dependency of the
-                                    step
                                   items:
                                     type: string
                                   type: array
                                 if:
-                                  description: If is the if condition of the step
                                   type: string
                                 inputs:
-                                  description: Inputs is the inputs of the step
+                                  description: StepInputs defines variable input of
+                                    WorkflowStep
                                   items:
                                     properties:
                                       from:
@@ -2245,8 +2237,8 @@ spec:
                                     type: object
                                   type: array
                                 meta:
-                                  description: Meta is the meta data of the workflow
-                                    step.
+                                  description: WorkflowStepMeta contains the meta
+                                    data of a workflow step
                                   properties:
                                     alias:
                                       type: string
@@ -2256,7 +2248,8 @@ spec:
                                     step.
                                   type: string
                                 outputs:
-                                  description: Outputs is the outputs of the step
+                                  description: StepOutputs defines output variable
+                                    of WorkflowStep
                                   items:
                                     properties:
                                       name:
@@ -2269,27 +2262,22 @@ spec:
                                     type: object
                                   type: array
                                 properties:
-                                  description: Properties is the properties of the
-                                    step
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
                                 subSteps:
                                   items:
-                                    description: WorkflowStepBase defines the workflow
-                                      step base
+                                    description: WorkflowSubStep defines how to execute
+                                      a workflow subStep.
                                     properties:
                                       dependsOn:
-                                        description: DependsOn is the dependency of
-                                          the step
                                         items:
                                           type: string
                                         type: array
                                       if:
-                                        description: If is the if condition of the
-                                          step
                                         type: string
                                       inputs:
-                                        description: Inputs is the inputs of the step
+                                        description: StepInputs defines variable input
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             from:
@@ -2302,8 +2290,8 @@ spec:
                                           type: object
                                         type: array
                                       meta:
-                                        description: Meta is the meta data of the
-                                          workflow step.
+                                        description: WorkflowStepMeta contains the
+                                          meta data of a workflow step
                                         properties:
                                           alias:
                                             type: string
@@ -2313,8 +2301,8 @@ spec:
                                           workflow step.
                                         type: string
                                       outputs:
-                                        description: Outputs is the outputs of the
-                                          step
+                                        description: StepOutputs defines output variable
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             name:
@@ -2327,17 +2315,11 @@ spec:
                                           type: object
                                         type: array
                                       properties:
-                                        description: Properties is the properties
-                                          of the step
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
                                       timeout:
-                                        description: Timeout is the timeout of the
-                                          step
                                         type: string
                                       type:
-                                        description: Type is the type of the workflow
-                                          step.
                                         type: string
                                     required:
                                     - name
@@ -2345,10 +2327,8 @@ spec:
                                     type: object
                                   type: array
                                 timeout:
-                                  description: Timeout is the timeout of the step
                                   type: string
                                 type:
-                                  description: Type is the type of the workflow step.
                                   type: string
                               required:
                               - name
@@ -2375,6 +2355,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -2535,10 +2517,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -2756,22 +2737,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -2807,9 +2782,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -3676,7 +3650,7 @@ spec:
                         appliesToWorkloads:
                           description: AppliesToWorkloads specifies the list of workload
                             kinds this trait applies to. Workload kinds are specified
-                            in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                            in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
                             Traits that omit this field apply to all workload kinds.
                           items:
                             type: string
@@ -4010,15 +3984,13 @@ spec:
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -4031,7 +4003,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -4040,7 +4013,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -4053,24 +4026,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -4083,8 +4054,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -4094,7 +4065,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -4107,14 +4079,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -4122,10 +4091,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -4794,22 +4761,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -4843,8 +4804,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

charts/vela-core/crds/core.oam.dev_applications.yaml

@@ -414,6 +414,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of
@@ -564,10 +565,9 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy Deprecated
-                  This field is only used by EnvBinding Policy which is deprecated.
+                description: PolicyStatus records the status of policy
                 items:
-                  description: PolicyStatus records the status of policy Deprecated
+                  description: PolicyStatus records the status of policy
                   properties:
                     name:
                       type: string
@@ -766,22 +766,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -815,8 +809,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this
@@ -1034,15 +1028,13 @@ spec:
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -1055,7 +1047,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -1064,7 +1057,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -1077,24 +1070,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -1107,8 +1098,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -1118,7 +1109,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -1131,14 +1123,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -1146,10 +1135,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -1176,6 +1163,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of
@@ -1326,10 +1314,9 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy Deprecated
-                  This field is only used by EnvBinding Policy which is deprecated.
+                description: PolicyStatus records the status of policy
                 items:
-                  description: PolicyStatus records the status of policy Deprecated
+                  description: PolicyStatus records the status of policy
                   properties:
                     name:
                       type: string
@@ -1528,22 +1515,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -1577,8 +1558,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml

@@ -708,7 +708,7 @@ spec:
                       appliesToWorkloads:
                         description: AppliesToWorkloads specifies the list of workload
                           kinds this trait applies to. Workload kinds are specified
-                          in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                          in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
                           Traits that omit this field apply to all workload kinds.
                         items:
                           type: string

charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml

@@ -56,16 +56,6 @@ spec:
               applicationGeneration:
                 format: int64
                 type: integer
-              compression:
-                description: ResourceTrackerCompression the compression for ResourceTracker
-                  ManagedResources
-                properties:
-                  data:
-                    type: string
-                  type:
-                    description: Type the compression type
-                    type: string
-                type: object
               managedResources:
                 items:
                   description: ManagedResource define the resource to be managed by
@@ -79,6 +69,7 @@ spec:
                     component:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     deleted:
                       description: Deleted marks the resource to be deleted
@@ -114,9 +105,6 @@ spec:
                       description: 'Specific resourceVersion to which this reference
                         is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
                       type: string
-                    skipGC:
-                      description: SkipGC marks the resource to skip gc
-                      type: boolean
                     trait:
                       type: string
                     uid:
@@ -146,6 +134,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of

charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml

@@ -356,7 +356,7 @@ spec:
             properties:
               appliesToWorkloads:
                 description: AppliesToWorkloads specifies the list of workload kinds
-                  this trait applies to. Workload kinds are specified in resource.group/version
+                  this trait applies to. Workload kinds are specified in kind.group/version
                   format, e.g. server.core.oam.dev/v1alpha2. Traits that omit this
                   field apply to all workload kinds.
                 items:

charts/vela-core/crds/core.oam.dev_workflows.yaml

@@ -20,7 +20,7 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Workflow is the Schema for the workflow API
+        description: Workflow is the Schema for the policy API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -39,15 +39,13 @@ spec:
               description: WorkflowStep defines how to execute a workflow step.
               properties:
                 dependsOn:
-                  description: DependsOn is the dependency of the step
                   items:
                     type: string
                   type: array
                 if:
-                  description: If is the if condition of the step
                   type: string
                 inputs:
-                  description: Inputs is the inputs of the step
+                  description: StepInputs defines variable input of WorkflowStep
                   items:
                     properties:
                       from:
@@ -60,7 +58,8 @@ spec:
                     type: object
                   type: array
                 meta:
-                  description: Meta is the meta data of the workflow step.
+                  description: WorkflowStepMeta contains the meta data of a workflow
+                    step
                   properties:
                     alias:
                       type: string
@@ -69,7 +68,7 @@ spec:
                   description: Name is the unique name of the workflow step.
                   type: string
                 outputs:
-                  description: Outputs is the outputs of the step
+                  description: StepOutputs defines output variable of WorkflowStep
                   items:
                     properties:
                       name:
@@ -82,23 +81,21 @@ spec:
                     type: object
                   type: array
                 properties:
-                  description: Properties is the properties of the step
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
                 subSteps:
                   items:
-                    description: WorkflowStepBase defines the workflow step base
+                    description: WorkflowSubStep defines how to execute a workflow
+                      subStep.
                     properties:
                       dependsOn:
-                        description: DependsOn is the dependency of the step
                         items:
                           type: string
                         type: array
                       if:
-                        description: If is the if condition of the step
                         type: string
                       inputs:
-                        description: Inputs is the inputs of the step
+                        description: StepInputs defines variable input of WorkflowStep
                         items:
                           properties:
                             from:
@@ -111,7 +108,8 @@ spec:
                           type: object
                         type: array
                       meta:
-                        description: Meta is the meta data of the workflow step.
+                        description: WorkflowStepMeta contains the meta data of a
+                          workflow step
                         properties:
                           alias:
                             type: string
@@ -120,7 +118,7 @@ spec:
                         description: Name is the unique name of the workflow step.
                         type: string
                       outputs:
-                        description: Outputs is the outputs of the step
+                        description: StepOutputs defines output variable of WorkflowStep
                         items:
                           properties:
                             name:
@@ -133,14 +131,11 @@ spec:
                           type: object
                         type: array
                       properties:
-                        description: Properties is the properties of the step
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
-                        description: Timeout is the timeout of the step
                         type: string
                       type:
-                        description: Type is the type of the workflow step.
                         type: string
                     required:
                     - name
@@ -148,10 +143,8 @@ spec:
                     type: object
                   type: array
                 timeout:
-                  description: Timeout is the timeout of the step
                   type: string
                 type:
-                  description: Type is the type of the workflow step.
                   type: string
               required:
               - name
@@ -183,15 +176,13 @@ spec:
               description: WorkflowStep defines how to execute a workflow step.
               properties:
                 dependsOn:
-                  description: DependsOn is the dependency of the step
                   items:
                     type: string
                   type: array
                 if:
-                  description: If is the if condition of the step
                   type: string
                 inputs:
-                  description: Inputs is the inputs of the step
+                  description: StepInputs defines variable input of WorkflowStep
                   items:
                     properties:
                       from:
@@ -204,7 +195,8 @@ spec:
                     type: object
                   type: array
                 meta:
-                  description: Meta is the meta data of the workflow step.
+                  description: WorkflowStepMeta contains the meta data of a workflow
+                    step
                   properties:
                     alias:
                       type: string
@@ -213,7 +205,7 @@ spec:
                   description: Name is the unique name of the workflow step.
                   type: string
                 outputs:
-                  description: Outputs is the outputs of the step
+                  description: StepOutputs defines output variable of WorkflowStep
                   items:
                     properties:
                       name:
@@ -226,23 +218,21 @@ spec:
                     type: object
                   type: array
                 properties:
-                  description: Properties is the properties of the step
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
                 subSteps:
                   items:
-                    description: WorkflowStepBase defines the workflow step base
+                    description: WorkflowSubStep defines how to execute a workflow
+                      subStep.
                     properties:
                       dependsOn:
-                        description: DependsOn is the dependency of the step
                         items:
                           type: string
                         type: array
                       if:
-                        description: If is the if condition of the step
                         type: string
                       inputs:
-                        description: Inputs is the inputs of the step
+                        description: StepInputs defines variable input of WorkflowStep
                         items:
                           properties:
                             from:
@@ -255,7 +245,8 @@ spec:
                           type: object
                         type: array
                       meta:
-                        description: Meta is the meta data of the workflow step.
+                        description: WorkflowStepMeta contains the meta data of a
+                          workflow step
                         properties:
                           alias:
                             type: string
@@ -264,7 +255,7 @@ spec:
                         description: Name is the unique name of the workflow step.
                         type: string
                       outputs:
-                        description: Outputs is the outputs of the step
+                        description: StepOutputs defines output variable of WorkflowStep
                         items:
                           properties:
                             name:
@@ -277,14 +268,11 @@ spec:
                           type: object
                         type: array
                       properties:
-                        description: Properties is the properties of the step
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
-                        description: Timeout is the timeout of the step
                         type: string
                       type:
-                        description: Type is the type of the workflow step.
                         type: string
                     required:
                     - name
@@ -292,10 +280,8 @@ spec:
                     type: object
                   type: array
                 timeout:
-                  description: Timeout is the timeout of the step
                   type: string
                 type:
-                  description: Type is the type of the workflow step.
                   type: string
               required:
               - name

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

@@ -11,10 +11,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -4,7 +4,9 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add annotations on your workload. if it generates pod, add same annotations for generated pods.
+    definition.oam.dev/description: Add annotations on K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-core/templates/defwithtemplate/collect-service-endpoints.yaml

@@ -1,81 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/collect-service-endpoints.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Collect service endpoints for the application.
-  name: collect-service-endpoints
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"vela/ql"
-        )
-
-        collect: ql.#CollectServiceEndpoints & {
-        	app: {
-        		name:      *context.name | string
-        		namespace: *context.namespace | string
-        		if parameter.name != _|_ {
-        			name: parameter.name
-        		}
-        		if parameter.namespace != _|_ {
-        			namespace: parameter.namespace
-        		}
-        		filter: {
-        			if parameter.components != _|_ {
-        				components: parameter.components
-        			}
-        		}
-        	}
-        } @step(1)
-        outputs: {
-        	eps: *[] | [...]
-        	if parameter.port == _|_ {
-        		eps: collect.list
-        	}
-        	if parameter.port != _|_ {
-        		eps: [ for ep in collect.list if parameter.port == ep.endpoint.port {ep}]
-        	}
-        	endpoints: *[] | [...]
-        	if parameter.outer != _|_ {
-        		tmps: [ for ep in eps {
-        			ep
-        			if ep.endpoint.inner == _|_ {
-        				outer: true
-        			}
-        			if ep.endpoint.inner != _|_ {
-        				outer: !ep.endpoint.inner
-        			}
-        		}]
-        		endpoints: [ for ep in tmps if (!parameter.outer || ep.outer) {ep}]
-        	}
-        	if parameter.outer == _|_ {
-        		endpoints: eps
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: len(outputs.endpoints) > 0
-        } @step(2)
-        value: {
-        	if len(outputs.endpoints) > 0 {
-        		outputs.endpoints[0]
-        	}
-        }
-        parameter: {
-        	// +usage=Specify the name of the application
-        	name?: string
-        	// +usage=Specify the namespace of the application
-        	namespace?: string
-        	// +usage=Filter the component of the endpoints
-        	components?: [...string]
-        	// +usage=Filter the port of the endpoints
-        	port?: int
-        	// +usage=Filter the endpoint that are only outer
-        	outer?: bool
-        }
-

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add command on K8s pod for your workload which follows the pod spec in path 'spec.template'
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: command
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   schematic:
     cue:
       template: |

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Set the image of the container.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: container-image
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -5,12 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Automatically scale the component based on CPU usage.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
   schematic:
     cue:
       template: |

charts/vela-core/templates/defwithtemplate/cron-task.yaml

@@ -222,8 +222,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -17,7 +17,7 @@ spec:
 
         mountsArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -26,7 +26,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -35,7 +35,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -44,7 +44,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -53,7 +53,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				mountPath: v.mountPath
         				if v.mountPropagation != _|_ {
@@ -69,7 +69,7 @@ spec:
         }
         volumesArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				name: v.name
         				persistentVolumeClaim: claimName: v.claimName
@@ -78,7 +78,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				name: v.name
         				configMap: {
@@ -93,7 +93,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				name: v.name
         				secret: {
@@ -108,7 +108,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				name: v.name
         				emptyDir: medium: v.medium
@@ -117,7 +117,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				name: v.name
         				hostPath: path: v.path
@@ -275,7 +275,7 @@ spec:
         	}
         }
         exposePorts: [
-        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
+        	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
@@ -428,8 +428,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -21,9 +21,9 @@ spec:
         app: op.#Steps & {
         	load: op.#Load @step(1)
         	clusters: [...string]
-        	listClusters: op.#ListClusters @step(2)
         	if parameter.clusters == _|_ {
-        		clusters: listClusters.outputs.clusters
+        		listClusters: op.#ListClusters @step(2)
+        		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
         		clusters: parameter.clusters

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add env on K8s pod for your workload which follows the pod spec in path 'spec.template'
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: env
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   schematic:
     cue:
       template: |

charts/vela-core/templates/defwithtemplate/export-data.yaml

@@ -1,64 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/export-data.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Export data to clusters specified by topology.
-  name: export-data
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        object: {
-        	apiVersion: "v1"
-        	kind:       parameter.kind
-        	metadata: {
-        		name:      *context.name | string
-        		namespace: *context.namespace | string
-        		if parameter.name != _|_ {
-        			name: parameter.name
-        		}
-        		if parameter.namespace != _|_ {
-        			namespace: parameter.namespace
-        		}
-        	}
-        	if parameter.kind == "ConfigMap" {
-        		data: parameter.data
-        	}
-        	if parameter.kind == "Secret" {
-        		stringData: parameter.data
-        	}
-        } @step(1)
-        getPlacements: op.#GetPlacementsFromTopologyPolicies & {
-        	policies: *[] | [...string]
-        	if parameter.topology != _|_ {
-        		policies: [parameter.topology]
-        	}
-        }      @step(2)
-        apply: op.#Steps & {
-        	for p in getPlacements.placements {
-        		"\(p.cluster)": op.#Apply & {
-        			value:   object
-        			cluster: p.cluster
-        		}
-        	}
-        } @step(3)
-        parameter: {
-        	// +usage=Specify the name of the export destination
-        	name?: string
-        	// +usage=Specify the namespace of the export destination
-        	namespace?: string
-        	// +usage=Specify the kind of the export destination
-        	kind: *"ConfigMap" | "Secret"
-        	// +usage=Specify the data to export
-        	data: {}
-        	// +usage=Specify the topology to export
-        	topology?: string
-        }
-

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

@@ -5,12 +5,11 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Expose port to enable web traffic for your component.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: expose
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
   podDisruptive: false
   schematic:
     cue:

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

@@ -9,8 +9,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
+    - '*'
   podDisruptive: false
   schematic:
     cue:
@@ -86,7 +85,7 @@ spec:
         	// +usage=Set ingress class in '.spec.ingressClassName' instead of 'kubernetes.io/ingress.class' annotation.
         	classInSpec: *false | bool
 
-        	// +usage=Specify the secret name you want to quote to use tls.
+        	// +usage=Specify the secret name you want to quote.
         	secretName?: string
 
         	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
@@ -94,11 +93,11 @@ spec:
         }
   status:
     customStatus: |-
-      if context.outputs.ingress.status.loadBalancer.ingress == _|_ {
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
         message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
-      if context.outputs.ingress.status.loadBalancer.ingress != _|_ {
-      	let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if len(igs) > 0 {
         if igs[0].ip != _|_ {
         	if igs[0].host != _|_ {
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add host aliases on K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: false
   schematic:
     cue:

charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -0,0 +1,41 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/import-grafana-dashboard.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Import dashboards to Grafana
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: import-grafana-dashboard
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "ImportDashboard"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		urls: parameter.urls
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: *"default" | string
+        	urls: [...string]
+
+        }
+  workloadRefPath: ""
+

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
   podDisruptive: true
   schematic:
     cue:

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

@@ -4,7 +4,9 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add labels on your workload. if it generates pod, add same label for generated pods.
+    definition.oam.dev/description: Add labels on K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: labels
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add lifecycle hooks for every container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: lifecycle
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -11,10 +11,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -23,14 +23,14 @@ spec:
         		url: {
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [Lark messaging](https://open.feishu.cn/document/ukTMukTMukTM/ucTM5YjL3ETO24yNxkjN#8b0f2a1b).
         		message: {
         			// +usage=msg_type can be text, post, image, interactive, share_chat, share_user, audio, media, file, sticker
@@ -45,56 +45,56 @@ spec:
         		url: {
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [dingtalk messaging](https://developers.dingtalk.com/document/robots/custom-robot-access/title-72m-8ag-pqw)
         		message: {
         			// +usage=Specify the message content of dingtalk notification
-        			text?: *null | close({
+        			text?: *null | {
         				content: string
-        			})
+        			}
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
         			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
-        			link?:   *null | close({
+        			link?:   *null | {
         				text?:       string
         				title?:      string
         				messageUrl?: string
         				picUrl?:     string
-        			})
-        			markdown?: *null | close({
+        			}
+        			markdown?: *null | {
         				text:  string
         				title: string
-        			})
-        			at?: *null | close({
+        			}
+        			at?: *null | {
         				atMobiles?: *null | [...string]
         				isAtAll?:   bool
-        			})
-        			actionCard?: *null | close({
+        			}
+        			actionCard?: *null | {
         				text:           string
         				title:          string
         				hideAvatar:     string
         				btnOrientation: string
         				singleTitle:    string
         				singleURL:      string
-        				btns:           *null | close([...*null | close({
+        				btns:           *null | [...*null | {
         					title:     string
         					actionURL: string
-        				})])
-        			})
-        			feedCard?: *null | close({
-        				links: *null | close([...*null | close({
+        				}]
+        			}
+        			feedCard?: *null | {
+        				links: *null | [...*null | {
         					text?:       string
         					title?:      string
         					messageUrl?: string
         					picUrl?:     string
-        				})])
-        			})
+        				}]
+        			}
         		}
         	}
         	// +usage=Please fulfill its url and message if you want to send Slack messages
@@ -103,23 +103,23 @@ spec:
         		url: {
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [slack messaging](https://api.slack.com/reference/messaging/payload)
         		message: {
         			// +usage=Specify the message text for slack notification
         			text:         string
-        			blocks?:      *null | close([...block])
-        			attachments?: *null | close({
-        				blocks?: *null | close([...block])
+        			blocks?:      *null | [...block]
+        			attachments?: *null | {
+        				blocks?: *null | [...block]
         				color?:  string
-        			})
+        			}
         			thread_ts?: string
         			// +usage=Specify the message text format in markdown for slack notification
         			mrkdwn?: *true | bool
@@ -137,14 +137,14 @@ spec:
         			password: {
         				// +usage=the password content in string
         				value: string
-        			} | close({
+        			} | {
         				secretRef: {
         					// +usage=name is the name of the secret
         					name: string
         					// +usage=key is the key in the secret
         					key: string
         				}
-        			})
+        			}
         			// +usage=Specify the host of your email
         			host: string
         			// +usage=Specify the port of the email host, default to 587
@@ -201,20 +201,10 @@ spec:
         	verbatim?: bool
         }
         option: {
-        	text: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	value: string
-        	description?: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	url?: string
+        	text:         textType
+        	value:        string
+        	description?: textType
+        	url?:         string
         }
         // send webhook notification
         ding: op.#Steps & {

charts/vela-core/templates/defwithtemplate/pure-ingress.yaml

@@ -6,13 +6,11 @@ metadata:
   annotations:
     definition.oam.dev/description: Enable public web traffic for the component without creating a Service.
   labels:
-    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: pure-ingress
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
-  appliesToWorkloads:
-    - '*'
+  appliesToWorkloads: []
   conflictsWith: []
   podDisruptive: false
   schematic:

charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml

@@ -0,0 +1,50 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/register-grafana-datasource.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Add a datasource to Grafana
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: register-grafana-datasource
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "DatasourceRegistration"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		datasource: {
+        			name:      parameter.name
+        			type:      parameter.type
+        			access:    parameter.access
+        			service:   parameter.service
+        			namespace: parameter.namespace
+        		}
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: string
+        	name:                      string
+        	type:                      string
+        	access:                    *"proxy" | string
+        	service:                   string
+        	namespace:                 *"default" | string
+        }
+  workloadRefPath: ""
+

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

@@ -1,20 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/replication.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Describe the configuration to replicate components when deploying resources, it only works with specified `deploy` step in workflow.
-  name: replication
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        parameter: {
-        	// +usage=Spicify the keys of replication. Every key coresponds to a replication components
-        	keys: [...string]
-        	// +usage=Specify the components which will be replicated.
-        	selector?: [...string]
-        }
-

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add resource requests and limits on K8s pod for your workload which follows the pod spec in path 'spec.template.'
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -9,8 +9,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
+    - '*'
   podDisruptive: false
   schematic:
     cue:

charts/vela-core/templates/defwithtemplate/service-account.yaml

@@ -9,10 +9,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: false
   schematic:
     cue:
@@ -41,8 +38,8 @@ spec:
         }
         // +patchStrategy=retainKeys
         patch: spec: template: spec: serviceAccountName: parameter.name
-        _clusterPrivileges: [ if parameter.privileges != _|_ for p in parameter.privileges if p.scope == "cluster" {p}]
-        _namespacePrivileges: [ if parameter.privileges != _|_ for p in parameter.privileges if p.scope == "namespace" {p}]
+        _clusterPrivileges: [ for p in parameter.privileges if p.scope == "cluster" {p}]
+        _namespacePrivileges: [ for p in parameter.privileges if p.scope == "namespace" {p}]
         outputs: {
         	if parameter.create {
         		"service-account": {

charts/vela-core/templates/defwithtemplate/service-binding.yaml

@@ -11,10 +11,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   schematic:
     cue:
       template: |

charts/vela-core/templates/defwithtemplate/shared-resource.yaml

@@ -1,38 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/shared-resource.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the resources to be sharable across applications.
-  name: shared-resource
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #SharedResourcePolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector: [...#ResourcePolicyRuleSelector]
-        }
-        #ResourcePolicyRuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=Specify the list of rules to control shared-resource strategy at resource level.
-        	// The selected resource will be sharable across applications. (That means multiple applications
-        	// can all read it without conflict, but only the first one can write it)
-        	rules?: [...#SharedResourcePolicyRule]
-        }
-

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Inject a sidecar container to K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: sidecar
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -10,15 +10,12 @@ metadata:
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
   podDisruptive: true
   schematic:
     cue:
       template: |
         pvcVolumesList: *[
-        		if parameter.pvc != _|_ for v in parameter.pvc {
+        		for v in parameter.pvc {
         		{
         			name: "pvc-" + v.name
         			persistentVolumeClaim: claimName: v.name
@@ -26,7 +23,7 @@ spec:
         	},
         ] | []
         configMapVolumesList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        			for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name: "configmap-" + v.name
         			configMap: {
@@ -40,7 +37,7 @@ spec:
         	},
         ] | []
         secretVolumesList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        			for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name: "secret-" + v.name
         			secret: {
@@ -54,7 +51,7 @@ spec:
         	},
         ] | []
         emptyDirVolumesList: *[
-        			if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        			for v in parameter.emptyDir {
         		{
         			name: "emptydir-" + v.name
         			emptyDir: medium: v.medium
@@ -62,7 +59,7 @@ spec:
         	},
         ] | []
         pvcVolumeMountsList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc {
+        			for v in parameter.pvc {
         		if v.volumeMode == "Filesystem" {
         			{
         				name:      "pvc-" + v.name
@@ -75,7 +72,7 @@ spec:
         	},
         ] | []
         configMapVolumeMountsList: *[
-        				if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        				for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name:      "configmap-" + v.name
         			mountPath: v.mountPath
@@ -86,7 +83,7 @@ spec:
         	},
         ] | []
         configMapEnvMountsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
+        			for v in parameter.configMap if v.mountToEnv != _|_ {
         		{
         			name: v.mountToEnv.envName
         			valueFrom: configMapKeyRef: {
@@ -97,7 +94,7 @@ spec:
         	},
         ] | []
         configMountToEnvsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        			for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
         		{
         			name: k.envName
         			valueFrom: configMapKeyRef: {
@@ -108,7 +105,7 @@ spec:
         	},
         ] | []
         secretVolumeMountsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        			for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name:      "secret-" + v.name
         			mountPath: v.mountPath
@@ -119,7 +116,7 @@ spec:
         	},
         ] | []
         secretEnvMountsList: *[
-        			if parameter.secret != _|_ if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
+        			for v in parameter.secret if v.mountToEnv != _|_ {
         		{
         			name: v.mountToEnv.envName
         			valueFrom: secretKeyRef: {
@@ -130,7 +127,7 @@ spec:
         	},
         ] | []
         secretMountToEnvsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        			for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
         		{
         			name: k.envName
         			valueFrom: secretKeyRef: {
@@ -141,7 +138,7 @@ spec:
         	},
         ] | []
         emptyDirVolumeMountsList: *[
-        				if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        				for v in parameter.emptyDir {
         		{
         			name:      "emptydir-" + v.name
         			mountPath: v.mountPath
@@ -152,7 +149,7 @@ spec:
         	},
         ] | []
         volumeDevicesList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc if v.volumeMode == "Block" {
+        			for v in parameter.pvc if v.volumeMode == "Block" {
         		{
         			name:       "pvc-" + v.name
         			devicePath: v.mountPath
@@ -190,7 +187,7 @@ spec:
 
         }
         outputs: {
-        	if parameter.pvc != _|_ for v in parameter.pvc {
+        	for v in parameter.pvc {
         		if v.mountOnly == false {
         			"pvc-\(v.name)": {
         				apiVersion: "v1"
@@ -229,7 +226,7 @@ spec:
         		}
         	}
 
-        	if parameter.configMap != _|_ for v in parameter.configMap {
+        	for v in parameter.configMap {
         		if v.mountOnly == false {
         			"configmap-\(v.name)": {
         				apiVersion: "v1"
@@ -242,7 +239,7 @@ spec:
         		}
         	}
 
-        	if parameter.secret != _|_ for v in parameter.secret {
+        	for v in parameter.secret {
         		if v.mountOnly == false {
         			"secret-\(v.name)": {
         				apiVersion: "v1"

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

@@ -63,7 +63,7 @@ spec:
         					}
 
         					if parameter["volumes"] != _|_ {
-        						volumeMounts: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        						volumeMounts: [ for v in parameter.volumes {
         							{
         								mountPath: v.mountPath
         								name:      v.name
@@ -72,7 +72,7 @@ spec:
         				}]
 
         				if parameter["volumes"] != _|_ {
-        					volumes: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        					volumes: [ for v in parameter.volumes {
         						{
         							name: v.name
         							if v.type == "pvc" {
@@ -103,7 +103,7 @@ spec:
         				}
 
         				if parameter["imagePullSecrets"] != _|_ {
-        					imagePullSecrets: [ if parameter.imagePullSecrets != _|_ for v in parameter.imagePullSecrets {
+        					imagePullSecrets: [ for v in parameter.imagePullSecrets {
         						name: v
         					},
         					]
@@ -175,8 +175,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -13,7 +13,7 @@ spec:
       template: |
         parameter: {
         	// +usage=Specify the names of the clusters to select.
-        	clusters?: [...string]
+        	cluster?: [...string]
         	// +usage=Specify the label selector for clusters
         	clusterLabelSelector?: [string]: string
         	// +usage=Deprecated: Use clusterLabelSelector instead.

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

@@ -54,8 +54,8 @@ spec:
         	// +usage=Declare volumes and volumeMounts
         	volumes?: [...{
         		name: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

charts/vela-core/templates/defwithtemplate/webhook-notification.yaml

@@ -133,20 +133,10 @@ spec:
         	verbatim?: bool
         }
         option: {
-        	text: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	value: string
-        	description?: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	url?: string
+        	text:         textType
+        	value:        string
+        	description?: textType
+        	url?:         string
         }
         secretRef: {
         	name: string

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

@@ -72,14 +72,14 @@ spec:
         	// +usage=Specify the webhook url
         	url: {
         		value: string
-        	} | close({
+        	} | {
         		secretRef: {
         			// +usage=name is the name of the secret
         			name: string
         			// +usage=key is the key in the secret
         			key: string
         		}
-        	})
+        	}
         	// +usage=Specify the data you want to send
         	data?: {...}
         }

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

@@ -17,7 +17,7 @@ spec:
 
         mountsArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				mountPath: v.mountPath
         				if v.subPath != _|_ {
@@ -29,7 +29,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				mountPath: v.mountPath
         				if v.subPath != _|_ {
@@ -41,7 +41,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				mountPath: v.mountPath
         				if v.subPath != _|_ {
@@ -53,7 +53,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				mountPath: v.mountPath
         				if v.subPath != _|_ {
@@ -65,7 +65,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				mountPath: v.mountPath
         				if v.subPath != _|_ {
@@ -78,7 +78,7 @@ spec:
         }
         volumesArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				name: v.name
         				persistentVolumeClaim: claimName: v.claimName
@@ -87,7 +87,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				name: v.name
         				configMap: {
@@ -102,7 +102,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				name: v.name
         				secret: {
@@ -117,7 +117,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				name: v.name
         				emptyDir: medium: v.medium
@@ -126,7 +126,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				name: v.name
         				hostPath: path: v.path
@@ -139,11 +139,11 @@ spec:
         	for val in [
         		for i, vi in volumesList {
         			for j, vj in volumesList if j < i && vi.name == vj.name {
-        				ignore: true
+        				_ignore: true
         			}
         			vi
         		},
-        	] if val.ignore == _|_ {
+        	] if val._ignore == _|_ {
         		val
         	},
         ]
@@ -297,7 +297,7 @@ spec:
         	}
         }
         exposePorts: [
-        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
+        	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
@@ -453,8 +453,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -15,7 +15,7 @@ spec:
       template: |
         mountsArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -24,7 +24,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -33,7 +33,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -42,7 +42,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -51,7 +51,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -61,7 +61,7 @@ spec:
         }
         volumesArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				name: v.name
         				persistentVolumeClaim: claimName: v.claimName
@@ -70,7 +70,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				name: v.name
         				configMap: {
@@ -85,7 +85,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				name: v.name
         				secret: {
@@ -100,7 +100,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				name: v.name
         				emptyDir: medium: v.medium
@@ -109,7 +109,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				name: v.name
         				hostPath: path: v.path
@@ -322,8 +322,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -218,9 +218,6 @@ spec:
             - "--feature-gates=EnableSuspendOnFailure={{- .Values.workflow.enableSuspendOnFailure | toString -}}"
             - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
             - "--feature-gates=LegacyComponentRevision={{- .Values.featureGates.enableLegacyComponentRevision | toString -}}"
-            - "--feature-gates=GzipResourceTracker={{- .Values.featureGates.gzipResourceTracker | toString -}}"
-            - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
-            - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
             {{ if .Values.authentication.enabled }}
             {{ if .Values.authentication.withUser }}
             - "--authentication-with-user"

charts/vela-core/templates/test/test-application.yaml

@@ -13,6 +13,12 @@ spec:
       properties:
         image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
         port: 8000
+      traits:
+        - type: ingress
+          properties:
+            domain: testsvc.example.com
+            http:
+              "/": 8000
 ---
 apiVersion: v1
 kind: Pod
@@ -46,5 +52,13 @@ spec:
           kubectl -n {{ include "systemDefinitionNamespace" . }} wait --for=condition=available deployments helm-test-express-server --timeout 3m
           echo "deployment being available"
 
+          # wait for ingress being created
+          while ! [ `kubectl -n {{ include "systemDefinitionNamespace" . }} get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
+            echo "waiting for ingress being created"
+            sleep 1
+          done
+
+
+
           echo "Application and its components are created"
   restartPolicy: Never

charts/vela-core/templates/velaql/application-revision.yaml

@@ -1,33 +0,0 @@
-apiVersion: "v1"
-kind: "ConfigMap"
-metadata:
-  name: "application-revision-view"
-  namespace: {{ include "systemDefinitionNamespace" . }}
-data:
-  template: |
-    import (
-       "vela/op"
-    )
-
-    output: {
-      op.#Read & {
-        value: {
-          apiVersion: "core.oam.dev/v1beta1"
-            kind:       "ApplicationRevision"
-            metadata: {
-              name: parameter.name
-              namespace: parameter.namespace
-            }
-        }
-      }
-    }
-
-    parameter: {
-       // +usage=Specify the name of the object
-      name: string
-      // +usage=Specify the namespace of the object
-      namespace: *"default" | string
-    }
-
-    status: output.value
-

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

@@ -1,77 +0,0 @@
-{{- if not (lookup "v1" "ConfigMap" (include "systemDefinitionNamespace" .) "component-pod-view") }}
-apiVersion: v1
-data:
-  template: |
-      import (
-      "vela/ql"
-      )
-
-      parameter: {
-        appName:    string
-        appNs:      string
-        name?:      string
-        cluster?:   string
-        clusterNs?: string
-      }
-
-      result: ql.#CollectPods & {
-        app: {
-          name:      parameter.appName
-          namespace: parameter.appNs
-          filter: {
-            if parameter.cluster != _|_ {
-              cluster: parameter.cluster
-            }
-            if parameter.clusterNs != _|_ {
-              clusterNamespace: parameter.clusterNs
-            }
-            if parameter.name != _|_ {
-              components: [parameter.name]
-            }
-          }
-        }
-      }
-
-      if result.err == _|_ {
-        status: {
-          podList: [ for pod in result.list if pod.object != _|_ {
-            cluster:   pod.cluster
-            workload:  pod.workload
-            component: pod.component
-            metadata: {
-              name:         pod.object.metadata.name
-              namespace:    pod.object.metadata.namespace
-              creationTime: pod.object.metadata.creationTimestamp
-              labels:       pod.object.metadata.labels
-              version: {
-                if pod.publishVersion != _|_ {
-                  publishVersion: pod.publishVersion
-                }
-                if pod.deployVersion != _|_ {
-                  deployVersion: pod.deployVersion
-                }
-              }
-            }
-            status: {
-              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 result.err != _|_ {
-        status: {
-          error: result.err
-        }
-      }
-kind: ConfigMap
-metadata:
-  name: component-pod-view
-  namespace: {{ include "systemDefinitionNamespace" . }}
-{{- end }}

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

@@ -1,50 +0,0 @@
-{{- if not (lookup "v1" "ConfigMap" (include "systemDefinitionNamespace" .) "component-service-view") }}
-apiVersion: v1
-data:
-  template: |
-      import (
-      "vela/ql"
-      )
-
-      parameter: {
-        appName:    string
-        appNs:      string
-        name?:      string
-        cluster?:   string
-        clusterNs?: string
-      }
-
-      result: ql.#CollectServices & {
-        app: {
-          name:      parameter.appName
-          namespace: parameter.appNs
-          filter: {
-            if parameter.cluster != _|_ {
-              cluster: parameter.cluster
-            }
-            if parameter.clusterNs != _|_ {
-              clusterNamespace: parameter.clusterNs
-            }
-            if parameter.name != _|_ {
-              components: [parameter.name]
-            }
-          }
-        }
-      }
-
-      if result.err == _|_ {
-        status: {
-          services: result.list
-        }
-      }
-
-      if result.err != _|_ {
-        status: {
-          error: result.err
-        }
-      }
-kind: ConfigMap
-metadata:
-  name: component-service-view
-  namespace: {{ include "systemDefinitionNamespace" . }}
-{{- end}}

charts/vela-core/values.yaml

@@ -110,14 +110,8 @@ optimize:
   enableResourceTrackerDeleteOnlyTrigger: true
 
 ##@param featureGates.enableLegacyComponentRevision if disabled, only component with rollout trait will create component revisions
-##@param featureGates.gzipResourceTracker if enabled, resourceTracker will be compressed using gzip before being stored
-##@param featureGates.zstdResourceTracker if enabled, resourceTracker will be compressed using zstd before being stored. It is much faster and more efficient than gzip. If both gzip and zstd are enabled, zstd will be used.
-##@param featureGates.applyOnce if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker
 featureGates:
   enableLegacyComponentRevision: false
-  gzipResourceTracker: false
-  zstdResourceTracker: false
-  applyOnce: false
 
 ## @section MultiCluster parameters
 

charts/vela-minimal/crds/core.oam.dev_applicationrevisions.yaml

@@ -461,6 +461,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -621,10 +623,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -842,22 +843,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -893,9 +888,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -2223,16 +2217,14 @@ spec:
                                 step.
                               properties:
                                 dependsOn:
-                                  description: DependsOn is the dependency of the
-                                    step
                                   items:
                                     type: string
                                   type: array
                                 if:
-                                  description: If is the if condition of the step
                                   type: string
                                 inputs:
-                                  description: Inputs is the inputs of the step
+                                  description: StepInputs defines variable input of
+                                    WorkflowStep
                                   items:
                                     properties:
                                       from:
@@ -2245,8 +2237,8 @@ spec:
                                     type: object
                                   type: array
                                 meta:
-                                  description: Meta is the meta data of the workflow
-                                    step.
+                                  description: WorkflowStepMeta contains the meta
+                                    data of a workflow step
                                   properties:
                                     alias:
                                       type: string
@@ -2256,7 +2248,8 @@ spec:
                                     step.
                                   type: string
                                 outputs:
-                                  description: Outputs is the outputs of the step
+                                  description: StepOutputs defines output variable
+                                    of WorkflowStep
                                   items:
                                     properties:
                                       name:
@@ -2269,27 +2262,22 @@ spec:
                                     type: object
                                   type: array
                                 properties:
-                                  description: Properties is the properties of the
-                                    step
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
                                 subSteps:
                                   items:
-                                    description: WorkflowStepBase defines the workflow
-                                      step base
+                                    description: WorkflowSubStep defines how to execute
+                                      a workflow subStep.
                                     properties:
                                       dependsOn:
-                                        description: DependsOn is the dependency of
-                                          the step
                                         items:
                                           type: string
                                         type: array
                                       if:
-                                        description: If is the if condition of the
-                                          step
                                         type: string
                                       inputs:
-                                        description: Inputs is the inputs of the step
+                                        description: StepInputs defines variable input
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             from:
@@ -2302,8 +2290,8 @@ spec:
                                           type: object
                                         type: array
                                       meta:
-                                        description: Meta is the meta data of the
-                                          workflow step.
+                                        description: WorkflowStepMeta contains the
+                                          meta data of a workflow step
                                         properties:
                                           alias:
                                             type: string
@@ -2313,8 +2301,8 @@ spec:
                                           workflow step.
                                         type: string
                                       outputs:
-                                        description: Outputs is the outputs of the
-                                          step
+                                        description: StepOutputs defines output variable
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             name:
@@ -2327,17 +2315,11 @@ spec:
                                           type: object
                                         type: array
                                       properties:
-                                        description: Properties is the properties
-                                          of the step
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
                                       timeout:
-                                        description: Timeout is the timeout of the
-                                          step
                                         type: string
                                       type:
-                                        description: Type is the type of the workflow
-                                          step.
                                         type: string
                                     required:
                                     - name
@@ -2345,10 +2327,8 @@ spec:
                                     type: object
                                   type: array
                                 timeout:
-                                  description: Timeout is the timeout of the step
                                   type: string
                                 type:
-                                  description: Type is the type of the workflow step.
                                   type: string
                               required:
                               - name
@@ -2375,6 +2355,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -2535,10 +2517,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -2756,22 +2737,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -2807,9 +2782,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -3676,7 +3650,7 @@ spec:
                         appliesToWorkloads:
                           description: AppliesToWorkloads specifies the list of workload
                             kinds this trait applies to. Workload kinds are specified
-                            in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                            in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
                             Traits that omit this field apply to all workload kinds.
                           items:
                             type: string
@@ -4010,15 +3984,13 @@ spec:
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -4031,7 +4003,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -4040,7 +4013,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -4053,24 +4026,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -4083,8 +4054,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -4094,7 +4065,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -4107,14 +4079,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -4122,10 +4091,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -4794,22 +4761,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -4843,8 +4804,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

charts/vela-minimal/crds/core.oam.dev_applications.yaml

@@ -414,6 +414,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of
@@ -564,10 +565,9 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy Deprecated
-                  This field is only used by EnvBinding Policy which is deprecated.
+                description: PolicyStatus records the status of policy
                 items:
-                  description: PolicyStatus records the status of policy Deprecated
+                  description: PolicyStatus records the status of policy
                   properties:
                     name:
                       type: string
@@ -766,22 +766,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -815,8 +809,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this
@@ -1034,15 +1028,13 @@ spec:
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -1055,7 +1047,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -1064,7 +1057,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -1077,24 +1070,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -1107,8 +1098,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -1118,7 +1109,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -1131,14 +1123,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -1146,10 +1135,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -1176,6 +1163,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of
@@ -1326,10 +1314,9 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy Deprecated
-                  This field is only used by EnvBinding Policy which is deprecated.
+                description: PolicyStatus records the status of policy
                 items:
-                  description: PolicyStatus records the status of policy Deprecated
+                  description: PolicyStatus records the status of policy
                   properties:
                     name:
                       type: string
@@ -1528,22 +1515,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -1577,8 +1558,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

charts/vela-minimal/crds/core.oam.dev_definitionrevisions.yaml

@@ -708,7 +708,7 @@ spec:
                       appliesToWorkloads:
                         description: AppliesToWorkloads specifies the list of workload
                           kinds this trait applies to. Workload kinds are specified
-                          in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                          in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
                           Traits that omit this field apply to all workload kinds.
                         items:
                           type: string

charts/vela-minimal/crds/core.oam.dev_resourcetrackers.yaml

@@ -56,16 +56,6 @@ spec:
               applicationGeneration:
                 format: int64
                 type: integer
-              compression:
-                description: ResourceTrackerCompression the compression for ResourceTracker
-                  ManagedResources
-                properties:
-                  data:
-                    type: string
-                  type:
-                    description: Type the compression type
-                    type: string
-                type: object
               managedResources:
                 items:
                   description: ManagedResource define the resource to be managed by
@@ -79,6 +69,7 @@ spec:
                     component:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     deleted:
                       description: Deleted marks the resource to be deleted
@@ -114,9 +105,6 @@ spec:
                       description: 'Specific resourceVersion to which this reference
                         is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
                       type: string
-                    skipGC:
-                      description: SkipGC marks the resource to skip gc
-                      type: boolean
                     trait:
                       type: string
                     uid:
@@ -146,6 +134,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of

charts/vela-minimal/crds/core.oam.dev_traitdefinitions.yaml

@@ -356,7 +356,7 @@ spec:
             properties:
               appliesToWorkloads:
                 description: AppliesToWorkloads specifies the list of workload kinds
-                  this trait applies to. Workload kinds are specified in resource.group/version
+                  this trait applies to. Workload kinds are specified in kind.group/version
                   format, e.g. server.core.oam.dev/v1alpha2. Traits that omit this
                   field apply to all workload kinds.
                 items:

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

@@ -11,10 +11,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -4,7 +4,9 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add annotations on your workload. if it generates pod, add same annotations for generated pods.
+    definition.oam.dev/description: Add annotations on K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-minimal/templates/defwithtemplate/collect-service-endpoints.yaml

@@ -1,81 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/collect-service-endpoints.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Collect service endpoints for the application.
-  name: collect-service-endpoints
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"vela/ql"
-        )
-
-        collect: ql.#CollectServiceEndpoints & {
-        	app: {
-        		name:      *context.name | string
-        		namespace: *context.namespace | string
-        		if parameter.name != _|_ {
-        			name: parameter.name
-        		}
-        		if parameter.namespace != _|_ {
-        			namespace: parameter.namespace
-        		}
-        		filter: {
-        			if parameter.components != _|_ {
-        				components: parameter.components
-        			}
-        		}
-        	}
-        } @step(1)
-        outputs: {
-        	eps: *[] | [...]
-        	if parameter.port == _|_ {
-        		eps: collect.list
-        	}
-        	if parameter.port != _|_ {
-        		eps: [ for ep in collect.list if parameter.port == ep.endpoint.port {ep}]
-        	}
-        	endpoints: *[] | [...]
-        	if parameter.outer != _|_ {
-        		tmps: [ for ep in eps {
-        			ep
-        			if ep.endpoint.inner == _|_ {
-        				outer: true
-        			}
-        			if ep.endpoint.inner != _|_ {
-        				outer: !ep.endpoint.inner
-        			}
-        		}]
-        		endpoints: [ for ep in tmps if (!parameter.outer || ep.outer) {ep}]
-        	}
-        	if parameter.outer == _|_ {
-        		endpoints: eps
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: len(outputs.endpoints) > 0
-        } @step(2)
-        value: {
-        	if len(outputs.endpoints) > 0 {
-        		outputs.endpoints[0]
-        	}
-        }
-        parameter: {
-        	// +usage=Specify the name of the application
-        	name?: string
-        	// +usage=Specify the namespace of the application
-        	namespace?: string
-        	// +usage=Filter the component of the endpoints
-        	components?: [...string]
-        	// +usage=Filter the port of the endpoints
-        	port?: int
-        	// +usage=Filter the endpoint that are only outer
-        	outer?: bool
-        }
-

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add command on K8s pod for your workload which follows the pod spec in path 'spec.template'
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: command
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   schematic:
     cue:
       template: |

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Set the image of the container.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: container-image
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -5,12 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Automatically scale the component based on CPU usage.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
   schematic:
     cue:
       template: |

charts/vela-minimal/templates/defwithtemplate/cron-task.yaml

@@ -222,8 +222,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -17,7 +17,7 @@ spec:
 
         mountsArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -26,7 +26,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -35,7 +35,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -44,7 +44,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				mountPath: v.mountPath
         				name:      v.name
@@ -53,7 +53,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				mountPath: v.mountPath
         				if v.mountPropagation != _|_ {
@@ -69,7 +69,7 @@ spec:
         }
         volumesArray: {
         	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		for v in parameter.volumeMounts.pvc {
         			{
         				name: v.name
         				persistentVolumeClaim: claimName: v.claimName
@@ -78,7 +78,7 @@ spec:
         	] | []
 
         	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        			for v in parameter.volumeMounts.configMap {
         			{
         				name: v.name
         				configMap: {
@@ -93,7 +93,7 @@ spec:
         	] | []
 
         	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		for v in parameter.volumeMounts.secret {
         			{
         				name: v.name
         				secret: {
@@ -108,7 +108,7 @@ spec:
         	] | []
 
         	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        			for v in parameter.volumeMounts.emptyDir {
         			{
         				name: v.name
         				emptyDir: medium: v.medium
@@ -117,7 +117,7 @@ spec:
         	] | []
 
         	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        			for v in parameter.volumeMounts.hostPath {
         			{
         				name: v.name
         				hostPath: path: v.path
@@ -275,7 +275,7 @@ spec:
         	}
         }
         exposePorts: [
-        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
+        	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
@@ -428,8 +428,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -21,9 +21,9 @@ spec:
         app: op.#Steps & {
         	load: op.#Load @step(1)
         	clusters: [...string]
-        	listClusters: op.#ListClusters @step(2)
         	if parameter.clusters == _|_ {
-        		clusters: listClusters.outputs.clusters
+        		listClusters: op.#ListClusters @step(2)
+        		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
         		clusters: parameter.clusters

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add env on K8s pod for your workload which follows the pod spec in path 'spec.template'
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: env
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   schematic:
     cue:
       template: |

charts/vela-minimal/templates/defwithtemplate/export-data.yaml

@@ -1,64 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/export-data.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Export data to clusters specified by topology.
-  name: export-data
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        object: {
-        	apiVersion: "v1"
-        	kind:       parameter.kind
-        	metadata: {
-        		name:      *context.name | string
-        		namespace: *context.namespace | string
-        		if parameter.name != _|_ {
-        			name: parameter.name
-        		}
-        		if parameter.namespace != _|_ {
-        			namespace: parameter.namespace
-        		}
-        	}
-        	if parameter.kind == "ConfigMap" {
-        		data: parameter.data
-        	}
-        	if parameter.kind == "Secret" {
-        		stringData: parameter.data
-        	}
-        } @step(1)
-        getPlacements: op.#GetPlacementsFromTopologyPolicies & {
-        	policies: *[] | [...string]
-        	if parameter.topology != _|_ {
-        		policies: [parameter.topology]
-        	}
-        }      @step(2)
-        apply: op.#Steps & {
-        	for p in getPlacements.placements {
-        		"\(p.cluster)": op.#Apply & {
-        			value:   object
-        			cluster: p.cluster
-        		}
-        	}
-        } @step(3)
-        parameter: {
-        	// +usage=Specify the name of the export destination
-        	name?: string
-        	// +usage=Specify the namespace of the export destination
-        	namespace?: string
-        	// +usage=Specify the kind of the export destination
-        	kind: *"ConfigMap" | "Secret"
-        	// +usage=Specify the data to export
-        	data: {}
-        	// +usage=Specify the topology to export
-        	topology?: string
-        }
-

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

@@ -5,12 +5,11 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Expose port to enable web traffic for your component.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: expose
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
   podDisruptive: false
   schematic:
     cue:

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

@@ -9,8 +9,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
+    - '*'
   podDisruptive: false
   schematic:
     cue:
@@ -86,7 +85,7 @@ spec:
         	// +usage=Set ingress class in '.spec.ingressClassName' instead of 'kubernetes.io/ingress.class' annotation.
         	classInSpec: *false | bool
 
-        	// +usage=Specify the secret name you want to quote to use tls.
+        	// +usage=Specify the secret name you want to quote.
         	secretName?: string
 
         	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
@@ -94,11 +93,11 @@ spec:
         }
   status:
     customStatus: |-
-      if context.outputs.ingress.status.loadBalancer.ingress == _|_ {
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
         message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
-      if context.outputs.ingress.status.loadBalancer.ingress != _|_ {
-      	let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if len(igs) > 0 {
         if igs[0].ip != _|_ {
         	if igs[0].host != _|_ {
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add host aliases on K8s pod for your workload which follows the pod spec in path 'spec.template'.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
+    - '*'
   podDisruptive: false
   schematic:
     cue:

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
   podDisruptive: true
   schematic:
     cue: