Fix: the create time of the synced policies is zero (#4610)

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit 29436e6d23)

Co-authored-by: barnettZQG <barnett.zqg@gmail.com>

.github/CODEOWNERS

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

.github/workflows/apiserver-test.yaml

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

.github/workflows/definition-lint.yml

@@ -1,44 +0,0 @@
-name: Definition-Lint
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-
-env:
-  # Common versions
-  GO_VERSION: '1.19'
-
-jobs:
-  definition-doc:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.9
-        with:
-          version: v1.20
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Definition Doc generate check
-        run: |
-          go build -o docgen hack/docgen/def/gen.go
-          ./docgen --type=comp --force-example-doc --path=./comp-def-check.md
-          ./docgen --type=trait --force-example-doc --path=./trait-def-check.md
-          ./docgen --type=wf --force-example-doc --path=./wf-def-check.md
-          ./docgen --type=policy --force-example-doc --path=./policy-def-check.md

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

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

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

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

.github/workflows/e2e-test.yml

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

.github/workflows/go.yml

@@ -13,8 +13,9 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.19'
-  GOLANGCI_VERSION: 'v1.49'
+  GO_VERSION: '1.17'
+  GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
 
 jobs:
 
@@ -56,7 +57,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Install StaticCheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@2022.1
+        run: GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@v0.3.0
 
       - name: Static Check
         run: staticcheck ./...
@@ -117,9 +118,6 @@ jobs:
         with:
           node-version: '14'
 
-      - name: Install StaticCheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@2022.1
-
       - name: Cache Go Dependencies
         uses: actions/cache@v2
         with:
@@ -134,42 +132,7 @@ jobs:
         run: make cross-build
 
       - name: Check Diff
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
-          export PATH=$(pwd)/bin/:$PATH
-          make check-diff
+        run: make check-diff
               
       - name: Cleanup binary
         run: make build-cleanup
-
-  check-windows:
-    runs-on: windows-latest
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Setup Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v2
-        with:
-          path: .work/pkg
-          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-pkg-
-
-      - name: Run Build CLI
-        run: make vela-cli
-
-      - name: Run CLI for version
-        shell: cmd
-        run: |
-          move .\bin\vela .\bin\vela.exe
-          .\bin\vela.exe version

.github/workflows/issue-commands.yml

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

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.17
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
@@ -150,15 +150,11 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: cli-artifacts
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - shell: bash
         working-directory: cli-artifacts
         run: |
           for file in *
           do
-            sed -i "s/\/vela/-${{ env.VELA_VERSION }}/g" ${file}
-            sed -i "s/\/kubectl-vela/-${{ env.VELA_VERSION }}/g" ${file}
             cat ${file} >> sha256sums.txt
           done
       - name: Upload Checksums

.github/workflows/sync-api.yml

@@ -14,8 +14,8 @@ jobs:
       - name: Set up Go 1.17
         uses: actions/setup-go@v1
         env:
-          GO_VERSION: '1.19'
-          GOLANGCI_VERSION: 'v1.49'
+          GO_VERSION: '1.17'
+          GOLANGCI_VERSION: 'v1.38'
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go

.github/workflows/unit-test.yml

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

.gitignore

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

.golangci.yml

@@ -38,7 +38,7 @@ linters-settings:
     # report about shadowed variables
     check-shadowing: false
 
-  revive:
+  golint:
     # minimal confidence for issues, default is 0.8
     min-confidence: 0.8
 
@@ -116,20 +116,11 @@ linters:
     - goconst
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.
-    - revive
+    - golint
     - unconvert
     - misspell
     - nakedret
-    - exportloopref
-  disable:
-    - deadcode
-    - scopelint
-    - structcheck
-    - varcheck
-    - rowserrcheck
-    - sqlclosecheck
-    - errchkjson
-    - contextcheck
+
   presets:
     - bugs
     - unused
@@ -146,7 +137,7 @@ issues:
         - errcheck
         - dupl
         - gosec
-        - exportloopref
+        - scopelint
         - unparam
 
     # Ease some gocritic warnings on test files.
@@ -195,15 +186,7 @@ issues:
 
     - text: "don't use an underscore"
       linters:
-        - revive
-
-    - text: "package-comments: should have a package comment"
-      linters:
-        - revive
-
-    - text: "error-strings: error strings should not be capitalized or end with punctuation or a newline"
-      linters:
-        - revive
+        - golint
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Dockerfile.apiserver

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace

Dockerfile.cli

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the cli binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace

Dockerfile.e2e

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

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

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

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

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

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

apis/core.oam.dev/condition/condition.go

@@ -31,7 +31,7 @@ import (
 )
 
 // A ConditionType represents a condition a resource could be in.
-// nolint
+// nolint:golint
 type ConditionType string
 
 // Condition types.
@@ -45,7 +45,7 @@ const (
 )
 
 // A ConditionReason represents the reason a resource is in a condition.
-// nolint
+// nolint:golint
 type ConditionReason string
 
 // Reasons a resource is or is not ready.

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

