Chore: revert the definitions after cue upgrade (#4786)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

.github/CODEOWNERS

@@ -1,7 +1,13 @@
 # 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
-design/                            @barnettZQG @leejanee @wonderflow @Somefive
+*                                  @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
 
 # Owner of CUE
 pkg/cue                            @leejanee @FogDong @Somefive
@@ -11,26 +17,21 @@ pkg/stdlib                         @leejanee @FogDong @Somefive
 pkg/workflow                       @leejanee @FogDong @Somefive
 
 # Owner of rollout
-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
+pkg/controller/common/rollout/     @wangyikewxgm @wonderflow
+runtime/rollout                    @wangyikewxgm @wonderflow
 
 # Owner of vela templates
 vela-templates/                     @Somefive @barnettZQG @wonderflow
 
 # Owner of vela CLI
-references/cli/                     @Somefive @zzxwill @StevenLeiZhang
+references/cli/                     @Somefive @zzxwill @StevenLeiZhang @charlie0129 @chivalryq
 
 # 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,9 +19,8 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -48,9 +47,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
           fi
 
   apiserver-unit-tests:
@@ -111,6 +110,9 @@ 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
@@ -128,35 +130,50 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
+      - 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.24 ]]; 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
         with:
-          version: ${{ env.KIND_VERSION }}
-          skipClusterCreation: true
+          version: ${{ matrix.k8s-version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          k3d-args: ${{ env.EGRESS_ARG }}
 
-      - name: Setup Kind Cluster (Worker)
+
+      - 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)
         run: |
-          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
+          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
 
-      - 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: Load image to k3d cluster
+        run: make image-load
 
       - name: Cleanup for e2e tests
         run: |
-          make e2e-cleanup
           make vela-cli
+          make e2e-cleanup
           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,7 +21,11 @@ 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/
+      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
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
@@ -86,4 +90,11 @@ 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: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f
+        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

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

@@ -17,9 +17,8 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -46,9 +45,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
           fi
 
 
@@ -59,6 +58,9 @@ 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:
@@ -74,37 +76,49 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
+      - 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.24 ]]; 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
         with:
-          version: ${{ env.KIND_VERSION }}
-          skipClusterCreation: true
+          version: ${{ matrix.k8s-version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          k3d-args: ${{ env.EGRESS_ARG }}
 
-      - name: Setup Kind Cluster (Worker)
+      - 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
         run: |
-          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
+          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
 
-      - 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: Load image to k3d cluster (hub and worker)
+        run: make image-load image-load-runtime-cluster
 
       - name: Cleanup for e2e tests
         run: |
-          make e2e-cleanup
           make vela-cli
+          make e2e-cleanup
           make e2e-setup-core-auth
-          make
           make setup-runtime-e2e-cluster
 
       - name: Run e2e multicluster tests

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

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

.github/workflows/e2e-test.yml

@@ -17,9 +17,8 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -46,9 +45,9 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
             echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
           else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
           fi
 
   e2e-tests:
@@ -58,6 +57,10 @@ 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
@@ -72,33 +75,36 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
-        with:
-          version: ${{ env.KIND_VERSION }}
-          skipClusterCreation: true
-
-      - name: Setup Kind Cluster
+      - name: Tear down K3d if exist
         run: |
-          kind delete cluster
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
-          kubectl version
-          kubectl cluster-info
+          k3d cluster delete || true
+          k3d cluster delete worker || true
 
-      - name: Load Image to kind cluster
-        run: make kind-load
+      - name: Calculate K3d args
+        run: |
+          EGRESS_ARG=""
+          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; 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
+        with:
+          version: ${{ matrix.k8s-version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          k3d-args: ${{ env.EGRESS_ARG }}
+
+      - name: Load image to k3d cluster
+        run: make image-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
-          helm lint ./charts/vela-core
+          make e2e-setup-core
           helm test -n vela-system kubevela --timeout 5m
 
       - name: Run api e2e tests

.github/workflows/go.yml

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

.github/workflows/issue-commands.yml

@@ -30,7 +30,7 @@ jobs:
           configPath: issue-commands
 
   backport:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.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@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.6
+        uses: zeebe-io/backport-action@v0.0.8
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/registry.yml

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

.gitignore

@@ -1,4 +1,4 @@
-# Binaries for programs and plugins
+# Binaries for programs and docgen
 *.exe
 *.exe~
 *.dll
@@ -33,6 +33,7 @@ vendor/
 
 # Vscode files
 .vscode
+.history
 
 pkg/test/vela
 config/crd/bases

Dockerfile.cli

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

Dockerfile.cloudshell

@@ -1,31 +0,0 @@
-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: vet lint staticcheck unit-test-core test-cli-gen
+test: 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: fmt vet lint staticcheck vela-cli kubectl-vela
+build: vela-cli kubectl-vela
 	@$(OK) build succeed
 
 build-cleanup:
@@ -82,28 +82,28 @@ endif
 
 
 
-# load docker image to the kind cluster
-kind-load: kind-load-runtime-cluster
+# load docker image to the k3d cluster
+image-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
-	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
+	k3d image import $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
-kind-load-runtime-cluster:
+image-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
-	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; }
+	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"
 
 # Run tests
-core-test: fmt vet manifests
+core-test:
 	go test ./pkg/... -coverprofile cover.out
 
 # Build vela core manager and apiserver binary
-manager: fmt vet lint manifests
+manager:
 	$(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: fmt vet lint manifests
+vela-runtime-rollout-manager:
 	$(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,6 +26,8 @@ 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"
@@ -201,6 +203,8 @@ const (
 	ApplicationWorkflowSuspending ApplicationPhase = "workflowSuspending"
 	// ApplicationWorkflowTerminated means the app's workflow is terminated
 	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
+	// ApplicationWorkflowFailed means the app's workflow is failed
+	ApplicationWorkflowFailed ApplicationPhase = "workflowFailed"
 	// ApplicationWorkflowFinished means the app's workflow is finished
 	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
 	// ApplicationRunning means the app finished rendering and applied result to the cluster
@@ -268,33 +272,6 @@ 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
@@ -324,10 +301,12 @@ 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"`
@@ -335,95 +314,26 @@ 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        WorkflowMode `json:"mode"`
-	Message     string       `json:"message,omitempty"`
+	AppRevision string                            `json:"appRevision,omitempty"`
+	Mode        string                            `json:"mode"`
+	Phase       workflowv1alpha1.WorkflowRunPhase `json:"status,omitempty"`
+	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          []WorkflowStepStatus    `json:"steps,omitempty"`
+	ContextBackend *corev1.ObjectReference               `json:"contextBackend,omitempty"`
+	Steps          []workflowv1alpha1.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
@@ -442,16 +352,6 @@ 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"`
@@ -481,9 +381,9 @@ type ApplicationComponent struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Properties *runtime.RawExtension `json:"properties,omitempty"`
 
-	DependsOn []string    `json:"dependsOn,omitempty"`
-	Inputs    StepInputs  `json:"inputs,omitempty"`
-	Outputs   StepOutputs `json:"outputs,omitempty"`
+	DependsOn []string                     `json:"dependsOn,omitempty"`
+	Inputs    workflowv1alpha1.StepInputs  `json:"inputs,omitempty"`
+	Outputs   workflowv1alpha1.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"`
@@ -492,22 +392,10 @@ 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"`
-}
 
-// 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"`
+	// 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:"-"`
 }
 
 // ClusterSelector defines the rules to select a Cluster resource.
@@ -536,16 +424,13 @@ type ClusterPlacement struct {
 	Distribution Distribution `json:"distribution,omitempty"`
 }
 
-// ResourceCreatorRole defines the resource creator.
-type ResourceCreatorRole string
-
 const (
 	// PolicyResourceCreator create the policy resource.
-	PolicyResourceCreator ResourceCreatorRole = "policy"
+	PolicyResourceCreator string = "policy"
 	// WorkflowResourceCreator create the resource in workflow.
-	WorkflowResourceCreator ResourceCreatorRole = "workflow"
+	WorkflowResourceCreator string = "workflow"
 	// DebugResourceCreator create the debug resource.
-	DebugResourceCreator ResourceCreatorRole = "debug"
+	DebugResourceCreator string = "debug"
 )
 
 // OAMObjectReference defines the object reference for an oam resource
@@ -592,8 +477,8 @@ func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
 
 // ClusterObjectReference defines the object reference with cluster.
 type ClusterObjectReference struct {
-	Cluster                string              `json:"cluster,omitempty"`
-	Creator                ResourceCreatorRole `json:"creator,omitempty"`
+	Cluster                string `json:"cluster,omitempty"`
+	Creator                string `json:"creator,omitempty"`
 	corev1.ObjectReference `json:",inline"`
 }
 

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

@@ -22,6 +22,7 @@ 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"
@@ -108,12 +109,12 @@ func (in *ApplicationComponent) DeepCopyInto(out *ApplicationComponent) {
 	}
 	if in.Inputs != nil {
 		in, out := &in.Inputs, &out.Inputs
-		*out = make(StepInputs, len(*in))
+		*out = make(v1alpha1.StepInputs, len(*in))
 		copy(*out, *in)
 	}
 	if in.Outputs != nil {
 		in, out := &in.Outputs, &out.Outputs
-		*out = make(StepOutputs, len(*in))
+		*out = make(v1alpha1.StepOutputs, len(*in))
 		copy(*out, *in)
 	}
 	if in.Traits != nil {
@@ -573,61 +574,6 @@ 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
@@ -663,12 +609,13 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
 	}
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
-		*out = make([]WorkflowStepStatus, len(*in))
+		*out = make([]v1alpha1.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.
@@ -681,147 +628,6 @@ 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,15 +53,7 @@ func (in ApplyOncePolicySpec) FindStrategy(manifest *unstructured.Unstructured)
 		return nil
 	}
 	for _, rule := range in.Rules {
-		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()))) {
+		if rule.Selector.Match(manifest) {
 			return rule.Strategy
 		}
 	}

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

@@ -97,6 +97,7 @@ type EnvSelector struct {
 }
 
 // EnvConfig is the configuration for different environments.
+// Deprecated
 type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
@@ -105,6 +106,7 @@ 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"`
 }
@@ -124,18 +126,21 @@ 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,8 +19,6 @@ 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
@@ -49,27 +47,3 @@ 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,6 +18,7 @@ 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"
@@ -57,20 +58,19 @@ type GarbageCollectPolicyRule struct {
 }
 
 // ResourcePolicyRuleSelector select the targets of the rule
-// 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
+// if multiple conditions are specified, combination logic is AND
 type ResourcePolicyRuleSelector struct {
-	CompNames        []string `json:"componentNames"`
-	CompTypes        []string `json:"componentTypes"`
-	OAMResourceTypes []string `json:"oamTypes"`
-	TraitTypes       []string `json:"traitTypes"`
-	ResourceTypes    []string `json:"resourceTypes"`
-	ResourceNames    []string `json:"resourceNames"`
+	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"`
 }
 
 // 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,15 +81,33 @@ func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured)
 	}
 	resourceType = manifest.GetKind()
 	resourceName = manifest.GetName()