@@ -23,17 +23,8 @@ import (
 const (
 	// ApplyOncePolicyType refers to the type of configuration drift policy
 	ApplyOncePolicyType = "apply-once"
-	// ApplyOnceStrategyOnAppUpdate policy takes effect on application updating
-	ApplyOnceStrategyOnAppUpdate ApplyOnceAffectStrategy = "onUpdate"
-	// ApplyOnceStrategyOnAppStateKeep policy takes effect on application state keep
-	ApplyOnceStrategyOnAppStateKeep ApplyOnceAffectStrategy = "onStateKeep"
-	// ApplyOnceStrategyAlways policy takes effect always
-	ApplyOnceStrategyAlways ApplyOnceAffectStrategy = "always"
 )
 
-// ApplyOnceAffectStrategy is a string that mark the policy effective stage
-type ApplyOnceAffectStrategy string
-
 // ApplyOncePolicySpec defines the spec of preventing configuration drift
 type ApplyOncePolicySpec struct {
 	Enable bool `json:"enable"`
@@ -54,9 +45,6 @@ type ApplyOnceStrategy struct {
 	// Path the specified path that allow configuration drift
 	// like 'spec.template.spec.containers[0].resources' and '*' means the whole target allow configuration drift
 	Path []string `json:"path"`
-	// ApplyOnceAffectStrategy Decide when the strategy will take effect
-	// like affect:onUpdate/onStateKeep/always
-	ApplyOnceAffectStrategy ApplyOnceAffectStrategy `json:"affect"`
 }
 
 // FindStrategy find apply-once strategy for target resource

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

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

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

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

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

@@ -27,8 +27,6 @@ const (
 	DebugPolicyType = "debug"
 	// SharedResourcePolicyType refers to the type of shared resource policy
 	SharedResourcePolicyType = "shared-resource"
-	// ReplicationPolicyType refers to the type of replication policy
-	ReplicationPolicyType = "replication"
 )
 
 // TopologyPolicySpec defines the spec of topology policy
@@ -49,10 +47,6 @@ type Placement struct {
 	// Exclusive to "clusters"
 	ClusterLabelSelector map[string]string `json:"clusterLabelSelector,omitempty"`
 
-	// AllowEmpty ignore empty cluster error when no cluster returned for label
-	// selector
-	AllowEmpty bool `json:"allowEmpty,omitempty"`
-
 	// DeprecatedClusterSelector is a depreciated alias for ClusterLabelSelector.
 	// Deprecated: Use clusterLabelSelector instead.
 	DeprecatedClusterSelector map[string]string `json:"clusterSelector,omitempty"`
@@ -83,11 +77,3 @@ func (in SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructu
 	}
 	return false
 }
-
-// ReplicationPolicySpec defines the spec of replication policy
-// Override policy should be used together with replication policy to select the deployment target components
-type ReplicationPolicySpec struct {
-	Keys []string `json:"keys,omitempty"`
-	// Selector is the subset of selected components which will be replicated.
-	Selector []string `json:"selector,omitempty"`
-}

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

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

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

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

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

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

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

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

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

@@ -138,8 +138,7 @@ type TraitDefinitionSpec struct {
 	// +optional
 	ConflictsWith []string `json:"conflictsWith,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the trait.
-	// Only CUE and Kube schematic are supported for now.
+	// Schematic defines the data format and template of the encapsulation of the trait
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 
@@ -155,32 +154,14 @@ 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"`
-
-	// Stage defines the stage information to which this trait resource processing belongs.
-	// Currently, PreDispatch and PostDispatch are provided, which are used to control resource
-	// pre-process and post-process respectively.
-	// +optional
-	Stage StageType `json:"stage,omitempty"`
 }
 
-// StageType describes how the manifests should be dispatched.
-// Only one of the following stage types may be specified.
-// If none of the following types is specified, the default one
-// is DefaultDispatch.
-type StageType string
-
-const (
-	// PreDispatch means that pre dispatch for manifests
-	PreDispatch StageType = "PreDispatch"
-	// DefaultDispatch means that default dispatch for manifests
-	DefaultDispatch StageType = "DefaultDispatch"
-	// PostDispatch means that post dispatch for manifests
-	PostDispatch StageType = "PostDispatch"
-)
-
 // TraitDefinitionStatus is the status of TraitDefinition
 type TraitDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource

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

@@ -29,8 +29,7 @@ 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.
-	// Only CUE schematic is supported for now.
+	// Schematic defines the data format and template of the encapsulation of the policy definition
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 

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

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

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

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

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

@@ -29,8 +29,7 @@ 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.
-	// Only CUE schematic is supported for now.
+	// Schematic defines the data format and template of the encapsulation of the workflow step definition
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 }

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

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

apis/types/multicluster.go

@@ -39,18 +39,4 @@ const (
 var (
 	// AnnotationClusterAlias the annotation key for cluster alias
 	AnnotationClusterAlias = config.MetaApiGroupName + "/cluster-alias"
-
-	// AnnotationClusterVersion the annotation key for cluster version
-	AnnotationClusterVersion = config.MetaApiGroupName + "/cluster-version"
 )
-
-// ClusterVersion defines the Version info of managed clusters.
-type ClusterVersion struct {
-	Major      string `json:"major"`
-	Minor      string `json:"minor"`
-	GitVersion string `json:"gitVersion,omitempty"`
-	Platform   string `json:"platform,omitempty"`
-}
-
-// ControlPlaneClusterVersion will be the default value of cluster info if managed cluster version get error, it will have value when vela-core started.
-var ControlPlaneClusterVersion ClusterVersion

apis/types/types.go

@@ -64,8 +64,6 @@ const (
 	LabelDefinitionDeprecated = "custom.definition.oam.dev/deprecated"
 	// LabelDefinitionHidden is the label which describe whether the capability is hidden by UI
 	LabelDefinitionHidden = "custom.definition.oam.dev/ui-hidden"
-	// LabelDefinitionScope is the label which describe whether the capability's scope
-	LabelDefinitionScope = "custom.definition.oam.dev/scope"
 	// LabelNodeRoleGateway gateway role of node
 	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
 	// LabelNodeRoleWorker worker role of node
@@ -76,9 +74,9 @@ const (
 	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
 	// AnnoIngressControllerHost define ingress controller externally host
 	AnnoIngressControllerHost = "ingress.controller/host"
-	// LabelConfigType is the label marked as the template that generated the config.
+	// LabelConfigType is the label for config type
 	LabelConfigType = "config.oam.dev/type"
-	// LabelConfigCatalog is the label marked as the secret generated from the config.
+	// LabelConfigCatalog is the label for config catalog
 	LabelConfigCatalog = "config.oam.dev/catalog"
 	// LabelConfigSubType is the sub-type for a config type
 	LabelConfigSubType = "config.oam.dev/sub-type"
@@ -88,18 +86,10 @@ const (
 	LabelConfigSyncToMultiCluster = "config.oam.dev/multi-cluster"
 	// LabelConfigIdentifier is the label for config identifier
 	LabelConfigIdentifier = "config.oam.dev/identifier"
-	// LabelConfigScope is the label for config scope
-	LabelConfigScope = "config.oam.dev/scope"
-	// AnnotationConfigSensitive is the annotation for the sensitization
-	AnnotationConfigSensitive = "config.oam.dev/sensitive"
-	// AnnotationConfigTemplateNamespace is the annotation for the template namespace
-	AnnotationConfigTemplateNamespace = "config.oam.dev/template-namespace"
 	// AnnotationConfigDescription is the annotation for config description
 	AnnotationConfigDescription = "config.oam.dev/description"
 	// AnnotationConfigAlias is the annotation for config alias
 	AnnotationConfigAlias = "config.oam.dev/alias"
-	// AnnotationConfigDistributionSpec is the annotation key of the application that distributes the configs
-	AnnotationConfigDistributionSpec = "config.oam.dev/distribution-spec"
 )
 
 const (
@@ -166,13 +156,11 @@ const (
 	// TerraformProvider is the config type for terraform provider
 	TerraformProvider = "terraform-provider"
 	// DexConnector is the config type for dex connector
-	DexConnector = "dex-connector"
+	DexConnector = "config-dex-connector"
 	// ImageRegistry is the config type for image registry
-	ImageRegistry = "image-registry"
+	ImageRegistry = "config-image-registry"
 	// HelmRepository is the config type for Helm chart repository
-	HelmRepository = "helm-repository"
-	// CatalogConfigDistribution is the catalog type
-	CatalogConfigDistribution = "config-distribution"
+	HelmRepository = "config-helm-repository"
 )
 
 const (

charts/vela-core/README.md

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

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

@@ -461,6 +461,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -621,10 +623,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -842,22 +843,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -893,9 +888,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -2209,11 +2203,10 @@ spec:
                               execution
                             properties:
                               steps:
-                                description: Steps is the mode of workflow steps execution
+                                description: WorkflowMode describes the mode of workflow
                                 type: string
                               subSteps:
-                                description: SubSteps is the mode of workflow sub
-                                  steps execution
+                                description: WorkflowMode describes the mode of workflow
                                 type: string
                             type: object
                           ref:
@@ -2224,16 +2217,14 @@ spec:
                                 step.
                               properties:
                                 dependsOn:
-                                  description: DependsOn is the dependency of the
-                                    step
                                   items:
                                     type: string
                                   type: array
                                 if:
-                                  description: If is the if condition of the step
                                   type: string
                                 inputs:
-                                  description: Inputs is the inputs of the step
+                                  description: StepInputs defines variable input of
+                                    WorkflowStep
                                   items:
                                     properties:
                                       from:
@@ -2246,8 +2237,8 @@ spec:
                                     type: object
                                   type: array
                                 meta:
-                                  description: Meta is the meta data of the workflow
-                                    step.
+                                  description: WorkflowStepMeta contains the meta
+                                    data of a workflow step
                                   properties:
                                     alias:
                                       type: string
@@ -2257,7 +2248,8 @@ spec:
                                     step.
                                   type: string
                                 outputs:
-                                  description: Outputs is the outputs of the step
+                                  description: StepOutputs defines output variable
+                                    of WorkflowStep
                                   items:
                                     properties:
                                       name:
@@ -2270,27 +2262,22 @@ spec:
                                     type: object
                                   type: array
                                 properties:
-                                  description: Properties is the properties of the
-                                    step
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
                                 subSteps:
                                   items:
-                                    description: WorkflowStepBase defines the workflow
-                                      step base
+                                    description: WorkflowSubStep defines how to execute
+                                      a workflow subStep.
                                     properties:
                                       dependsOn:
-                                        description: DependsOn is the dependency of
-                                          the step
                                         items:
                                           type: string
                                         type: array
                                       if:
-                                        description: If is the if condition of the
-                                          step
                                         type: string
                                       inputs:
-                                        description: Inputs is the inputs of the step
+                                        description: StepInputs defines variable input
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             from:
@@ -2303,8 +2290,8 @@ spec:
                                           type: object
                                         type: array
                                       meta:
-                                        description: Meta is the meta data of the
-                                          workflow step.
+                                        description: WorkflowStepMeta contains the
+                                          meta data of a workflow step
                                         properties:
                                           alias:
                                             type: string
@@ -2314,8 +2301,8 @@ spec:
                                           workflow step.
                                         type: string
                                       outputs:
-                                        description: Outputs is the outputs of the
-                                          step
+                                        description: StepOutputs defines output variable
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             name:
@@ -2328,17 +2315,11 @@ spec:
                                           type: object
                                         type: array
                                       properties:
-                                        description: Properties is the properties
-                                          of the step
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
                                       timeout:
-                                        description: Timeout is the timeout of the
-                                          step
                                         type: string
                                       type:
-                                        description: Type is the type of the workflow
-                                          step.
                                         type: string
                                     required:
                                     - name
@@ -2346,10 +2327,8 @@ spec:
                                     type: object
                                   type: array
                                 timeout:
-                                  description: Timeout is the timeout of the step
                                   type: string
                                 type:
-                                  description: Type is the type of the workflow step.
                                   type: string
                               required:
                               - name
@@ -2376,6 +2355,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -2536,10 +2517,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -2757,22 +2737,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -2808,9 +2782,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -3306,8 +3279,7 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the policy definition. Only CUE
-                            schematic is supported for now.
+                            of the encapsulation of the policy definition
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3733,8 +3705,7 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the trait. Only CUE and Kube schematic
-                            are supported for now.
+                            of the encapsulation of the trait
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3888,12 +3859,10 @@ spec:
                               - configuration
                               type: object
                           type: object
-                        stage:
-                          description: Stage defines the stage information to which
-                            this trait resource processing belongs. Currently, PreDispatch
-                            and PostDispatch are provided, which are used to control
-                            resource pre-process and post-process respectively.
-                          type: string
+                        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
@@ -4009,32 +3978,19 @@ spec:
                       namespace:
                         type: string
                     type: object
-                  mode:
-                    description: WorkflowExecuteMode defines the mode of workflow
-                      execution
-                    properties:
-                      steps:
-                        description: Steps is the mode of workflow steps execution
-                        type: string
-                      subSteps:
-                        description: SubSteps is the mode of workflow sub steps execution
-                        type: string
-                    type: object
                   steps:
                     items:
                       description: WorkflowStep defines how to execute a workflow
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -4047,7 +4003,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -4056,7 +4013,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -4069,24 +4026,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -4099,8 +4054,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -4110,7 +4065,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -4123,14 +4079,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -4138,10 +4091,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -4206,8 +4157,7 @@ spec:
                           type: object
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the workflow step definition.
-                            Only CUE schematic is supported for now.
+                            of the encapsulation of the workflow step definition
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -4811,22 +4761,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -4860,8 +4804,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

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

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

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

@@ -445,8 +445,7 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the policy definition. Only CUE
-                          schematic is supported for now.
+                          of the encapsulation of the policy definition
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -763,8 +762,7 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the trait. Only CUE and Kube schematic
-                          are supported for now.
+                          of the encapsulation of the trait
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -916,12 +914,10 @@ spec:
                             - configuration
                             type: object
                         type: object
-                      stage:
-                        description: Stage defines the stage information to which
-                          this trait resource processing belongs. Currently, PreDispatch
-                          and PostDispatch are provided, which are used to control
-                          resource pre-process and post-process respectively.
-                        type: string
+                      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
@@ -1056,8 +1052,7 @@ spec:
                         type: object
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the workflow step definition. Only
-                          CUE schematic is supported for now.
+                          of the encapsulation of the workflow step definition
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format

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

@@ -0,0 +1,134 @@
+
+---
+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,8 +60,7 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the policy definition. Only CUE schematic is supported
-                  for now.
+                  encapsulation of the policy definition
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -56,16 +56,6 @@ spec:
               applicationGeneration:
                 format: int64
                 type: integer
-              compression:
-                description: ResourceTrackerCompression the compression for ResourceTracker
-                  ManagedResources
-                properties:
-                  data:
-                    type: string
-                  type:
-                    description: Type the compression type
-                    type: string
-                type: object
               managedResources:
                 items:
                   description: ManagedResource define the resource to be managed by
@@ -79,6 +69,7 @@ spec:
                     component:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     deleted:
                       description: Deleted marks the resource to be deleted
@@ -146,6 +137,7 @@ spec:
                     cluster:
                       type: string
                     creator:
+                      description: ResourceCreatorRole defines the resource creator.
                       type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of

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

@@ -410,8 +410,7 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the trait. Only CUE and Kube schematic are supported
-                  for now.
+                  encapsulation of the trait
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format
@@ -558,12 +557,10 @@ spec:
                     - configuration
                     type: object
                 type: object
-              stage:
-                description: Stage defines the stage information to which this trait
-                  resource processing belongs. Currently, PreDispatch and PostDispatch
-                  are provided, which are used to control resource pre-process and
-                  post-process respectively.
-                type: string
+              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

@@ -1,10 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workflows.core.oam.dev
 spec:
   group: core.oam.dev
@@ -20,7 +20,7 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Workflow is the Schema for the workflow API
+        description: Workflow is the Schema for the policy API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -34,30 +34,18 @@ spec:
             type: string
           metadata:
             type: object
-          mode:
-            description: WorkflowExecuteMode defines the mode of workflow execution
-            properties:
-              steps:
-                description: Steps is the mode of workflow steps execution
-                type: string
-              subSteps:
-                description: SubSteps is the mode of workflow sub steps execution
-                type: string
-            type: object
           steps:
             items:
               description: WorkflowStep defines how to execute a workflow step.
               properties:
                 dependsOn:
-                  description: DependsOn is the dependency of the step
                   items:
                     type: string
                   type: array
                 if:
-                  description: If is the if condition of the step
                   type: string
                 inputs:
-                  description: Inputs is the inputs of the step
+                  description: StepInputs defines variable input of WorkflowStep
                   items:
                     properties:
                       from:
@@ -70,7 +58,8 @@ spec:
                     type: object
                   type: array
                 meta:
-                  description: Meta is the meta data of the workflow step.
+                  description: WorkflowStepMeta contains the meta data of a workflow
+                    step
                   properties:
                     alias:
                       type: string
@@ -79,7 +68,7 @@ spec:
                   description: Name is the unique name of the workflow step.
                   type: string
                 outputs:
-                  description: Outputs is the outputs of the step
+                  description: StepOutputs defines output variable of WorkflowStep
                   items:
                     properties:
                       name:
@@ -92,23 +81,21 @@ spec:
                     type: object
                   type: array
                 properties:
-                  description: Properties is the properties of the step
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
                 subSteps:
                   items:
-                    description: WorkflowStepBase defines the workflow step base
+                    description: WorkflowSubStep defines how to execute a workflow
+                      subStep.
                     properties:
                       dependsOn:
-                        description: DependsOn is the dependency of the step
                         items:
                           type: string
                         type: array
                       if:
-                        description: If is the if condition of the step
                         type: string
                       inputs:
-                        description: Inputs is the inputs of the step
+                        description: StepInputs defines variable input of WorkflowStep
                         items:
                           properties:
                             from:
@@ -121,7 +108,8 @@ spec:
                           type: object
                         type: array
                       meta:
-                        description: Meta is the meta data of the workflow step.
+                        description: WorkflowStepMeta contains the meta data of a
+                          workflow step
                         properties:
                           alias:
                             type: string
@@ -130,7 +118,7 @@ spec:
                         description: Name is the unique name of the workflow step.
                         type: string
                       outputs:
-                        description: Outputs is the outputs of the step
+                        description: StepOutputs defines output variable of WorkflowStep
                         items:
                           properties:
                             name:
@@ -143,14 +131,11 @@ spec:
                           type: object
                         type: array
                       properties:
-                        description: Properties is the properties of the step
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                       timeout:
-                        description: Timeout is the timeout of the step
                         type: string
                       type:
-                        description: Type is the type of the workflow step.
                         type: string
                     required:
                     - name
@@ -158,10 +143,8 @@ spec:
                     type: object
                   type: array
                 timeout:
-                  description: Timeout is the timeout of the step
                   type: string
                 type:
-                  description: Type is the type of the workflow step.
                   type: string
               required:
               - name
@@ -171,3 +154,146 @@ spec:
         type: object
     served: true
     storage: true
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: Workflow defines workflow steps and other attributes
+        properties:
+          mode:
+            description: WorkflowExecuteMode defines the mode of workflow execution
+            properties:
+              steps:
+                description: WorkflowMode describes the mode of workflow
+                type: string
+              subSteps:
+                description: WorkflowMode describes the mode of workflow
+                type: string
+            type: object
+          ref:
+            type: string
+          steps:
+            items:
+              description: WorkflowStep defines how to execute a workflow step.
+              properties:
+                dependsOn:
+                  items:
+                    type: string
+                  type: array
+                if:
+                  type: string
+                inputs:
+                  description: StepInputs defines variable input of WorkflowStep
+                  items:
+                    properties:
+                      from:
+                        type: string
+                      parameterKey:
+                        type: string
+                    required:
+                    - from
+                    - parameterKey
+                    type: object
+                  type: array
+                meta:
+                  description: WorkflowStepMeta contains the meta data of a workflow
+                    step
+                  properties:
+                    alias:
+                      type: string
+                  type: object
+                name:
+                  description: Name is the unique name of the workflow step.
+                  type: string
+                outputs:
+                  description: StepOutputs defines output variable of WorkflowStep
+                  items:
+                    properties:
+                      name:
+                        type: string
+                      valueFrom:
+                        type: string
+                    required:
+                    - name
+                    - valueFrom
+                    type: object
+                  type: array
+                properties:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                subSteps:
+                  items:
+                    description: WorkflowSubStep defines how to execute a workflow
+                      subStep.
+                    properties:
+                      dependsOn:
+                        items:
+                          type: string
+                        type: array
+                      if:
+                        type: string
+                      inputs:
+                        description: StepInputs defines variable input of WorkflowStep
+                        items:
+                          properties:
+                            from:
+                              type: string
+                            parameterKey:
+                              type: string
+                          required:
+                          - from
+                          - parameterKey
+                          type: object
+                        type: array
+                      meta:
+                        description: WorkflowStepMeta contains the meta data of a
+                          workflow step
+                        properties:
+                          alias:
+                            type: string
+                        type: object
+                      name:
+                        description: Name is the unique name of the workflow step.
+                        type: string
+                      outputs:
+                        description: StepOutputs defines output variable of WorkflowStep
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            valueFrom:
+                              type: string
+                          required:
+                          - name
+                          - valueFrom
+                          type: object
+                        type: array
+                      properties:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      timeout:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                    - name
+                    - type
+                    type: object
+                  type: array
+                timeout:
+                  type: string
+                type:
+                  type: string
+              required:
+              - name
+              - type
+              type: object
+            type: array
+        type: object
+    served: true
+    storage: false
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

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

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: annotations: {
         		for k, v in parameter {
-        			(k): v
+        			"\(k)": v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: annotations: {
         			for k, v in parameter {
-        				(k): v
+        				"\(k)": v
         			}
         		}
         	}

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

@@ -7,7 +7,6 @@ metadata:
     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/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
   namespace: {{ include "systemDefinitionNamespace" . }}

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

@@ -7,7 +7,6 @@ metadata:
     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/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
   namespace: {{ include "systemDefinitionNamespace" . }}

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

@@ -1,23 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/apply-component.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Apply a specific component and its corresponding traits in application
-  labels:
-    custom.definition.oam.dev/scope: Application
-    custom.definition.oam.dev/ui-hidden: "true"
-  name: apply-component
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        parameter: {
-        	// +usage=Specify the component name to apply
-        	component: string
-        	// +usage=Specify the cluster
-        	cluster: *"" | string
-        }
-

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

@@ -12,8 +12,6 @@ spec:
     cue:
       template: |
         #ApplyOnceStrategy: {
-        	// +usage=When the strategy takes effect,e.g. onUpdate、onStateKeep
-        	affect?: string
         	// +usage=Specify the path of the resource that allow configuration drift
         	path: [...string]
         }

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

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

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

@@ -1,97 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/collect-service-endpoints.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Collect service endpoints for the application.
-  name: collect-service-endpoints
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"vela/ql"
-        	"strconv"
-        )
-
-        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_port_name_filtered: *[] | [...]
-        	if parameter.portName == _|_ {
-        		eps_port_name_filtered: collect.list
-        	}
-        	if parameter.portName != _|_ {
-        		eps_port_name_filtered: [ for ep in collect.list if parameter.portName == ep.endpoint.portName {ep}]
-        	}
-
-        	eps_port_filtered: *[] | [...]
-        	if parameter.port == _|_ {
-        		eps_port_filtered: eps_port_name_filtered
-        	}
-        	if parameter.port != _|_ {
-        		eps_port_filtered: [ for ep in eps_port_name_filtered if parameter.port == ep.endpoint.port {ep}]
-        	}
-        	eps:       eps_port_filtered
-        	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_port_filtered
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: len(outputs.endpoints) > 0
-        } @step(2)
-        value: {
-        	if len(outputs.endpoints) > 0 {
-        		endpoint: outputs.endpoints[0].endpoint
-        		_portStr: strconv.FormatInt(endpoint.port, 10)
-        		url:      "\(parameter.protocal)://\(endpoint.host):\(_portStr)"
-        	}
-        }
-        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 port name of the endpoints
-        	portName?: string
-        	// +usage=Filter the endpoint that are only outer
-        	outer?: bool
-        	// +usage=The protocal of endpoint url
-        	protocal: *"http" | "https"
-        }
-

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

@@ -48,7 +48,7 @@ spec:
         		}
         		_delArgs: {...}
         		if _params.delArgs != null {
-        			_delArgs: {for k in _params.delArgs {(k): ""}}
+        			_delArgs: {for k in _params.delArgs {"\(k)": ""}}
         		}
         		if _params.delArgs == null {
         			_delArgs: {}
@@ -63,7 +63,7 @@ spec:
         		if _params.args == null && _baseContainer.args == _|_ {
         			_args: []
         		}
-        		_argsMap: {for a in _args {(a): ""}}
+        		_argsMap: {for a in _args {"\(a)": ""}}
         		_addArgs: [...string]
         		if _params.addArgs != null {
         			_addArgs: _params.addArgs

charts/vela-core/templates/defwithtemplate/config-image-registry.yaml

@@ -0,0 +1,86 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/config-image-registry.cue
+apiVersion: core.oam.dev/v1beta1
+kind: ComponentDefinition
+metadata:
+  annotations:
+    alias.config.oam.dev: Image Registry
+    definition.oam.dev/description: Config information to authenticate image registry
+  labels:
+    catalog.config.oam.dev: velacore-config
+    custom.definition.oam.dev/ui-hidden: "true"
+    multi-cluster.config.oam.dev: "true"
+    type.config.oam.dev: image-registry
+  name: config-image-registry
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"encoding/base64"
+        	"encoding/json"
+        	"strconv"
+        )
+
+        output: {
+        	apiVersion: "v1"
+        	kind:       "Secret"
+        	metadata: {
+        		name:      context.name
+        		namespace: context.namespace
+        		labels: {
+        			"config.oam.dev/catalog":       "velacore-config"
+        			"config.oam.dev/type":          "image-registry"
+        			"config.oam.dev/multi-cluster": "true"
+        			"config.oam.dev/identifier":    parameter.registry
+        			"config.oam.dev/sub-type":      "auth"
+        		}
+        	}
+        	if parameter.auth != _|_ {
+        		type: "kubernetes.io/dockerconfigjson"
+        	}
+        	if parameter.auth == _|_ {
+        		type: "Opaque"
+        	}
+        	stringData: {
+        		if parameter.auth != _|_ && parameter.auth.username != _|_ {
+        			".dockerconfigjson": json.Marshal({
+        				auths: "\(parameter.registry)": {
+        					username: parameter.auth.username
+        					password: parameter.auth.password
+        					if parameter.auth.email != _|_ {
+        						email: parameter.auth.email
+        					}
+        					auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        				}
+        			})
+        		}
+        		if parameter.insecure != _|_ {
+        			"insecure-skip-verify": strconv.FormatBool(parameter.insecure)
+        		}
+        		if parameter.useHTTP != _|_ {
+        			"protocol-use-http": strconv.FormatBool(parameter.useHTTP)
+        		}
+        	}
+        }
+        parameter: {
+        	// +usage=Image registry FQDN, such as: index.docker.io
+        	registry: string
+        	// +usage=Authenticate the image registry
+        	auth?: {
+        		// +usage=Private Image registry username
+        		username: string
+        		// +usage=Private Image registry password
+        		password: string
+        		// +usage=Private Image registry email
+        		email?: string
+        	}
+        	// +usage=For the registry server that uses the self-signed certificate
+        	insecure?: bool
+        	// +usage=For the registry server that uses the HTTP protocol
+        	useHTTP?: bool
+        }
+  workload:
+    type: autodetects.core.oam.dev
+

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

@@ -42,7 +42,7 @@ spec:
         outputs: {
         	for v in parameter.volumes {
         		if v.data != _|_ {
-        			(v.name): {
+        			"\(v.name)": {
         				apiVersion: "v1"
         				kind:       "ConfigMap"
         				metadata: name: v.name

charts/vela-core/templates/defwithtemplate/create-config.yaml

@@ -1,44 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/create-config.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Create or update a config
-  name: create-config
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        deploy: op.#CreateConfig & {
-        	name: parameter.name
-        	if parameter.namespace != _|_ {
-        		namespace: parameter.namespace
-        	}
-        	if parameter.namespace == _|_ {
-        		namespace: context.namespace
-        	}
-        	if parameter.template != _|_ {
-        		template: parameter.template
-        	}
-        	config: parameter.config
-        }
-        parameter: {
-        	//+usage=Specify the name of the config.
-        	name: string
-
-        	//+usage=Specify the namespace of the config.
-        	namespace?: string
-
-        	//+usage=Specify the template of the config.
-        	template?: string
-
-        	//+usage=Specify the content of the config.
-        	config: {...}
-        }
-

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

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

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

@@ -15,117 +15,116 @@ spec:
         	"strconv"
         )
 
-        mountsArray: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        mountsArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
         			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-        ]
-        volumesList: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			name: v.name
-        			persistentVolumeClaim: claimName: v.claimName
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			name: v.name
-        			configMap: {
-        				defaultMode: v.defaultMode
-        				name:        v.cmName
-        				if v.items != _|_ {
-        					items: v.items
-        				}
-        			}
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			name: v.name
-        			secret: {
-        				defaultMode: v.defaultMode
-        				secretName:  v.secretName
-        				if v.items != _|_ {
-        					items: v.items
-        				}
-        			}
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			name: v.name
-        			emptyDir: medium: v.medium
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			name: v.name
-        			hostPath: path: v.path
-        		}
-        	},
-        ]
-        deDupVolumesArray: [
-        	for val in [
-        		for i, vi in volumesList {
-        			for j, vj in volumesList if j < i && vi.name == vj.name {
-        				_ignore: true
-        			}
-        			vi
         		},
-        	] if val._ignore == _|_ {
-        		val
-        	},
-        ]
+        	] | []
+
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				mountPath: v.mountPath
+        				if v.mountPropagation != _|_ {
+        					mountPropagation: v.mountPropagation
+        				}
+        				name: v.name
+        				if v.readOnly != _|_ {
+        					readOnly: v.readOnly
+        				}
+        			}
+        		},
+        	] | []
+        }
+        volumesArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				name: v.name
+        				persistentVolumeClaim: claimName: v.claimName
+        			}
+        		},
+        	] | []
+
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				name: v.name
+        				configMap: {
+        					defaultMode: v.defaultMode
+        					name:        v.cmName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
+        				}
+        			}
+        		},
+        	] | []
+
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				name: v.name
+        				secret: {
+        					defaultMode: v.defaultMode
+        					secretName:  v.secretName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
+        				}
+        			}
+        		},
+        	] | []
+
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				name: v.name
+        				emptyDir: medium: v.medium
+        			}
+        		},
+        	] | []
+
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				name: v.name
+        				hostPath: path: v.path
+        			}
+        		},
+        	] | []
+        }
         output: {
         	apiVersion: "apps/v1"
         	kind:       "DaemonSet"
@@ -211,7 +210,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray
+        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -269,14 +268,14 @@ spec:
         				}
 
         				if parameter["volumeMounts"] != _|_ {
-        					volumes: deDupVolumesArray
+        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
         				}
         			}
         		}
         	}
         }
         exposePorts: [
-        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
+        	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
@@ -429,8 +428,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

charts/vela-core/templates/defwithtemplate/delete-config.yaml

@@ -1,34 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/delete-config.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Delete a config
-  name: delete-config
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        deploy: op.#DeleteConfig & {
-        	name: parameter.name
-        	if parameter.namespace != _|_ {
-        		namespace: parameter.namespace
-        	}
-        	if parameter.namespace == _|_ {
-        		namespace: context.namespace
-        	}
-        }
-        parameter: {
-        	//+usage=Specify the name of the config.
-        	name: string
-
-        	//+usage=Specify the namespace of the config.
-        	namespace?: string
-        }
-

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

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Deploy cloud resource and deliver secret to multi clusters.
-  labels:
-    custom.definition.oam.dev/scope: Application
   name: deploy-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: A powerful and unified deploy step for components multi-cluster delivery with policies.
-  labels:
-    custom.definition.oam.dev/scope: Application
   name: deploy
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

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

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

@@ -7,7 +7,6 @@ metadata:
     definition.oam.dev/description: Deploy application to runtime clusters
   labels:
     custom.definition.oam.dev/deprecated: "true"
-    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{ include "systemDefinitionNamespace" . }}
@@ -20,10 +19,10 @@ spec:
         )
 
         app: op.#Steps & {
-        	load: op.#Load
+        	load: op.#Load @step(1)
         	clusters: [...string]
         	if parameter.clusters == _|_ {
-        		listClusters: op.#ListClusters
+        		listClusters: op.#ListClusters @step(2)
         		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
@@ -39,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

@@ -29,7 +29,7 @@ spec:
         PatchContainer: {
         	_params: #PatchParams
         	name:    _params.containerName
-        	_delKeys: {for k in _params.unset {(k): ""}}
+        	_delKeys: {for k in _params.unset {"\(k)": ""}}
         	_baseContainers: context.output.spec.template.spec.containers
         	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
         	_baseContainer: *_|_ | {...}
@@ -47,7 +47,7 @@ spec:
         			}]
         		}
         		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {(envVar.name): envVar}}
+        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar}}
         			// +patchStrategy=replace
         			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
         				name: envVar.name

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

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

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