-	match := func(src []string, val string) (found bool) {
-		return val != "" && slices.Contains(src, val)
+	match := func(src []string, val string) (found *bool) {
+		if len(src) == 0 {
+			return nil
+		}
+		return pointer.Bool(val != "" && slices.Contains(src, val))
 	}
-	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)
+	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
 }
 
 // GarbageCollectStrategy the strategy for target resource to recycle

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

@@ -27,6 +27,8 @@ 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
@@ -77,3 +79,11 @@ 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,6 +20,8 @@ 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"
 )
 
@@ -54,5 +56,5 @@ var (
 
 func init() {
 	SchemeBuilder.Register(&Policy{}, &PolicyList{})
-	SchemeBuilder.Register(&Workflow{}, &WorkflowList{})
+	SchemeBuilder.Register(&workflowv1alpha1.Workflow{}, &workflowv1alpha1.WorkflowList{})
 }

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

@@ -612,6 +612,31 @@ 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
@@ -710,67 +735,3 @@ 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/v1alpha2/core_trait_types.go

@@ -1,65 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-var _ oam.Trait = &ManualScalerTrait{}
-
-// A ManualScalerTraitSpec defines the desired state of a ManualScalerTrait.
-type ManualScalerTraitSpec struct {
-	// ReplicaCount of the workload this trait applies to.
-	ReplicaCount int32 `json:"replicaCount"`
-
-	// WorkloadReference to the workload this trait applies to.
-	WorkloadReference corev1.ObjectReference `json:"workloadRef"`
-}
-
-// A ManualScalerTraitStatus represents the observed state of a
-// ManualScalerTrait.
-type ManualScalerTraitStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// A ManualScalerTrait determines how many replicas a workload should have.
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type ManualScalerTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ManualScalerTraitSpec   `json:"spec,omitempty"`
-	Status ManualScalerTraitStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ManualScalerTraitList contains a list of ManualScalerTrait.
-type ManualScalerTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ManualScalerTrait `json:"items"`
-}

apis/core.oam.dev/v1alpha2/methods.go

@@ -24,26 +24,6 @@ import (
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
-// GetCondition of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetCondition(ct condition.ConditionType) condition.Condition {
-	return tr.Status.GetCondition(ct)
-}
-
-// SetConditions of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetConditions(c ...condition.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetWorkloadReference() corev1.ObjectReference {
-	return tr.Spec.WorkloadReference
-}
-
-// SetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetWorkloadReference(r corev1.ObjectReference) {
-	tr.Spec.WorkloadReference = r
-}
-
 // GetCondition of this ApplicationConfiguration.
 func (ac *ApplicationConfiguration) GetCondition(ct condition.ConditionType) condition.Condition {
 	return ac.Status.GetCondition(ct)

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

@@ -87,14 +87,6 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )
 
-// ManualScalerTrait type metadata.
-var (
-	ManualScalerTraitKind             = reflect.TypeOf(ManualScalerTrait{}).Name()
-	ManualScalerTraitGroupKind        = schema.GroupKind{Group: Group, Kind: ManualScalerTraitKind}.String()
-	ManualScalerTraitKindAPIVersion   = ManualScalerTraitKind + "." + SchemeGroupVersion.String()
-	ManualScalerTraitGroupVersionKind = SchemeGroupVersion.WithKind(ManualScalerTraitKind)
-)
-
 // HealthScope type metadata.
 var (
 	HealthScopeKind             = reflect.TypeOf(HealthScope{}).Name()
@@ -126,7 +118,6 @@ func init() {
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Component{}, &ComponentList{})
 	SchemeBuilder.Register(&ApplicationConfiguration{}, &ApplicationConfigurationList{})
-	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})

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