@@ -1,79 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/export-service.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Export service to clusters specified by topology.
-  name: export-service
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        meta: {
-        	name:      *context.name | string
-        	namespace: *context.namespace | string
-        	if parameter.name != _|_ {
-        		name: parameter.name
-        	}
-        	if parameter.namespace != _|_ {
-        		namespace: parameter.namespace
-        	}
-        }
-        objects: [{
-        	apiVersion: "v1"
-        	kind:       "Service"
-        	metadata:   meta
-        	spec: {
-        		type: "ClusterIP"
-        		ports: [{
-        			protocol:   "TCP"
-        			port:       parameter.port
-        			targetPort: parameter.targetPort
-        		}]
-        	}
-        }, {
-        	apiVersion: "v1"
-        	kind:       "Endpoints"
-        	metadata:   meta
-        	subsets: [{
-        		addresses: [{ip: parameter.ip}]
-        		ports: [{port: parameter.targetPort}]
-        	}]
-        }] @step(1)
-        getPlacements: op.#GetPlacementsFromTopologyPolicies & {
-        	policies: *[] | [...string]
-        	if parameter.topology != _|_ {
-        		policies: [parameter.topology]
-        	}
-        }      @step(2)
-        apply: op.#Steps & {
-        	for p in getPlacements.placements {
-        		for o in objects {
-        			"\(p.cluster)-\(o.kind)": op.#Apply & {
-        				value:   o
-        				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 ip to be export
-        	ip: string
-        	// +usage=Specify the port to be used in service
-        	port: int
-        	// +usage=Specify the port to be export
-        	targetPort: int
-        	// +usage=Specify the topology to export
-        	topology?: string
-        }
-

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

@@ -30,15 +30,9 @@ spec:
         		]
         	}
         }
-        legacyAPI: context.clusterVersion.minor < 19
         outputs: ingress: {
-        	if legacyAPI {
-        		apiVersion: "networking.k8s.io/v1beta1"
-        	}
-        	if !legacyAPI {
-        		apiVersion: "networking.k8s.io/v1"
-        	}
-        	kind: "Ingress"
+        	apiVersion: "networking.k8s.io/v1"
+        	kind:       "Ingress"
         	metadata: {
         		name: context.name
         		annotations: {
@@ -70,17 +64,9 @@ spec:
         				for k, v in parameter.http {
         					path:     k
         					pathType: "ImplementationSpecific"
-        					backend: {
-        						if legacyAPI {
-        							serviceName: context.name
-        							servicePort: v
-        						}
-        						if !legacyAPI {
-        							service: {
-        								name: context.name
-        								port: number: v
-        							}
-        						}
+        					backend: service: {
+        						name: context.name
+        						port: number: v
         					}
         				},
         			]
@@ -108,17 +94,17 @@ spec:
         }
   status:
     customStatus: |-
-      if context.outputs.ingress.status.loadBalancer.ingress == _|_ {
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
         message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
-      if context.outputs.ingress.status.loadBalancer.ingress != _|_ {
-      	let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if len(igs) > 0 {
         if igs[0].ip != _|_ {
         	if igs[0].host != _|_ {
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
         	}
         }
         if igs[0].ip == _|_ {

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

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

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: labels: {
         		for k, v in parameter {
-        			(k): v
+        			"\(k)": v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: labels: {
         			for k, v in parameter {
-        				(k): v
+        				"\(k)": v
         			}
         		}
         	}

charts/vela-core/templates/defwithtemplate/list-config.yaml

@@ -1,33 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/list-config.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: List the configs
-  name: list-config
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        output: op.#ListConfig & {
-        	if parameter.namespace != _|_ {
-        		namespace: parameter.namespace
-        	}
-        	if parameter.namespace == _|_ {
-        		namespace: context.namespace
-        	}
-        	template: parameter.template
-        }
-        parameter: {
-        	//+usage=Specify the template of the config.
-        	template: string
-        	//+usage=Specify the namespace of the config.
-        	namespace?: string
-        }
-

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

@@ -108,7 +108,7 @@ spec:
         						portForward: parameter.portForward
         					}
         					if parameter.portForward == _|_ {
-        						portForward: ["\(parameter.port):\(parameter.port)"]
+        						portForward: ["\(parameter.port)" + ":" + "\(parameter.port)"]
         					}
         				}
         			},

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

@@ -20,17 +20,17 @@ spec:
         	// +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: close({
+        		url: {
         			// +usage=the url address content in string
         			value: string
-        		}) | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [Lark messaging](https://open.feishu.cn/document/ukTMukTMukTM/ucTM5YjL3ETO24yNxkjN#8b0f2a1b).
         		message: {
         			// +usage=msg_type can be text, post, image, interactive, share_chat, share_user, audio, media, file, sticker
@@ -42,84 +42,84 @@ spec:
         	// +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: close({
+        		url: {
         			// +usage=the url address content in string
         			value: string
-        		}) | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [dingtalk messaging](https://developers.dingtalk.com/document/robots/custom-robot-access/title-72m-8ag-pqw)
         		message: {
         			// +usage=Specify the message content of dingtalk notification
-        			text?: *null | close({
+        			text?: *null | {
         				content: string
-        			})
+        			}
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
         			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
-        			link?:   *null | close({
+        			link?:   *null | {
         				text?:       string
         				title?:      string
         				messageUrl?: string
         				picUrl?:     string
-        			})
-        			markdown?: *null | close({
+        			}
+        			markdown?: *null | {
         				text:  string
         				title: string
-        			})
-        			at?: *null | close({
+        			}
+        			at?: *null | {
         				atMobiles?: *null | [...string]
         				isAtAll?:   bool
-        			})
-        			actionCard?: *null | close({
+        			}
+        			actionCard?: *null | {
         				text:           string
         				title:          string
         				hideAvatar:     string
         				btnOrientation: string
         				singleTitle:    string
         				singleURL:      string
-        				btns:           *null | close([...*null | close({
+        				btns:           *null | [...*null | {
         					title:     string
         					actionURL: string
-        				})])
-        			})
-        			feedCard?: *null | close({
-        				links: *null | close([...*null | close({
+        				}]
+        			}
+        			feedCard?: *null | {
+        				links: *null | [...*null | {
         					text?:       string
         					title?:      string
         					messageUrl?: string
         					picUrl?:     string
-        				})])
-        			})
+        				}]
+        			}
         		}
         	}
         	// +usage=Please fulfill its url and message if you want to send Slack messages
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: close({
+        		url: {
         			// +usage=the url address content in string
         			value: string
-        		}) | close({
+        		} | {
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
         				// +usage=key is the key in the secret
         				key: string
         			}
-        		})
+        		}
         		// +usage=Specify the message that you want to sent, refer to [slack messaging](https://api.slack.com/reference/messaging/payload)
         		message: {
         			// +usage=Specify the message text for slack notification
         			text:         string
-        			blocks?:      *null | close([...block])
-        			attachments?: *null | close({
-        				blocks?: *null | close([...block])
+        			blocks?:      *null | [...block]
+        			attachments?: *null | {
+        				blocks?: *null | [...block]
         				color?:  string
-        			})
+        			}
         			thread_ts?: string
         			// +usage=Specify the message text format in markdown for slack notification
         			mrkdwn?: *true | bool
@@ -134,17 +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: close({
+        			password: {
         				// +usage=the password content in string
         				value: string
-        			}) | close({
+        			} | {
         				secretRef: {
         					// +usage=name is the name of the secret
         					name: string
         					// +usage=key is the key in the secret
         					key: string
         				}
-        			})
+        			}
         			// +usage=Specify the host of your email
         			host: string
         			// +usage=Specify the port of the email host, default to 587
@@ -227,7 +227,8 @@ spec:
         				}
         			}
 
-        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])}
+        			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
@@ -255,7 +256,8 @@ spec:
         				}
         			}
 
-        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])}
+        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
         			lark2:       op.#Lark & {
         				message: parameter.lark.message
         				larkUrl: stringValue.str
@@ -283,7 +285,8 @@ spec:
         				}
         			}
 
-        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])}
+        			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
@@ -321,7 +324,8 @@ spec:
         				}
         			}
 
-        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])}
+        			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.address

charts/vela-core/templates/defwithtemplate/print-message-in-status.yaml

@@ -1,24 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/print-message-in-status.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: print message in workflow step status
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
-  name: print-message-in-status
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        parameter: message: string
-        msg: op.#Message & {
-        	message: parameter.message
-        }
-

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

@@ -52,7 +52,7 @@ spec:
         		},
         	]
         }