@@ -1520,97 +1520,6 @@ func (in *HistoryWorkload) DeepCopy() *HistoryWorkload {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ManualScalerTrait) DeepCopyInto(out *ManualScalerTrait) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTrait.
-func (in *ManualScalerTrait) DeepCopy() *ManualScalerTrait {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTrait)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ManualScalerTrait) 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 *ManualScalerTraitList) DeepCopyInto(out *ManualScalerTraitList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ManualScalerTrait, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitList.
-func (in *ManualScalerTraitList) DeepCopy() *ManualScalerTraitList {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ManualScalerTraitList) 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 *ManualScalerTraitSpec) DeepCopyInto(out *ManualScalerTraitSpec) {
-	*out = *in
-	out.WorkloadReference = in.WorkloadReference
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitSpec.
-func (in *ManualScalerTraitSpec) DeepCopy() *ManualScalerTraitSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ManualScalerTraitStatus) DeepCopyInto(out *ManualScalerTraitStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitStatus.
-func (in *ManualScalerTraitStatus) DeepCopy() *ManualScalerTraitStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MemoryResources) DeepCopyInto(out *MemoryResources) {
 	*out = *in

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

@@ -23,6 +23,8 @@ 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"
 )
@@ -49,20 +51,11 @@ 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  *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"`
+	Ref   string                                `json:"ref,omitempty"`
+	Mode  *workflowv1alpha1.WorkflowExecuteMode `json:"mode,omitempty"`
+	Steps []workflowv1alpha1.WorkflowStep       `json:"steps,omitempty"`
 }
 
 // ApplicationSpec is the spec of Application

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

@@ -19,6 +19,8 @@ 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"
 )