-        outputs: claim: {
+        outputs: "\(parameter.claimName)": {
         	apiVersion: "v1"
         	kind:       "PersistentVolumeClaim"
         	metadata: name: parameter.claimName
@@ -67,7 +67,7 @@ spec:
         			storageClassName: parameter.storageClassName
         		}
         		resources: requests: storage: parameter.resources.requests.storage
-        		if parameter.resources.limits != _|_ {
+        		if parameter.resources.limits.storage != _|_ {
         			resources: limits: storage: parameter.resources.limits.storage
         		}
         		if parameter.dataSourceRef != _|_ {

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

@@ -1,34 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/read-config.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Read a config
-  name: read-config
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        output: op.#ReadConfig & {
-        	name: parameter.name
-        	if parameter.namespace != _|_ {
-        		namespace: parameter.namespace
-        	}
-        	if parameter.namespace == _|_ {
-        		namespace: context.namespace
-        	}
-        }
-        parameter: {
-        	//+usage=Specify the name of the config.
-        	name: string
-
-        	//+usage=Specify the namespace of the config.
-        	namespace?: string
-        }
-

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

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

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

@@ -41,8 +41,8 @@ spec:
         }
         // +patchStrategy=retainKeys
         patch: spec: template: spec: serviceAccountName: parameter.name
-        _clusterPrivileges: [ if parameter.privileges != _|_ for p in parameter.privileges if p.scope == "cluster" {p}]
-        _namespacePrivileges: [ if parameter.privileges != _|_ for p in parameter.privileges if p.scope == "namespace" {p}]
+        _clusterPrivileges: [ for p in parameter.privileges if p.scope == "cluster" {p}]
+        _namespacePrivileges: [ for p in parameter.privileges if p.scope == "namespace" {p}]
         outputs: {
         	if parameter.create {
         		"service-account": {
@@ -85,7 +85,7 @@ spec:
         				subjects: [{
         					kind:      "ServiceAccount"
         					name:      parameter.name
-        					namespace: (context.namespace)
+        					namespace: "\(context.namespace)"
         				}]
         			}
         		}

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

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
-  labels:
-    custom.definition.oam.dev/scope: Application
   name: share-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -17,14 +17,16 @@ spec:
   schematic:
     cue:
       template: |
-        volumesList: [
-        	if parameter.pvc != _|_ for v in parameter.pvc {
+        pvcVolumesList: *[
+        		for v in parameter.pvc {
         		{
         			name: "pvc-" + v.name
         			persistentVolumeClaim: claimName: v.name
         		}
         	},
-        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        ] | []
+        configMapVolumesList: *[
+        			for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name: "configmap-" + v.name
         			configMap: {
@@ -36,7 +38,9 @@ spec:
         			}
         		}
         	},
-        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        ] | []
+        secretVolumesList: *[
+        			for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name: "secret-" + v.name
         			secret: {
@@ -48,15 +52,17 @@ spec:
         			}
         		}
         	},
-        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        ] | []
+        emptyDirVolumesList: *[
+        			for v in parameter.emptyDir {
         		{
         			name: "emptydir-" + v.name
         			emptyDir: medium: v.medium
         		}
         	},
-        ]
-        volumeMountsList: [
-        	if parameter.pvc != _|_ for v in parameter.pvc {
+        ] | []
+        pvcVolumeMountsList: *[
+        			for v in parameter.pvc {
         		if v.volumeMode == "Filesystem" {
         			{
         				name:      "pvc-" + v.name
@@ -67,7 +73,9 @@ spec:
         			}
         		}
         	},
-        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        ] | []
+        configMapVolumeMountsList: *[
+        				for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name:      "configmap-" + v.name
         			mountPath: v.mountPath
@@ -76,27 +84,9 @@ spec:
         			}
         		}
         	},
-        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
-        		{
-        			name:      "secret-" + v.name
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        		}
-        	},
-        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
-        		{
-        			name:      "emptydir-" + v.name
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        		}
-        	},
-        ]
-        envList: [
-        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
+        ] | []
+        configMapEnvMountsList: *[
+        			for v in parameter.configMap if v.mountToEnv != _|_ {
         		{
         			name: v.mountToEnv.envName
         			valueFrom: configMapKeyRef: {
@@ -105,7 +95,9 @@ spec:
         			}
         		}
         	},
-        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        ] | []
+        configMountToEnvsList: *[
+        			for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
         		{
         			name: k.envName
         			valueFrom: configMapKeyRef: {
@@ -114,7 +106,20 @@ spec:
         			}
         		}
         	},
-        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
+        ] | []
+        secretVolumeMountsList: *[
+        			for v in parameter.secret if v.mountPath != _|_ {
+        		{
+        			name:      "secret-" + v.name
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
+        			}
+        		}
+        	},
+        ] | []
+        secretEnvMountsList: *[
+        			for v in parameter.secret if v.mountToEnv != _|_ {
         		{
         			name: v.mountToEnv.envName
         			valueFrom: secretKeyRef: {
@@ -123,7 +128,9 @@ spec:
         			}
         		}
         	},
-        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        ] | []
+        secretMountToEnvsList: *[
+        			for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
         		{
         			name: k.envName
         			valueFrom: secretKeyRef: {
@@ -132,7 +139,18 @@ spec:
         			}
         		}
         	},
-        ]
+        ] | []
+        emptyDirVolumeMountsList: *[
+        				for v in parameter.emptyDir {
+        		{
+        			name:      "emptydir-" + v.name
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
+        			}
+        		}
+        	},
+        ] | []
         volumeDevicesList: *[
         			for v in parameter.pvc if v.volumeMode == "Block" {
         		{
@@ -144,6 +162,7 @@ spec:
         		}
         	},
         ] | []
+        volumesList: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList
         deDupVolumesArray: [
         	for val in [
         		for i, vi in volumesList {
@@ -162,11 +181,11 @@ spec:
 
         	containers: [{
         		// +patchKey=name
-        		env: envList
+        		env: configMapEnvMountsList + secretEnvMountsList + configMountToEnvsList + secretMountToEnvsList
         		// +patchKey=name
         		volumeDevices: volumeDevicesList
         		// +patchKey=name
-        		volumeMounts: volumeMountsList
+        		volumeMounts: pvcVolumeMountsList + configMapVolumeMountsList + secretVolumeMountsList + emptyDirVolumeMountsList
         	}, ...]
 
         }

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

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

@@ -13,11 +13,9 @@ spec:
       template: |
         parameter: {
         	// +usage=Specify the names of the clusters to select.
-        	clusters?: [...string]
+        	cluster?: [...string]
         	// +usage=Specify the label selector for clusters
         	clusterLabelSelector?: [string]: string
-        	// +usage=Ignore empty cluster error
-        	allowEmpty?: bool
         	// +usage=Deprecated: Use clusterLabelSelector instead.
         	clusterSelector?: [string]: string
         	// +usage=Specify the target namespace to deploy in the selected clusters, default inherit the original namespace.

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

@@ -19,7 +19,7 @@ spec:
         patch: {
         	// +patchKey=name
         	spec: template: spec: volumes: [
-        		if parameter.volumes != _|_ for v in parameter.volumes {
+        		for v in parameter.volumes {
         			{
         				name: v.name
         				if v.type == "pvc" {
@@ -54,8 +54,8 @@ spec:
         	// +usage=Declare volumes and volumeMounts
         	volumes?: [...{
         		name: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

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

@@ -57,28 +57,29 @@ spec:
         			}
         		} @step(5)
 
-        		stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.url.secretRef.key])} @step(6)
+        		decoded:     base64.Decode(null, read.value.data[parameter.url.secretRef.key]) @step(6)
+        		stringValue: op.#ConvertString & {bt:                                          decoded} @step(7)
         		http:        op.#HTTPPost & {
         			url: stringValue.str
         			request: {
         				body: data.value
         				header: "Content-Type": "application/json"
         			}
-        		} @step(7)
+        		} @step(8)
         	}
         }
         parameter: {
         	// +usage=Specify the webhook url
-        	url: close({
+        	url: {
         		value: string
-        	}) | close({
+        	} | {
         		secretRef: {
         			// +usage=name is the name of the secret
         			name: string
         			// +usage=key is the key in the secret
         			key: string
         		}
-        	})
+        	}
         	// +usage=Specify the data you want to send
         	data?: {...}
         }

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

@@ -13,108 +13,128 @@ spec:
       template: |
         import (
         	"strconv"
-        	"strings"
         )
 
-        mountsArray: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        mountsArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				mountPath: v.mountPath
+        				if v.subPath != _|_ {
+        					subPath: v.subPath
+        				}
+        				name: v.name
         			}
-        			name: v.name
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				mountPath: v.mountPath
+        				if v.subPath != _|_ {
+        					subPath: v.subPath
+        				}
+        				name: v.name
         			}
-        			name: v.name
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				mountPath: v.mountPath
+        				if v.subPath != _|_ {
+        					subPath: v.subPath
+        				}
+        				name: v.name
         			}
-        			name: v.name
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				mountPath: v.mountPath
+        				if v.subPath != _|_ {
+        					subPath: v.subPath
+        				}
+        				name: v.name
         			}
-        			name: v.name
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				mountPath: v.mountPath
+        				if v.subPath != _|_ {
+        					subPath: v.subPath
+        				}
+        				name: v.name
         			}