@@ -55,7 +57,7 @@ type ApplicationRevisionSpec struct {
 	Policies map[string]v1alpha1.Policy `json:"policies,omitempty"`
 
 	// Workflow records the external workflow
-	Workflow *v1alpha1.Workflow `json:"workflow,omitempty"`
+	Workflow *workflowv1alpha1.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 kind.group/version format,
+	// applies to. Workload kinds are specified in resource.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
 	// all workload kinds.
 	// +optional
@@ -138,7 +138,8 @@ type TraitDefinitionSpec struct {
 	// +optional
 	ConflictsWith []string `json:"conflictsWith,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the trait
+	// Schematic defines the data format and template of the encapsulation of the trait.
+	// Only CUE and Kube schematic are supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 
@@ -154,9 +155,6 @@ type TraitDefinitionSpec struct {
 	// ManageWorkload defines the trait would be responsible for creating the workload
 	// +optional
 	ManageWorkload bool `json:"manageWorkload,omitempty"`
-	// SkipRevisionAffect defines the update this trait will not generate a new application Revision
-	// +optional
-	SkipRevisionAffect bool `json:"skipRevisionAffect,omitempty"`
 	// ControlPlaneOnly defines which cluster is dispatched to
 	// +optional
 	ControlPlaneOnly bool `json:"controlPlaneOnly,omitempty"`

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

@@ -29,7 +29,8 @@ type PolicyDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
 	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the policy definition
+	// Schematic defines the data format and template of the encapsulation of the policy definition.
+	// Only CUE schematic is supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 

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

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"strings"
 
-	errors2 "github.com/pkg/errors"
-	v1 "k8s.io/api/core/v1"
+	"github.com/pkg/errors"
+	corev1 "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,7 +33,8 @@ 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/errors"
+	"github.com/oam-dev/kubevela/pkg/utils/compression"
+	velaerr "github.com/oam-dev/kubevela/pkg/utils/errors"
 )
 
 // +kubebuilder:object:root=true
@@ -69,9 +70,80 @@ const (
 
 // ResourceTrackerSpec define the spec of resourceTracker
 type ResourceTrackerSpec struct {
-	Type                  ResourceTrackerType `json:"type,omitempty"`
-	ApplicationGeneration int64               `json:"applicationGeneration"`
-	ManagedResources      []ManagedResource   `json:"managedResources,omitempty"`
+	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
 }
 
 // ManagedResource define the resource to be managed by ResourceTracker
@@ -82,6 +154,8 @@ 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
@@ -121,12 +195,13 @@ 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 {
-	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
+	group := in.GroupVersionKind().Group
+	kind := in.GroupVersionKind().Kind
 	cluster := in.Cluster
 	if cluster == "" {
 		cluster = velatypes.ClusterLocalName
 	}
-	return strings.Join([]string{gv, kind, cluster, in.Namespace, in.Name}, "/")
+	return strings.Join([]string{group, kind, cluster, in.Namespace, in.Name}, "/")
 }
 
 // ComponentKey computes the key for the component which managed resource belongs to
@@ -137,7 +212,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 errors.ManagedResourceHasNoDataError{}
+		return velaerr.ManagedResourceHasNoDataError{}
 	}
 	return json.Unmarshal(in.Data.Raw, obj)
 }
@@ -158,7 +233,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 errors2.Is(err, errors.ManagedResourceHasNoDataError{}) {
+		if errors.Is(err, velaerr.ManagedResourceHasNoDataError{}) {
 			return nil, err
 		}
 	}
@@ -195,7 +270,7 @@ func newManagedResourceFromResource(rsc client.Object) ManagedResource {
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	return ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
+			ObjectReference: corev1.ObjectReference{
 				APIVersion: gvk.GroupVersion().String(),
 				Kind:       gvk.Kind,
 				Name:       rsc.GetName(),
@@ -215,8 +290,9 @@ 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, creator common.ResourceCreatorRole) (updated bool) {
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, skipGC bool, creator string) (updated bool) {
 	mr := newManagedResourceFromResource(rsc)
+	mr.SkipGC = skipGC
 	if !metaOnly {
 		mr.Data = &runtime.RawExtension{Object: rsc}
 	}
@@ -242,7 +318,7 @@ func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool)
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	mr := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
+			ObjectReference: corev1.ObjectReference{
 				APIVersion: gvk.GroupVersion().String(),
 				Kind:       gvk.Kind,
 				Name:       rsc.GetName(),
@@ -285,7 +361,7 @@ func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectRef
 // Deprecated
 func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
 	return in.addClusterObjectReference(common.ClusterObjectReference{
-		ObjectReference: v1.ObjectReference{
+		ObjectReference: corev1.ObjectReference{
 			APIVersion: rsc.GetAPIVersion(),
 			Kind:       rsc.GetKind(),
 			Name:       rsc.GetName(),

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

@@ -18,18 +18,23 @@ package v1beta1
 
 import (
 	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
-	v12 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "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"
 	"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"
 )
 
@@ -111,10 +116,10 @@ func TestManagedResourceKeys(t *testing.T) {
 	input := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
 			Cluster: "cluster",
-			ObjectReference: v1.ObjectReference{
+			ObjectReference: corev1.ObjectReference{
 				Namespace:  "namespace",
 				Name:       "name",
-				APIVersion: v12.SchemeGroupVersion.String(),
+				APIVersion: appsv1.SchemeGroupVersion.String(),
 				Kind:       "Deployment",
 			},
 		},
@@ -125,10 +130,10 @@ func TestManagedResourceKeys(t *testing.T) {
 		},
 	}
 	r.Equal("namespace/name", input.NamespacedName().String())
-	r.Equal("apps/v1/Deployment/cluster/namespace/name", input.ResourceKey())
+	r.Equal("apps/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 v12.Deployment
+	var deploy1, deploy2 appsv1.Deployment
 	deploy1.Spec.Replicas = pointer.Int32(5)
 	bs, err := json.Marshal(deploy1)
 	r.NoError(err)
@@ -155,17 +160,17 @@ func TestManagedResourceKeys(t *testing.T) {
 func TestResourceTracker_ManagedResource(t *testing.T) {
 	r := require.New(t)
 	input := &ResourceTracker{}
-	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true, "")
+	deploy1 := appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "deploy1"}}
+	input.AddManagedResource(&deploy1, true, false, "")
 	r.Equal(1, len(input.Spec.ManagedResources))
-	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false, "")
+	cm2 := corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "cm2"}}
+	input.AddManagedResource(&cm2, false, false, "")
 	r.Equal(2, len(input.Spec.ManagedResources))
-	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false, "")
+	pod3 := corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod3"}}
+	input.AddManagedResource(&pod3, false, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false, "")
+	input.AddManagedResource(&deploy1, false, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&cm2, false)
 	r.Equal(3, len(input.Spec.ManagedResources))
@@ -176,9 +181,171 @@ 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 := v1.Secret{ObjectMeta: v13.ObjectMeta{Name: "secret4"}}
+	secret4 := corev1.Secret{ObjectMeta: metav1.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/workflow_step_definition.go

@@ -29,7 +29,8 @@ type WorkflowStepDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
 	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the workflow step definition
+	// Schematic defines the data format and template of the encapsulation of the workflow step definition.
+	// Only CUE schematic is supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 }

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

@@ -22,11 +22,12 @@ 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"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
+	core_oam_devv1alpha1 "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.
@@ -222,7 +223,7 @@ func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 	}
 	if in.Policies != nil {
 		in, out := &in.Policies, &out.Policies
-		*out = make(map[string]v1alpha1.Policy, len(*in))
+		*out = make(map[string]core_oam_devv1alpha1.Policy, len(*in))
 		for key, val := range *in {
 			(*out)[key] = *val.DeepCopy()
 		}
@@ -650,6 +651,21 @@ 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
@@ -692,6 +708,7 @@ 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.
@@ -929,12 +946,12 @@ func (in *Workflow) DeepCopyInto(out *Workflow) {
 	*out = *in
 	if in.Mode != nil {
 		in, out := &in.Mode, &out.Mode
-		*out = new(WorkflowExecuteMode)
+		*out = new(v1alpha1.WorkflowExecuteMode)
 		**out = **in
 	}
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
-		*out = make([]WorkflowStep, len(*in))
+		*out = make([]v1alpha1.WorkflowStep, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -951,68 +968,6 @@ 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,6 +106,7 @@ 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,19 +81,22 @@ 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` |
+| 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` |
 
 
 ### MultiCluster parameters

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

@@ -461,8 +461,6 @@ spec:
                             cluster:
                               type: string
                             creator:
-                              description: ResourceCreatorRole defines the resource
-                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -623,9 +621,10 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy
+                        description: PolicyStatus records the status of policy Deprecated
+                          This field is only used by EnvBinding Policy which is deprecated.
                         items:
-                          description: PolicyStatus records the status of policy
+                          description: PolicyStatus records the status of policy Deprecated
                           properties:
                             name:
                               type: string
@@ -843,16 +842,22 @@ 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
@@ -888,8 +893,9 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: WorkflowSubStepStatus record the
-                                      status of a workflow subStep
+                                    description: StepStatus record the base status
+                                      of workflow step, which could be workflow step
+                                      or subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -2217,14 +2223,16 @@ 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: StepInputs defines variable input of
-                                    WorkflowStep
+                                  description: Inputs is the inputs of the step
                                   items:
                                     properties:
                                       from:
@@ -2237,8 +2245,8 @@ spec:
                                     type: object
                                   type: array
                                 meta:
-                                  description: WorkflowStepMeta contains the meta
-                                    data of a workflow step
+                                  description: Meta is the meta data of the workflow
+                                    step.
                                   properties:
                                     alias:
                                       type: string
@@ -2248,8 +2256,7 @@ spec:
                                     step.
                                   type: string
                                 outputs:
-                                  description: StepOutputs defines output variable
-                                    of WorkflowStep
+                                  description: Outputs is the outputs of the step
                                   items:
                                     properties:
                                       name:
@@ -2262,22 +2269,27 @@ 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: WorkflowSubStep defines how to execute
-                                      a workflow subStep.
+                                    description: WorkflowStepBase defines the workflow
+                                      step base
                                     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: StepInputs defines variable input
-                                          of WorkflowStep
+                                        description: Inputs is the inputs of the step
                                         items:
                                           properties:
                                             from:
@@ -2290,8 +2302,8 @@ spec:
                                           type: object
                                         type: array
                                       meta:
-                                        description: WorkflowStepMeta contains the
-                                          meta data of a workflow step
+                                        description: Meta is the meta data of the
+                                          workflow step.
                                         properties:
                                           alias:
                                             type: string
@@ -2301,8 +2313,8 @@ spec:
                                           workflow step.
                                         type: string
                                       outputs:
-                                        description: StepOutputs defines output variable
-                                          of WorkflowStep
+                                        description: Outputs is the outputs of the
+                                          step
                                         items:
                                           properties:
                                             name:
@@ -2315,11 +2327,17 @@ 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
@@ -2327,8 +2345,10 @@ 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
@@ -2355,8 +2375,6 @@ spec:
                             cluster:
                               type: string
                             creator:
-                              description: ResourceCreatorRole defines the resource
-                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -2517,9 +2535,10 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy
+                        description: PolicyStatus records the status of policy Deprecated
+                          This field is only used by EnvBinding Policy which is deprecated.
                         items:
-                          description: PolicyStatus records the status of policy
+                          description: PolicyStatus records the status of policy Deprecated
                           properties:
                             name:
                               type: string
@@ -2737,16 +2756,22 @@ 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
@@ -2782,8 +2807,9 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: WorkflowSubStepStatus record the
-                                      status of a workflow subStep
+                                    description: StepStatus record the base status
+                                      of workflow step, which could be workflow step
+                                      or subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -3279,7 +3305,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the policy definition
+                            of the encapsulation of the policy definition. Only CUE
+                            schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3650,7 +3677,7 @@ spec:
                         appliesToWorkloads:
                           description: AppliesToWorkloads specifies the list of workload
                             kinds this trait applies to. Workload kinds are specified
-                            in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                            in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
                             Traits that omit this field apply to all workload kinds.
                           items:
                             type: string
@@ -3705,7 +3732,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the trait
+                            of the encapsulation of the trait. Only CUE and Kube schematic
+                            are supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3859,10 +3887,6 @@ spec:
                               - configuration
                               type: object
                           type: object
-                        skipRevisionAffect:
-                          description: SkipRevisionAffect defines the update this
-                            trait will not generate a new application Revision
-                          type: boolean
                         status:
                           description: Status defines the custom health policy and
                             status message for trait
@@ -3984,13 +4008,15 @@ 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: StepInputs defines variable input of WorkflowStep
+                          description: Inputs is the inputs of the step
                           items:
                             properties:
                               from:
@@ -4003,8 +4029,7 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: WorkflowStepMeta contains the meta data of
-                            a workflow step
+                          description: Meta is the meta data of the workflow step.
                           properties:
                             alias:
                               type: string
@@ -4013,7 +4038,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: StepOutputs defines output variable of WorkflowStep
+                          description: Outputs is the outputs of the step
                           items:
                             properties:
                               name:
@@ -4026,22 +4051,24 @@ 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: WorkflowSubStep defines how to execute a
-                              workflow subStep.
+                            description: WorkflowStepBase defines the workflow step
+                              base
                             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: StepInputs defines variable input of
-                                  WorkflowStep
+                                description: Inputs is the inputs of the step
                                 items:
                                   properties:
                                     from:
@@ -4054,8 +4081,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: WorkflowStepMeta contains the meta data
-                                  of a workflow step
+                                description: Meta is the meta data of the workflow
+                                  step.
                                 properties:
                                   alias:
                                     type: string
@@ -4065,8 +4092,7 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: StepOutputs defines output variable of
-                                  WorkflowStep
+                                description: Outputs is the outputs of the step
                                 items:
                                   properties:
                                     name:
@@ -4079,11 +4105,14 @@ 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
@@ -4091,8 +4120,10 @@ 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
@@ -4157,7 +4188,8 @@ spec:
                           type: object
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the workflow step definition
+                            of the encapsulation of the workflow step definition.
+                            Only CUE schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -4761,16 +4793,22 @@ 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
@@ -4804,8 +4842,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: WorkflowSubStepStatus record the status of
-                              a workflow subStep
+                            description: StepStatus record the base status of workflow
+                              step, which could be workflow step or subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

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

@@ -414,7 +414,6 @@ 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
@@ -565,9 +564,10 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy
+                description: PolicyStatus records the status of policy Deprecated
+                  This field is only used by EnvBinding Policy which is deprecated.
                 items:
-                  description: PolicyStatus records the status of policy
+                  description: PolicyStatus records the status of policy Deprecated
                   properties:
                     name:
                       type: string
@@ -766,16 +766,22 @@ 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
@@ -809,8 +815,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: WorkflowSubStepStatus record the status of
-                              a workflow subStep
+                            description: StepStatus record the base status of workflow
+                              step, which could be workflow step or subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this
@@ -1028,13 +1034,15 @@ 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: StepInputs defines variable input of WorkflowStep
+                          description: Inputs is the inputs of the step
                           items:
                             properties:
                               from:
@@ -1047,8 +1055,7 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: WorkflowStepMeta contains the meta data of
-                            a workflow step
+                          description: Meta is the meta data of the workflow step.
                           properties:
                             alias:
                               type: string
@@ -1057,7 +1064,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: StepOutputs defines output variable of WorkflowStep
+                          description: Outputs is the outputs of the step
                           items:
                             properties:
                               name:
@@ -1070,22 +1077,24 @@ 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: WorkflowSubStep defines how to execute a
-                              workflow subStep.
+                            description: WorkflowStepBase defines the workflow step
+                              base
                             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: StepInputs defines variable input of
-                                  WorkflowStep
+                                description: Inputs is the inputs of the step
                                 items:
                                   properties:
                                     from:
@@ -1098,8 +1107,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: WorkflowStepMeta contains the meta data
-                                  of a workflow step
+                                description: Meta is the meta data of the workflow
+                                  step.
                                 properties:
                                   alias:
                                     type: string
@@ -1109,8 +1118,7 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: StepOutputs defines output variable of
-                                  WorkflowStep
+                                description: Outputs is the outputs of the step
                                 items:
                                   properties:
                                     name:
@@ -1123,11 +1131,14 @@ 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
@@ -1135,8 +1146,10 @@ 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
@@ -1163,7 +1176,6 @@ 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
@@ -1314,9 +1326,10 @@ spec:
                 format: int64
                 type: integer
               policy:
-                description: PolicyStatus records the status of policy
+                description: PolicyStatus records the status of policy Deprecated
+                  This field is only used by EnvBinding Policy which is deprecated.
                 items:
-                  description: PolicyStatus records the status of policy
+                  description: PolicyStatus records the status of policy Deprecated
                   properties:
                     name:
                       type: string
@@ -1515,16 +1528,22 @@ 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
@@ -1558,8 +1577,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: WorkflowSubStepStatus record the status of
-                              a workflow subStep
+                            description: StepStatus record the base status of workflow
+                              step, which could be workflow step or subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

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

@@ -445,7 +445,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the policy definition
+                          of the encapsulation of the policy definition. Only CUE
+                          schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -708,7 +709,7 @@ spec:
                       appliesToWorkloads:
                         description: AppliesToWorkloads specifies the list of workload
                           kinds this trait applies to. Workload kinds are specified
-                          in kind.group/version format, e.g. server.core.oam.dev/v1alpha2.
+                          in resource.group/version format, e.g. server.core.oam.dev/v1alpha2.
                           Traits that omit this field apply to all workload kinds.
                         items:
                           type: string
@@ -762,7 +763,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the trait
+                          of the encapsulation of the trait. Only CUE and Kube schematic
+                          are supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -914,10 +916,6 @@ spec:
                             - configuration
                             type: object
                         type: object
-                      skipRevisionAffect:
-                        description: SkipRevisionAffect defines the update this trait
-                          will not generate a new application Revision
-                        type: boolean
                       status:
                         description: Status defines the custom health policy and status
                           message for trait
@@ -1052,7 +1050,8 @@ spec:
                         type: object
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the workflow step definition
+                          of the encapsulation of the workflow step definition. Only
+                          CUE schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format

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

@@ -1,134 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  name: manualscalertraits.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: ManualScalerTrait
-    listKind: ManualScalerTraitList
-    plural: manualscalertraits
-    singular: manualscalertrait
-  scope: Namespaced
-  versions:
-  - name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: A ManualScalerTrait determines how many replicas a workload should
-          have.
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: A ManualScalerTraitSpec defines the desired state of a ManualScalerTrait.
-            properties:
-              replicaCount:
-                description: ReplicaCount of the workload this trait applies to.
-                format: int32
-                type: integer
-              workloadRef:
-                description: WorkloadReference to the workload this trait applies
-                  to.
-                properties:
-                  apiVersion:
-                    description: API version of the referent.
-                    type: string
-                  fieldPath:
-                    description: 'If referring to a piece of an object instead of
-                      an entire object, this string should contain a valid JSON/Go
-                      field access statement, such as desiredState.manifest.containers[2].
-                      For example, if the object reference is to a container within
-                      a pod, this would take on a value like: "spec.containers{name}"
-                      (where "name" refers to the name of the container that triggered
-                      the event) or if no container name is specified "spec.containers[2]"
-                      (container with index 2 in this pod). This syntax is chosen
-                      only to have some well-defined way of referencing a part of
-                      an object. TODO: this design is not final and this field is
-                      subject to change in the future.'
-                    type: string
-                  kind:
-                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  name:
-                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                    type: string
-                  namespace:
-                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                    type: string
-                  resourceVersion:
-                    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
-                  uid:
-                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                    type: string
-                type: object
-            required:
-            - replicaCount
-            - workloadRef
-            type: object
-          status:
-            description: A ManualScalerTraitStatus represents the observed state of
-              a ManualScalerTrait.
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -60,7 +60,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the policy definition
+                  encapsulation of the policy definition. Only CUE schematic is supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -56,6 +56,16 @@ 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
@@ -69,7 +79,6 @@ spec:
                     component:
                       type: string
                     creator:
-                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     deleted:
                       description: Deleted marks the resource to be deleted
@@ -105,6 +114,9 @@ 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:
@@ -134,7 +146,6 @@ 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 kind.group/version
+                  this trait applies to. Workload kinds are specified in resource.group/version
                   format, e.g. server.core.oam.dev/v1alpha2. Traits that omit this
                   field apply to all workload kinds.
                 items:
@@ -410,7 +410,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the trait
+                  encapsulation of the trait. Only CUE and Kube schematic are supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format
@@ -557,10 +558,6 @@ spec:
                     - configuration
                     type: object
                 type: object
-              skipRevisionAffect:
-                description: SkipRevisionAffect defines the update this trait will
-                  not generate a new application Revision
-                type: boolean
               status:
                 description: Status defines the custom health policy and status message
                   for trait

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 policy API
+        description: Workflow is the Schema for the workflow API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -39,13 +39,15 @@ 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: StepInputs defines variable input of WorkflowStep
+                  description: Inputs is the inputs of the step
                   items:
                     properties:
                       from:
@@ -58,8 +60,7 @@ spec:
                     type: object
                   type: array
                 meta:
-                  description: WorkflowStepMeta contains the meta data of a workflow
-                    step
+                  description: Meta is the meta data of the workflow step.
                   properties:
                     alias:
                       type: string
@@ -68,7 +69,7 @@ spec:
                   description: Name is the unique name of the workflow step.
                   type: string
                 outputs:
-                  description: StepOutputs defines output variable of WorkflowStep
+                  description: Outputs is the outputs of the step
                   items:
                     properties:
                       name:
@@ -81,21 +82,23 @@ 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: WorkflowSubStep defines how to execute a workflow
-                      subStep.
+                    description: WorkflowStepBase defines the workflow step base
                     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: StepInputs defines variable input of WorkflowStep
+                        description: Inputs is the inputs of the step
                         items:
                           properties:
                             from:
@@ -108,8 +111,7 @@ spec:
                           type: object
                         type: array
                       meta:
-                        description: WorkflowStepMeta contains the meta data of a
-                          workflow step
+                        description: Meta is the meta data of the workflow step.
                         properties:
                           alias:
                             type: string
@@ -118,7 +120,7 @@ spec:
                         description: Name is the unique name of the workflow step.
                         type: string
                       outputs:
-                        description: StepOutputs defines output variable of WorkflowStep
+                        description: Outputs is the outputs of the step
                         items:
                           properties:
                             name:
@@ -131,11 +133,14 @@ 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
@@ -143,8 +148,10 @@ 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
@@ -176,13 +183,15 @@ 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: StepInputs defines variable input of WorkflowStep
+                  description: Inputs is the inputs of the step
                   items:
                     properties:
                       from:
@@ -195,8 +204,7 @@ spec:
                     type: object
                   type: array
                 meta:
-                  description: WorkflowStepMeta contains the meta data of a workflow
-                    step
+                  description: Meta is the meta data of the workflow step.
                   properties:
                     alias:
                       type: string
@@ -205,7 +213,7 @@ spec:
                   description: Name is the unique name of the workflow step.
                   type: string
                 outputs:
-                  description: StepOutputs defines output variable of WorkflowStep
+                  description: Outputs is the outputs of the step
                   items:
                     properties:
                       name:
@@ -218,21 +226,23 @@ 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: WorkflowSubStep defines how to execute a workflow
-                      subStep.
+                    description: WorkflowStepBase defines the workflow step base
                     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: StepInputs defines variable input of WorkflowStep
+                        description: Inputs is the inputs of the step
                         items:
                           properties:
                             from:
@@ -245,8 +255,7 @@ spec:
                           type: object
                         type: array
                       meta:
-                        description: WorkflowStepMeta contains the meta data of a
-                          workflow step
+                        description: Meta is the meta data of the workflow step.
                         properties:
                           alias:
                             type: string
@@ -255,7 +264,7 @@ spec:
                         description: Name is the unique name of the workflow step.
                         type: string
                       outputs:
-                        description: StepOutputs defines output variable of WorkflowStep
+                        description: Outputs is the outputs of the step
                         items:
                           properties:
                             name:
@@ -268,11 +277,14 @@ 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
@@ -280,8 +292,10 @@ 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/crds/core.oam.dev_workflowstepdefinitions.yaml

@@ -57,7 +57,8 @@ spec:
                 type: object
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the workflow step definition
+                  encapsulation of the workflow step definition. Only CUE schematic
+                  is supported for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -11,7 +11,10 @@ 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,9 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    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"
+    definition.oam.dev/description: Add annotations on your workload. if it generates pod, add same annotations for generated pods.
   name: annotations
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-core/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Apply components of an application in parallel for your workflow steps
   labels:
+    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/apply-application.yaml

@@ -4,8 +4,9 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Apply application for your workflow steps
+    definition.oam.dev/description: Apply application for your workflow steps, it has no arguments, should be used for custom steps before or after application applied.
   labels:
+    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/apply-object.yaml

@@ -22,9 +22,9 @@ spec:
         	cluster: parameter.cluster
         }
         parameter: {
-        	// +usage=Specify the value of the object
+        	// +usage=Specify Kubernetes native resource object to be applied
         	value: {...}
-        	// +usage=Specify the cluster of the object
+        	// +usage=The cluster you want to apply the resource to, default is the current control plane cluster
         	cluster: *"" | string
         }
 

charts/vela-core/templates/defwithtemplate/apply-once.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: PolicyDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Configure the behaviour of preventing configuration drift.
+    definition.oam.dev/description: Allow configuration drift for applied resources, delivery the resource without continuously reconciliation.
   name: apply-once
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-core/templates/defwithtemplate/apply-remaining.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Apply remaining components and traits
   labels:
+    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
   namespace: {{ include "systemDefinitionNamespace" . }}

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

@@ -0,0 +1,81 @@
+# 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,13 +5,14 @@ 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,13 +5,14 @@ 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:
@@ -71,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: *#PatchParams | close({
+        parameter: close(#PatchParams) | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

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

@@ -5,13 +5,12 @@ 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"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
+        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -275,7 +275,7 @@ spec:
         	}
         }
         exposePorts: [
-        	for v in parameter.ports if v.expose == true {
+        	if parameter.ports != _|_ 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"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
+        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
         		if type == "pvc" {
         			claimName: string
         		}

charts/vela-core/templates/defwithtemplate/depends-on-app.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: check or install depends-on Application
+    definition.oam.dev/description: Wait for the specified Application to complete.
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: depends-on-app

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Deploy cloud resource and bind secret to clusters
+    definition.oam.dev/description: Deploy cloud resource and deliver secret to multi clusters.
   name: deploy-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Deploy components with policies.
+    definition.oam.dev/description: A powerful and unified deploy step for components multi-cluster delivery with policies.
   name: deploy
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -21,9 +21,9 @@ spec:
         	ignoreTerraformComponent: parameter.ignoreTerraformComponent
         }
         parameter: {
-        	//+usage=If set false, the workflow will be suspend before this step.
+        	//+usage=If set to false, the workflow will suspend automatically before this step, default to be true.
         	auto: *true | bool
-        	//+usage=Declare the policies used for this step.
+        	//+usage=Declare the policies that used for this deployment. If not specified, the components will be deployed to the hub cluster.
         	policies?: [...string]
         	//+usage=Maximum number of concurrent delivered components.
         	parallelism: *5 | int

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

@@ -6,6 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy env binding component to target env
   labels:
+    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2env
   namespace: {{ include "systemDefinitionNamespace" . }}

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

@@ -6,6 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy application to runtime clusters
   labels:
+    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{ include "systemDefinitionNamespace" . }}
@@ -18,10 +19,10 @@ spec:
         )
 
         app: op.#Steps & {
-        	load: op.#Load @step(1)
+        	load: op.#Load
         	clusters: [...string]
         	if parameter.clusters == _|_ {
-        		listClusters: op.#ListClusters @step(2)
+        		listClusters: op.#ListClusters
         		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
@@ -37,7 +38,7 @@ spec:
         				}
         			}
         		}
-        	} @step(3)
+        	}
         }
         parameter: {
         	// +usage=Declare the runtime clusters to apply, if empty, all runtime clusters will be used

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

@@ -5,13 +5,14 @@ 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/envbinding.yaml

@@ -22,7 +22,7 @@ spec:
         	traits?: [...{
         		type: string
         		properties?: {...}
-        		// +usage=Specify if the trait shoued be remove, default false
+        		// +usage=Specify if the trait should be remove, default false
         		disable: *false | bool
         	}]
         }

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

@@ -0,0 +1,64 @@
+# 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/export2config.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Export data to config map for your workflow steps
+    definition.oam.dev/description: Export data to specified Kubernetes ConfigMap in your workflow.
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2config

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Export data to secret for your workflow steps
+    definition.oam.dev/description: Export data to Kubernetes Secret in your workflow.
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
@@ -46,7 +46,7 @@ spec:
         	type?: string
         	// +usage=Specify the data of secret
         	data: {}
-        	// +usage=Specify the cluster of the config map
+        	// +usage=Specify the cluster of the secret
         	cluster: *"" | string
         }
 

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

@@ -5,11 +5,12 @@ 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,7 +9,8 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - '*'
+    - deployments.apps
+    - statefulsets.apps
   podDisruptive: false
   schematic:
     cue:
@@ -85,7 +86,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.
+        	// +usage=Specify the secret name you want to quote to use tls.
         	secretName?: string
 
         	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
@@ -93,11 +94,11 @@ spec:
         }
   status:
     customStatus: |-
-      let igs = context.outputs.ingress.status.loadBalancer.ingress
-      if igs == _|_ {
+      if context.outputs.ingress.status.loadBalancer.ingress == _|_ {
         message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
-      if len(igs) > 0 {
+      if context.outputs.ingress.status.loadBalancer.ingress != _|_ {
+      	let igs = context.outputs.ingress.status.loadBalancer.ingress
         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,13 +5,14 @@ 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

@@ -1,41 +0,0 @@
-# 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,13 +5,14 @@ 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,9 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    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"
+    definition.oam.dev/description: Add labels on your workload. if it generates pod, add same label for generated pods.
   name: labels
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,13 +5,14 @@ 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,7 +11,10 @@ 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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Send message to webhook
+    definition.oam.dev/description: Send notifications to Email, DingTalk, Slack, Lark or webhook in your workflow.
   name: notification
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -17,19 +17,21 @@ spec:
         )
 
         parameter: {
+        	// +usage=Please fulfill its url and message if you want to send Lark messages
         	lark?: {
         		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
+        			// +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
         			}
-        		}
-        		// +useage=Specify the message that you want to sent
+        		})
+        		// +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
         			msg_type: string
@@ -37,88 +39,93 @@ spec:
         			content: string
         		}
         	}
-
+        	// +usage=Please fulfill its url and message if you want to send DingTalk messages
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
+        			// +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
         			}
-        		}
-        		// +useage=Specify the message that you want to sent
+        		})
+        		// +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: {
-        			text?: *null | {
+        			// +usage=Specify the message content of dingtalk notification
+        			text?: *null | close({
         				content: string
-        			}
+        			})
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
         			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
-        			link?:   *null | {
+        			link?:   *null | close({
         				text?:       string
         				title?:      string
         				messageUrl?: string
         				picUrl?:     string
-        			}
-        			markdown?: *null | {
+        			})
+        			markdown?: *null | close({
         				text:  string
         				title: string
-        			}
-        			at?: *null | {
+        			})
+        			at?: *null | close({
         				atMobiles?: *null | [...string]
         				isAtAll?:   bool
-        			}
-        			actionCard?: *null | {
+        			})
+        			actionCard?: *null | close({
         				text:           string
         				title:          string
         				hideAvatar:     string
         				btnOrientation: string
         				singleTitle:    string
         				singleURL:      string
-        				btns:           *null | [...*null | {
+        				btns:           *null | close([...*null | close({
         					title:     string
         					actionURL: string
-        				}]
-        			}
-        			feedCard?: *null | {
-        				links: *null | [...*null | {
+        				})])
+        			})
+        			feedCard?: *null | close({
+        				links: *null | close([...*null | close({
         					text?:       string
         					title?:      string
         					messageUrl?: string
         					picUrl?:     string
-        				}]
-        			}
+        				})])
+        			})
         		}
         	}
-
+        	// +usage=Please fulfill its url and message if you want to send Slack messages
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
+        			// +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
         			}
-        		}
-        		// +useage=Specify the message that you want to sent
+        		})
+        		// +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 | [...block]
-        			attachments?: *null | {
-        				blocks?: *null | [...block]
+        			blocks?:      *null | close([...block])
+        			attachments?: *null | close({
+        				blocks?: *null | close([...block])
         				color?:  string
-        			}
+        			})
         			thread_ts?: string
-        			mrkdwn?:    *true | bool
+        			// +usage=Specify the message text format in markdown for slack notification
+        			mrkdwn?: *true | bool
         		}
         	}
-
+        	// +usage=Please fulfill its from, to and content if you want to send email
         	email?: {
         		// +usage=Specify the email info that you want to send from
         		from: {
@@ -127,16 +134,17 @@ spec:
         			// +usage=The alias is the email alias to show after sending the email
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
-        			password: {
+        			password: close({
+        				// +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
@@ -219,8 +227,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])}
         			ding2:       op.#DingTalk & {
         				message: parameter.dingding.message
         				dingUrl: stringValue.str
@@ -248,8 +255,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])}
         			lark2:       op.#Lark & {
         				message: parameter.lark.message
         				larkUrl: stringValue.str
@@ -277,8 +283,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])}
         			slack2:      op.#Slack & {
         				message:  parameter.slack.message
         				slackUrl: stringValue.str
@@ -316,8 +321,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])}
         			email2:      op.#SendEmail & {
         				from: {
         					address: parameter.email.from.address

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: PolicyDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Override configuration when deploying resources
+    definition.oam.dev/description: Describe the configuration to override when deploying resources, it only works with specified `deploy` step in workflow.
   name: override
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -16,11 +16,15 @@ spec:
         	name?: string
         	// +usage=Specify the type of the patch component.
         	type?: string
+        	// +usage=Specify the properties to override.
         	properties?: {...}
+        	// +usage=Specify the traits to override.
         	traits?: [...{
+        		// +usage=Specify the type of the trait to be patched.
         		type: string
+        		// +usage=Specify the properties to override.
         		properties?: {...}
-        		// +usage=Specify if the trait shoued be remove, default false
+        		// +usage=Specify if the trait should be remove, default false
         		disable: *false | bool
         	}]
         }

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

@@ -6,11 +6,13 @@ 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/read-object.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Read objects for your workflow steps
+    definition.oam.dev/description: Read Kubernetes objects from cluster for your workflow steps
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: read-object
@@ -50,15 +50,15 @@ spec:
         	}
         }
         parameter: {
-        	// +usage=Specify the apiVersion of the object, defaults to core.oam.dev/v1beta1
+        	// +usage=Specify the apiVersion of the object, defaults to 'core.oam.dev/v1beta1'
         	apiVersion?: string
         	// +usage=Specify the kind of the object, defaults to Application
         	kind?: string
         	// +usage=Specify the name of the object
         	name: string
-        	// +usage=Specify the namespace of the object
-        	namespace?: string
-        	// +usage=Specify the cluster of the object
+        	// +usage=The namespace of the resource you want to read
+        	namespace?: *"default" | string
+        	// +usage=The cluster you want to apply the resource to, default is the current control plane cluster
         	cluster: *"" | string
         }
 

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

@@ -1,50 +0,0 @@
-# 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

@@ -0,0 +1,20 @@
+# 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,13 +5,14 @@ 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,7 +9,8 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - '*'
+    - deployments.apps
+    - statefulsets.apps
   podDisruptive: false
   schematic:
     cue:

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

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

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

@@ -11,7 +11,10 @@ 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

@@ -0,0 +1,38 @@
+# 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,13 +5,14 @@ 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/step-group.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: step group
+    definition.oam.dev/description: A special step that you can declare 'subSteps' in it, 'subSteps' is an array containing any step type whose valid parameters do not include the `step-group` step type itself. The sub steps were executed in parallel.
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: step-group
@@ -13,6 +13,6 @@ spec:
   schematic:
     cue:
       template: |
-        // no parameters
-        parameter: {}
+        // no parameters, the nop only to make the template not empty or it's invalid
+        nop: {}
 

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

@@ -10,6 +10,9 @@ metadata:
 spec:
   appliesToWorkloads:
     - deployments.apps
+    - statefulsets.apps
+    - daemonsets.apps
+    - jobs.batch
   podDisruptive: true
   schematic:
     cue:

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Suspend your workflow
+    definition.oam.dev/description: Suspend the current workflow, it can be resumed by 'vela workflow resume' command.
   name: suspend
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

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

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: PolicyDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Determining the destination where components should be deployed to.
+    definition.oam.dev/description: Describe the destination where components should be deployed to.
   name: topology
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -13,7 +13,7 @@ spec:
       template: |
         parameter: {
         	// +usage=Specify the names of the clusters to select.
-        	cluster?: [...string]
+        	clusters?: [...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"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
+        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -1,249 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/deprecated/webhook-notification.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Send message to webhook. This definition is DEPRECATED, please use 'notification' instead.
-  labels:
-    custom.definition.oam.dev/deprecated: "true"
-  name: webhook-notification
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/base64"
-        )
-
-        parameter: {
-        	dingding?: {
-        		url: value | secretRef
-        		message: {
-        			text?: *null | {
-        				content: string
-        			}
-        			// +usage=msgType can be text, link, mardown, actionCard, feedCard
-        			msgtype: string
-        			link?:   *null | {
-        				text?:       string
-        				title?:      string
-        				messageUrl?: string
-        				picUrl?:     string
-        			}
-        			markdown?: *null | {
-        				text:  string
-        				title: string
-        			}
-        			at?: *null | {
-        				atMobiles?: *null | [...string]
-        				isAtAll?:   bool
-        			}
-        			actionCard?: *null | {
-        				text:           string
-        				title:          string
-        				hideAvatar:     string
-        				btnOrientation: string
-        				singleTitle:    string
-        				singleURL:      string
-        				btns:           *null | [...*null | {
-        					title:     string
-        					actionURL: string
-        				}]
-        			}
-        			feedCard?: *null | {
-        				links: *null | [...*null | {
-        					text?:       string
-        					title?:      string
-        					messageUrl?: string
-        					picUrl?:     string
-        				}]
-        			}
-        		}
-        	}
-
-        	slack?: {
-        		url: value | secretRef
-        		message: {
-        			text:         string
-        			blocks?:      *null | [...block]
-        			attachments?: *null | {
-        				blocks?: *null | [...block]
-        				color?:  string
-        			}
-        			thread_ts?: string
-        			mrkdwn?:    *true | bool
-        		}
-        	}
-
-        	email?: {
-        		from: {
-        			address:  string
-        			alias?:   string
-        			password: value | secretRef
-        			host:     string
-        			port:     *587 | int
-        		}
-        		to: [...string]
-        		content: {
-        			subject: string
-        			body:    string
-        		}
-        	}
-        }
-        block: {
-        	type:      string
-        	block_id?: string
-        	elements?: [...{
-        		type:       string
-        		action_id?: string
-        		url?:       string
-        		value?:     string
-        		style?:     string
-        		text?:      textType
-        		confirm?: {
-        			title:   textType
-        			text:    textType
-        			confirm: textType
-        			deny:    textType
-        			style?:  string
-        		}
-        		options?: [...option]
-        		initial_options?: [...option]
-        		placeholder?:  textType
-        		initial_date?: string
-        		image_url?:    string
-        		alt_text?:     string
-        		option_groups?: [...option]
-        		max_selected_items?: int
-        		initial_value?:      string
-        		multiline?:          bool
-        		min_length?:         int
-        		max_length?:         int
-        		dispatch_action_config?: trigger_actions_on?: [...string]
-        		initial_time?: string
-        	}]
-        }
-        textType: {
-        	type:      string
-        	text:      string
-        	emoji?:    bool
-        	verbatim?: bool
-        }
-        option: {
-        	text:         textType
-        	value:        string
-        	description?: textType
-        	url?:         string
-        }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
-        // send webhook notification
-        ding: op.#Steps & {
-        	if parameter.dingding != _|_ {
-        		if parameter.dingding.url.value != _|_ {
-        			ding1: op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: parameter.dingding.url.value
-        			}
-        		}
-        		if parameter.dingding.url.secretRef != _|_ && parameter.dingding.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					apiVersion: "v1"
-        					kind:       "Secret"
-        					metadata: {
-        						name:      parameter.dingding.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			ding2:       op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        slack: op.#Steps & {
-        	if parameter.slack != _|_ {
-        		if parameter.slack.url.value != _|_ {
-        			slack1: op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: parameter.slack.url.value
-        			}
-        		}
-        		if parameter.slack.url.secretRef != _|_ && parameter.slack.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.slack.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			slack2:      op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        email: op.#Steps & {
-        	if parameter.email != _|_ {
-        		if parameter.email.from.password.value != _|_ {
-        			email1: op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: parameter.email.from.password.value
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-
-        		if parameter.email.from.password.secretRef != _|_ && parameter.email.from.password.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.email.from.password.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			email2:      op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: stringValue.str
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-        	}
-        }
-

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Send webhook request to the url
+    definition.oam.dev/description: Send a request to the specified Webhook URL. If no request body is specified, the current Application body will be sent by default.
   name: webhook
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -57,29 +57,28 @@ spec:
         			}
         		} @step(5)
 
-        		decoded:     base64.Decode(null, read.value.data[parameter.url.secretRef.key]) @step(6)
-        		stringValue: op.#ConvertString & {bt:                                          decoded} @step(7)
+        		stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.url.secretRef.key])} @step(6)
         		http:        op.#HTTPPost & {
         			url: stringValue.str
         			request: {
         				body: data.value
         				header: "Content-Type": "application/json"
         			}
-        		} @step(8)
+        		} @step(7)
         	}
         }
         parameter: {
         	// +usage=Specify the webhook url
-        	url: {
+        	url: close({
         		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

@@ -297,7 +297,7 @@ spec:
         	}
         }
         exposePorts: [
-        	for v in parameter.ports if v.expose == true {
+        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
@@ -306,6 +306,9 @@ spec:
         		if v.name == _|_ {
         			name: "port-" + strconv.FormatInt(v.port, 10)
         		}
+        		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
+        			nodePort: v.nodePort
+        		}
         	},
         ]
         outputs: {
@@ -354,6 +357,8 @@ spec:
         		protocol: *"TCP" | "UDP" | "SCTP"
         		// +usage=Specify if the port should be exposed
         		expose: *false | bool
+        		// +usage=exposed node port. Only Valid when exposeType is NodePort
+        		nodePort?: int
         	}]
 
         	// +ignore
@@ -453,8 +458,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
+        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
         		if type == "pvc" {
         			claimName: string
         		}

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

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

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

@@ -33,7 +33,7 @@ kind: ClusterRole
 metadata:
   name: {{ include "kubevela.fullname" . }}:manager
 rules:
-  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev"]
+  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev", "standard.oam.dev"]
     resources: ["*"]
     verbs: ["*"]
   - apiGroups: ["cluster.open-cluster-management.io"]
@@ -218,6 +218,9 @@ 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"