-        			name: v.name
-        		}
-        	},
-        ]
-        volumesList: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			name: v.name
-        			persistentVolumeClaim: claimName: v.claimName
-        		}
-        	},
+        		},
+        	] | []
+        }
+        volumesArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				name: v.name
+        				persistentVolumeClaim: claimName: v.claimName
+        			}
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			name: v.name
-        			configMap: {
-        				defaultMode: v.defaultMode
-        				name:        v.cmName
-        				if v.items != _|_ {
-        					items: v.items
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				name: v.name
+        				configMap: {
+        					defaultMode: v.defaultMode
+        					name:        v.cmName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
         				}
         			}
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			name: v.name
-        			secret: {
-        				defaultMode: v.defaultMode
-        				secretName:  v.secretName
-        				if v.items != _|_ {
-        					items: v.items
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				name: v.name
+        				secret: {
+        					defaultMode: v.defaultMode
+        					secretName:  v.secretName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
         				}
         			}
-        		}
-        	},
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			name: v.name
-        			emptyDir: medium: v.medium
-        		}
-        	},
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				name: v.name
+        				emptyDir: medium: v.medium
+        			}
+        		},
+        	] | []
 
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			name: v.name
-        			hostPath: path: v.path
-        		}
-        	},
-        ]
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				name: v.name
+        				hostPath: path: v.path
+        			}
+        		},
+        	] | []
+        }
+        volumesList: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
         deDupVolumesArray: [
         	for val in [
         		for i, vi in volumesList {
@@ -168,11 +188,7 @@ spec:
         									name: v.name
         								}
         								if v.name == _|_ {
-        									_name: "port-" + strconv.FormatInt(v.port, 10)
-        									name:  *_name | string
-        									if v.protocol != "TCP" {
-        										name: _name + "-" + strings.ToLower(v.protocol)
-        									}
+        									name: "port-" + strconv.FormatInt(v.port, 10)
         								}
         							}}]
         					}
@@ -216,7 +232,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray
+        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -281,24 +297,14 @@ spec:
         	}
         }
         exposePorts: [
-        	if parameter.ports != _|_ for v in parameter.ports if v.expose == true {
+        	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
         		if v.name != _|_ {
         			name: v.name
         		}
         		if v.name == _|_ {
-        			_name: "port-" + strconv.FormatInt(v.port, 10)
-        			name:  *_name | string
-        			if v.protocol != "TCP" {
-        				name: _name + "-" + strings.ToLower(v.protocol)
-        			}
-        		}
-        		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
-        			nodePort: v.nodePort
-        		}
-        		if v.protocol != _|_ {
-        			protocol: v.protocol
+        			name: "port-" + strconv.FormatInt(v.port, 10)
         		}
         	},
         ]
@@ -348,8 +354,6 @@ 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
@@ -449,8 +453,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -13,117 +13,110 @@ spec:
   schematic:
     cue:
       template: |
-        mountsArray: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
+        mountsArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
         			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        			name: v.name
-        		}
-        	},
-        ]
-        volumesList: [
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        		{
-        			name: v.name
-        			persistentVolumeClaim: claimName: v.claimName
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        		{
-        			name: v.name
-        			configMap: {
-        				defaultMode: v.defaultMode
-        				name:        v.cmName
-        				if v.items != _|_ {
-        					items: v.items
-        				}
-        			}
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        		{
-        			name: v.name
-        			secret: {
-        				defaultMode: v.defaultMode
-        				secretName:  v.secretName
-        				if v.items != _|_ {
-        					items: v.items
-        				}
-        			}
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        		{
-        			name: v.name
-        			emptyDir: medium: v.medium
-        		}
-        	},
-
-        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        		{
-        			name: v.name
-        			hostPath: path: v.path
-        		}
-        	},
-        ]
-        deDupVolumesArray: [
-        	for val in [
-        		for i, vi in volumesList {
-        			for j, vj in volumesList if j < i && vi.name == vj.name {
-        				_ignore: true
-        			}
-        			vi
         		},
-        	] if val._ignore == _|_ {
-        		val
-        	},
-        ]
+        	] | []
+
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				mountPath: v.mountPath
+        				name:      v.name
+        			}
+        		},
+        	] | []
+        }
+        volumesArray: {
+        	pvc: *[
+        		for v in parameter.volumeMounts.pvc {
+        			{
+        				name: v.name
+        				persistentVolumeClaim: claimName: v.claimName
+        			}
+        		},
+        	] | []
+
+        	configMap: *[
+        			for v in parameter.volumeMounts.configMap {
+        			{
+        				name: v.name
+        				configMap: {
+        					defaultMode: v.defaultMode
+        					name:        v.cmName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
+        				}
+        			}
+        		},
+        	] | []
+
+        	secret: *[
+        		for v in parameter.volumeMounts.secret {
+        			{
+        				name: v.name
+        				secret: {
+        					defaultMode: v.defaultMode
+        					secretName:  v.secretName
+        					if v.items != _|_ {
+        						items: v.items
+        					}
+        				}
+        			}
+        		},
+        	] | []
+
+        	emptyDir: *[
+        			for v in parameter.volumeMounts.emptyDir {
+        			{
+        				name: v.name
+        				emptyDir: medium: v.medium
+        			}
+        		},
+        	] | []
+
+        	hostPath: *[
+        			for v in parameter.volumeMounts.hostPath {
+        			{
+        				name: v.name
+        				hostPath: path: v.path
+        			}
+        		},
+        	] | []
+        }
         output: {
         	apiVersion: "apps/v1"
         	kind:       "Deployment"
@@ -176,7 +169,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray
+        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -228,7 +221,7 @@ spec:
         					}]
         				}
         				if parameter["volumeMounts"] != _|_ {
-        					volumes: deDupVolumesArray
+        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
         				}
         			}
         		}
@@ -329,8 +322,8 @@ spec:
         	volumes?: [...{
         		name:      string
         		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir", default to emptyDir
-        		type: *"emptyDir" | "pvc" | "configMap" | "secret"
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
         		if type == "pvc" {
         			claimName: string
         		}

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

@@ -33,7 +33,7 @@ kind: ClusterRole
 metadata:
   name: {{ include "kubevela.fullname" . }}:manager
 rules:
-  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev", "standard.oam.dev"]
+  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev"]
     resources: ["*"]
     verbs: ["*"]
   - apiGroups: ["cluster.open-cluster-management.io"]
@@ -116,39 +116,6 @@ subjects:
     name: {{ include "kubevela.serviceAccountName" . }}
 
 ---
-# permissions to read the view of VelaQL, schemas, and templates.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "kubevela.fullname" . }}:template-reader-role
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps/status
-    verbs:
-      - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "kubevela.fullname" . }}:template-reader-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "kubevela.fullname" . }}:template-reader-role
-subjects:
-  - kind: Group
-    name: template-reader
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -251,10 +218,6 @@ spec:
             - "--feature-gates=EnableSuspendOnFailure={{- .Values.workflow.enableSuspendOnFailure | toString -}}"
             - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
             - "--feature-gates=LegacyComponentRevision={{- .Values.featureGates.enableLegacyComponentRevision | toString -}}"
-            - "--feature-gates=GzipResourceTracker={{- .Values.featureGates.gzipResourceTracker | toString -}}"
-            - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
-            - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
-            - "--feature-gates=MultiStageComponentApply= {{- .Values.featureGates.multiStageComponentApply | toString -}}"
             {{ if .Values.authentication.enabled }}
             {{ if .Values.authentication.withUser }}
             - "--authentication-with-user"

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

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

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

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

charts/vela-core/values.yaml

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

charts/vela-minimal/README.md

@@ -56,18 +56,18 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 
 ### KubeVela core parameters
 
-| Name                          | Description                                                                                   | Value                |
-| ----------------------------- | --------------------------------------------------------------------------------------------- | -------------------- |
-| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`                |
-| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`                 |
-| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`                 |
-| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`                  |
-| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`                 |
-| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `minimal`            |
-| `disableCaps`                 | Disable capability                                                                            | `envbinding,rollout` |
-| `applyOnceOnly`               | Valid applyOnceOnly values: true/false/on/off/force                                           | `off`                |
-| `enableFluxcdAddon`           | Whether to enable fluxcd addon                                                                | `false`              |
-| `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`                |
+| Name                          | Description                                                                                   | Value                                  |
+| ----------------------------- | --------------------------------------------------------------------------------------------- | -------------------------------------- |
+| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`                                  |
+| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`                                   |
+| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`                                   |
+| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`                                    |
+| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`                                   |
+| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `minimal`                              |
+| `disableCaps`                 | Disable capability                                                                            | `manualscalertrait,envbinding,rollout` |
+| `applyOnceOnly`               | Valid applyOnceOnly values: true/false/on/off/force                                           | `off`                                  |
+| `enableFluxcdAddon`           | Whether to enable fluxcd addon                                                                | `false`                                |
+| `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`                                  |
 
 
 ### KubeVela workflow parameters

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

@@ -461,6 +461,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -621,10 +623,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -842,22 +843,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -893,9 +888,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -2209,11 +2203,10 @@ spec:
                               execution
                             properties:
                               steps:
-                                description: Steps is the mode of workflow steps execution
+                                description: WorkflowMode describes the mode of workflow
                                 type: string
                               subSteps:
-                                description: SubSteps is the mode of workflow sub
-                                  steps execution
+                                description: WorkflowMode describes the mode of workflow
                                 type: string
                             type: object
                           ref:
@@ -2224,16 +2217,14 @@ spec:
                                 step.
                               properties:
                                 dependsOn:
-                                  description: DependsOn is the dependency of the
-                                    step
                                   items:
                                     type: string
                                   type: array
                                 if:
-                                  description: If is the if condition of the step
                                   type: string
                                 inputs:
-                                  description: Inputs is the inputs of the step
+                                  description: StepInputs defines variable input of
+                                    WorkflowStep
                                   items:
                                     properties:
                                       from:
@@ -2246,8 +2237,8 @@ spec:
                                     type: object
                                   type: array
                                 meta:
-                                  description: Meta is the meta data of the workflow
-                                    step.
+                                  description: WorkflowStepMeta contains the meta
+                                    data of a workflow step
                                   properties:
                                     alias:
                                       type: string
@@ -2257,7 +2248,8 @@ spec:
                                     step.
                                   type: string
                                 outputs:
-                                  description: Outputs is the outputs of the step
+                                  description: StepOutputs defines output variable
+                                    of WorkflowStep
                                   items:
                                     properties:
                                       name:
@@ -2270,27 +2262,22 @@ spec:
                                     type: object
                                   type: array
                                 properties:
-                                  description: Properties is the properties of the
-                                    step
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
                                 subSteps:
                                   items:
-                                    description: WorkflowStepBase defines the workflow
-                                      step base
+                                    description: WorkflowSubStep defines how to execute
+                                      a workflow subStep.
                                     properties:
                                       dependsOn:
-                                        description: DependsOn is the dependency of
-                                          the step
                                         items:
                                           type: string
                                         type: array
                                       if:
-                                        description: If is the if condition of the
-                                          step
                                         type: string
                                       inputs:
-                                        description: Inputs is the inputs of the step
+                                        description: StepInputs defines variable input
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             from:
@@ -2303,8 +2290,8 @@ spec:
                                           type: object
                                         type: array
                                       meta:
-                                        description: Meta is the meta data of the
-                                          workflow step.
+                                        description: WorkflowStepMeta contains the
+                                          meta data of a workflow step
                                         properties:
                                           alias:
                                             type: string
@@ -2314,8 +2301,8 @@ spec:
                                           workflow step.
                                         type: string
                                       outputs:
-                                        description: Outputs is the outputs of the
-                                          step
+                                        description: StepOutputs defines output variable
+                                          of WorkflowStep
                                         items:
                                           properties:
                                             name:
@@ -2328,17 +2315,11 @@ spec:
                                           type: object
                                         type: array
                                       properties:
-                                        description: Properties is the properties
-                                          of the step
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
                                       timeout:
-                                        description: Timeout is the timeout of the
-                                          step
                                         type: string
                                       type:
-                                        description: Type is the type of the workflow
-                                          step.
                                         type: string
                                     required:
                                     - name
@@ -2346,10 +2327,8 @@ spec:
                                     type: object
                                   type: array
                                 timeout:
-                                  description: Timeout is the timeout of the step
                                   type: string
                                 type:
-                                  description: Type is the type of the workflow step.
                                   type: string
                               required:
                               - name
@@ -2376,6 +2355,8 @@ spec:
                             cluster:
                               type: string
                             creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
                               type: string
                             fieldPath:
                               description: 'If referring to a piece of an object instead
@@ -2536,10 +2517,9 @@ spec:
                         format: int64
                         type: integer
                       policy:
-                        description: PolicyStatus records the status of policy Deprecated
-                          This field is only used by EnvBinding Policy which is deprecated.
+                        description: PolicyStatus records the status of policy
                         items:
-                          description: PolicyStatus records the status of policy Deprecated
+                          description: PolicyStatus records the status of policy
                           properties:
                             name:
                               type: string
@@ -2757,22 +2737,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          endTime:
-                            format: date-time
-                            type: string
                           finished:
                             type: boolean
                           message:
                             type: string
                           mode:
+                            description: WorkflowMode describes the mode of workflow
                             type: string
                           startTime:
                             format: date-time
                             type: string
-                          status:
-                            description: WorkflowRunPhase is a label for the condition
-                              of a WorkflowRun at the current time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
@@ -2808,9 +2782,8 @@ spec:
                                   type: string
                                 subSteps:
                                   items:
-                                    description: StepStatus record the base status
-                                      of workflow step, which could be workflow step
-                                      or subStep
+                                    description: WorkflowSubStepStatus record the
+                                      status of a workflow subStep
                                     properties:
                                       firstExecuteTime:
                                         description: FirstExecuteTime is the first
@@ -3306,8 +3279,7 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the policy definition. Only CUE
-                            schematic is supported for now.
+                            of the encapsulation of the policy definition
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3733,8 +3705,7 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the trait. Only CUE and Kube schematic
-                            are supported for now.
+                            of the encapsulation of the trait
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3888,12 +3859,10 @@ spec:
                               - configuration
                               type: object
                           type: object
-                        stage:
-                          description: Stage defines the stage information to which
-                            this trait resource processing belongs. Currently, PreDispatch
-                            and PostDispatch are provided, which are used to control
-                            resource pre-process and post-process respectively.
-                          type: string
+                        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
@@ -4009,32 +3978,19 @@ spec:
                       namespace:
                         type: string
                     type: object
-                  mode:
-                    description: WorkflowExecuteMode defines the mode of workflow
-                      execution
-                    properties:
-                      steps:
-                        description: Steps is the mode of workflow steps execution
-                        type: string
-                      subSteps:
-                        description: SubSteps is the mode of workflow sub steps execution
-                        type: string
-                    type: object
                   steps:
                     items:
                       description: WorkflowStep defines how to execute a workflow
                         step.
                       properties:
                         dependsOn:
-                          description: DependsOn is the dependency of the step
                           items:
                             type: string
                           type: array
                         if:
-                          description: If is the if condition of the step
                           type: string
                         inputs:
-                          description: Inputs is the inputs of the step
+                          description: StepInputs defines variable input of WorkflowStep
                           items:
                             properties:
                               from:
@@ -4047,7 +4003,8 @@ spec:
                             type: object
                           type: array
                         meta:
-                          description: Meta is the meta data of the workflow step.
+                          description: WorkflowStepMeta contains the meta data of
+                            a workflow step
                           properties:
                             alias:
                               type: string
@@ -4056,7 +4013,7 @@ spec:
                           description: Name is the unique name of the workflow step.
                           type: string
                         outputs:
-                          description: Outputs is the outputs of the step
+                          description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
                               name:
@@ -4069,24 +4026,22 @@ spec:
                             type: object
                           type: array
                         properties:
-                          description: Properties is the properties of the step
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         subSteps:
                           items:
-                            description: WorkflowStepBase defines the workflow step
-                              base
+                            description: WorkflowSubStep defines how to execute a
+                              workflow subStep.
                             properties:
                               dependsOn:
-                                description: DependsOn is the dependency of the step
                                 items:
                                   type: string
                                 type: array
                               if:
-                                description: If is the if condition of the step
                                 type: string
                               inputs:
-                                description: Inputs is the inputs of the step
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     from:
@@ -4099,8 +4054,8 @@ spec:
                                   type: object
                                 type: array
                               meta:
-                                description: Meta is the meta data of the workflow
-                                  step.
+                                description: WorkflowStepMeta contains the meta data
+                                  of a workflow step
                                 properties:
                                   alias:
                                     type: string
@@ -4110,7 +4065,8 @@ spec:
                                   step.
                                 type: string
                               outputs:
-                                description: Outputs is the outputs of the step
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
                                 items:
                                   properties:
                                     name:
@@ -4123,14 +4079,11 @@ spec:
                                   type: object
                                 type: array
                               properties:
-                                description: Properties is the properties of the step
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
                               timeout:
-                                description: Timeout is the timeout of the step
                                 type: string
                               type:
-                                description: Type is the type of the workflow step.
                                 type: string
                             required:
                             - name
@@ -4138,10 +4091,8 @@ spec:
                             type: object
                           type: array
                         timeout:
-                          description: Timeout is the timeout of the step
                           type: string
                         type:
-                          description: Type is the type of the workflow step.
                           type: string
                       required:
                       - name
@@ -4206,8 +4157,7 @@ spec:
                           type: object
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the workflow step definition.
-                            Only CUE schematic is supported for now.
+                            of the encapsulation of the workflow step definition
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -4811,22 +4761,16 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  endTime:
-                    format: date-time
-                    type: string
                   finished:
                     type: boolean
                   message:
                     type: string
                   mode:
+                    description: WorkflowMode describes the mode of workflow
                     type: string
                   startTime:
                     format: date-time
                     type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow
@@ -4860,8 +4804,8 @@ spec:
                           type: string
                         subSteps:
                           items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
+                            description: WorkflowSubStepStatus record the status of
+                              a workflow subStep
                             properties:
                               firstExecuteTime:
                                 description: FirstExecuteTime is the first time this

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

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

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

@@ -445,8 +445,7 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the policy definition. Only CUE
-                          schematic is supported for now.
+                          of the encapsulation of the policy definition
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -763,8 +762,7 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the trait. Only CUE and Kube schematic
-                          are supported for now.
+                          of the encapsulation of the trait
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -916,12 +914,10 @@ spec:
                             - configuration
                             type: object
                         type: object
-                      stage:
-                        description: Stage defines the stage information to which
-                          this trait resource processing belongs. Currently, PreDispatch
-                          and PostDispatch are provided, which are used to control
-                          resource pre-process and post-process respectively.
-                        type: string
+                      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
@@ -1056,8 +1052,7 @@ spec:
                         type: object
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the workflow step definition. Only
-                          CUE schematic is supported for now.
+                          of the encapsulation of the workflow step definition
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format