Fix: release script condition syntax (#4043 )

Signed-off-by: qiaozp <chivalry.pp@gmail.com>
[Backport release-1.4] Feat: add if in workflow (#4041 )
2026-03-03 02:01:05 +00:00 · 2022-05-27 23:29:31 +08:00 · 2022-05-27 22:02:02 +08:00 · 2022-05-27 21:12:35 +08:00 · 2022-05-27 18:38:12 +08:00 · 2022-05-27 17:42:49 +08:00
535 changed files with 6985 additions and 31703 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,14 @@
 # This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file

-*                                  @barnettZQG @wonderflow @leejanee @Somefive
-design/                            @barnettZQG @leejanee @wonderflow @Somefive
+*                                  @barnettZQG @wonderflow @leejanee
+design/                            @barnettZQG @leejanee @wonderflow

 # Owner of CUE
-pkg/cue                            @leejanee @FogDong @Somefive
-pkg/stdlib                         @leejanee @FogDong @Somefive
+pkg/cue                            @leejanee @FogDong
+pkg/stdlib                         @leejanee @FogDong

 # Owner of Workflow
-pkg/workflow                       @leejanee @FogDong @Somefive
+pkg/workflow                       @leejanee @FogDong

 # Owner of rollout
 pkg/controller/common/rollout/                              @wangyikewxgm @wonderflow
@@ -17,20 +17,20 @@ pkg/controller/standard.oam.dev/v1alpha1/rollout            @wangyikewxgm @wonde
 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
+pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition  @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/policies/policydefinition        @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition   @yangsoon @zzxwill
+pkg/controller/core.oam.dev/v1alpha2/core/traits/traitdefinition           @yangsoon @zzxwill

 # Owner of health scope controller
-pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope     @captainroy-hy @zzxwill @yangsoon
+pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope     @captainroy-hy @zzxwill

 # Owner of vela templates
 vela-templates/                     @Somefive @barnettZQG @wonderflow

 # Owner of vela CLI
-references/cli/                     @Somefive @zzxwill @StevenLeiZhang
+references/cli/                     @Somefive @zzxwill 

 # Owner of vela APIServer
-pkg/apiserver/                     @barnettZQG @yangsoon @FogDong
+pkg/apiserver/                     @barnettZQG @yangsoon

--- a/.github/workflows/apiserver-test.yaml
+++ b/.github/workflows/apiserver-test.yaml
@@ -1,4 +1,4 @@
-name: VelaUX APIServer Test
+name: APIServer Unit Test & E2E Test

 on:
  push:
@@ -19,9 +19,9 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'

 jobs:

@@ -32,7 +32,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
@@ -53,58 +53,8 @@ jobs:
            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
          fi

+
  apiserver-unit-tests:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - 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: Install ginkgo
-        run: |
-          sudo apt-get install -y golang-ginkgo-dev
-
-      - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.7.0
-        with:
-          mongodb-version: '5.0'
-
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 3.1.0
-          kubebuilderOnly: false
-          kubernetesVersion: v1.21.2
-
-      - name: Run api server unit test
-        run: make unit-test-apiserver
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.txt
-          flags: apiserver-unittests
-          name: codecov-umbrella
-
-  apiserver-e2e-tests:
    runs-on: aliyun
    needs: [ detect-noop,set-k8s-matrix ]
    if: needs.detect-noop.outputs.noop != 'true'
@@ -149,6 +99,9 @@ jobs:
          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
          kubectl version
          kubectl cluster-info
+      
+      - name: Run api server unit test
+        run: make unit-test-apiserver

      - name: Load Image to kind cluster
        run: make kind-load
@@ -178,8 +131,8 @@ jobs:
        uses: codecov/codecov-action@v1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e_apiserver_test.out
-          flags: apiserver-e2etests
+          files: ./coverage.txt,/tmp/e2e_apiserver_test.out
+          flags: apiserver-unittests
          name: codecov-umbrella

      - name: Clean e2e profile
--- a/.github/workflows/chart.yaml
+++ b/.github/workflows/chart.yaml
@@ -1,89 +0,0 @@
-name: Publish Chart
-
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch: { }
-
-env:
-  BUCKET: ${{ secrets.OSS_BUCKET }}
-  ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
-  ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-  ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}
-
-jobs:  
-  publish-charts:
-    env:
-      HELM_CHARTS_DIR: charts
-      HELM_CHART: charts/vela-core
-      MINIMAL_HELM_CHART: charts/vela-minimal
-      LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
-      LOCAL_OSS_DIRECTORY: .oss/
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@master
-      - name: Get git revision
-        id: vars
-        shell: bash
-        run: |
-          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
-      - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.4.0
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - name: Generate helm doc
-        run: |
-          make helm-doc-gen
-      - name: Prepare legacy chart
-        run: |
-          rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
-          rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
-      - name: Prepare vela chart
-        run: |
-          rsync -r $VELA_ROLLOUT_HELM_CHART $HELM_CHARTS_DIR
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          echo ::set-output name=VERSION::${VERSION}
-      - name: Tag helm chart image
-        run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
-          chart_version=${{ steps.get_version.outputs.VERSION }}
-          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $MINIMAL_HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $LEGACY_HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $VELA_ROLLOUT_HELM_CHART/values.yaml
-          chart_smever=${chart_version#"v"}
-          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $MINIMAL_HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $VELA_ROLLOUT_HELM_CHART/Chart.yaml
-      - name: Install ossutil
-        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
-      - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
-      - name: sync cloud to local
-        run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
-      - name: add artifacthub stuff to the repo
-        run: |
-          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
-          rsync $HELM_CHART/README.md $VELA_ROLLOUT_HELM_CHART/README.md
-          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
-          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
-      - name: Package helm charts
-        run: |
-          helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $MINIMAL_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
-      - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f
--- a/.github/workflows/e2e-multicluster-test.yml
+++ b/.github/workflows/e2e-multicluster-test.yml
@@ -17,9 +17,9 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'

 jobs:

@@ -30,7 +30,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
@@ -103,7 +103,7 @@ jobs:
        run: |
          make e2e-cleanup
          make vela-cli
-          make e2e-setup-core-auth
+          make e2e-setup-core
          make
          make setup-runtime-e2e-cluster

--- a/.github/workflows/e2e-rollout-test.yml
+++ b/.github/workflows/e2e-rollout-test.yml
@@ -17,9 +17,9 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'

 jobs:

@@ -30,7 +30,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -17,9 +17,9 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.15\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.15\",\"v1.22.9\"]'
+  KIND_VERSION: 'v0.7.0'
+  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
+  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'

 jobs:

@@ -30,7 +30,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -15,7 +15,7 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
+  KIND_VERSION: 'v0.7.0'

 jobs:

@@ -26,7 +26,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
--- a/.github/workflows/issue-commands.yml
+++ b/.github/workflows/issue-commands.yml
@@ -7,7 +7,7 @@ on:

 jobs:
  bot:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout Actions
        uses: actions/checkout@v2
@@ -15,13 +15,7 @@ jobs:
          repository: "oam-dev/kubevela-github-actions"
          path: ./actions
          ref: v0.4.2
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14'
-          cache: 'npm'
-          cache-dependency-path: ./actions/package-lock.json
-      - name: Install Dependencies
+      - name: Install Actions
        run: npm ci --production --prefix ./actions
      - name: Run Commands
        uses: ./actions/commands
--- a/.github/workflows/registry.yml
+++ b/.github/workflows/registry.yml
@@ -8,11 +8,14 @@ on:
  workflow_dispatch: {}

 env:
+  BUCKET: ${{ secrets.OSS_BUCKET }}
+  ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
  ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
  ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+  ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}

 jobs:
-  publish-core-images:
+  publish-images:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master
@@ -44,16 +47,20 @@ jobs:
      - name: Login Alibaba Cloud ACR
        uses: docker/login-action@v1
        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
+          registry: kubevela-registry.cn-hangzhou.cr.aliyuncs.com
+          username: ${{ secrets.ACR_USERNAME }}@aliyun-inner.com
          password: ${{ secrets.ACR_PASSWORD }}
      - uses: docker/setup-qemu-action@v1
      - uses: docker/setup-buildx-action@v1
        with:
          driver-opts: image=moby/buildkit:master

+      - name: Build & Pushing vela-core for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }} .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
      - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-core for Dockerhub, GHCR and ACR
+        name: Build & Pushing vela-core for Dockerhub and GHCR
        with:
          context: .
          file: Dockerfile
@@ -68,70 +75,14 @@ jobs:
            GOPROXY=https://proxy.golang.org
          tags: |-
            docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}

-      - uses: docker/build-push-action@v2
-        name: Build & Pushing CLI for Dockerhub, GHCR and ACR
-        with:
-          context: .
-          file: Dockerfile.cli
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-
-  publish-addon-images:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Get the version
-        id: get_version
+      - name: Build & Pushing vela-apiserver for ACR
        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            VERSION=latest
-          fi
-          echo ::set-output name=VERSION::${VERSION}
-      - name: Get git revision
-        id: vars
-        shell: bash
-        run: |
-          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
-      - name: Login ghcr.io
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login docker.io
-        uses: docker/login-action@v1
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-        with:
-          driver-opts: image=moby/buildkit:master
-
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }} -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.apiserver .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
      - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-apiserver for Dockerhub, GHCR and ACR
+        name: Build & Pushing vela-apiserver for Dockerhub and GHCR
        with:
          context: .
          file: Dockerfile.apiserver
@@ -146,11 +97,36 @@ jobs:
            GOPROXY=https://proxy.golang.org
          tags: |-
            docker.io/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-apiserver:${{ steps.get_version.outputs.VERSION }}

+      - name: Build & Pushing vela CLI for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.cli .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
      - uses: docker/build-push-action@v2
-        name: Build & Pushing runtime rollout Dockerhub, GHCR and ACR
+        name: Build & Pushing CLI for Dockerhub and GHCR
+        with:
+          context: .
+          file: Dockerfile.cli
+          labels: |-
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
+            VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
+          tags: |-
+            docker.io/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-cli:${{ steps.get_version.outputs.VERSION }}
+
+      - name: Build & Pushing vela runtime rollout for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }} -f runtime/rollout/Dockerfile .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+      - uses: docker/build-push-action@v2
+        name: Build & Pushing runtime rollout for Dockerhub and GHCR
        with:
          context: .
          file: runtime/rollout/Dockerfile
@@ -165,27 +141,91 @@ jobs:
            GOPROXY=https://proxy.golang.org
          tags: |-
            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-      
-      - uses: docker/build-push-action@v2
-        name: Build & Pushing CloudShell for Dockerhub, GHCR and ACR
+            ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+
+  publish-charts:
+    env:
+      HELM_CHARTS_DIR: charts
+      HELM_CHART: charts/vela-core
+      MINIMAL_HELM_CHART: charts/vela-minimal
+      LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
+      VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
+      LOCAL_OSS_DIRECTORY: .oss/
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@master
+      - name: Get git revision
+        id: vars
+        shell: bash
+        run: |
+          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
+      - name: Install Helm
+        uses: azure/setup-helm@v1
        with:
-          context: .
-          file: Dockerfile.cloudshell
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/cloudshell:${{ steps.get_version.outputs.VERSION }}
+          version: v3.4.0
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Generate helm doc
+        run: |
+          make helm-doc-gen
+      - name: Prepare legacy chart
+        run: |
+          rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
+          rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
+      - name: Prepare vela chart
+        run: |
+          rsync -r $VELA_ROLLOUT_HELM_CHART $HELM_CHARTS_DIR
+      - uses: oprypin/find-latest-tag@v1
+        with:
+          repository: oam-dev/kubevela
+          releases-only: true
+        id: latest_tag
+      - name: Tag helm chart image
+        run: |
+          latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
+          sub="."
+          major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
+          minor="$(cut -d"$sub" -f2 <<<"$latest_repo_tag")"
+          patch="0"
+          current_repo_tag="$major.$minor.$patch"
+          image_tag=${GITHUB_REF#refs/tags/}
+          chart_version=$latest_repo_tag
+          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
+            image_tag=latest
+            chart_version=${current_repo_tag}-nightly-build
+          fi
+          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $MINIMAL_HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $LEGACY_HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $VELA_ROLLOUT_HELM_CHART/values.yaml
+          chart_smever=${chart_version#"v"}
+          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $MINIMAL_HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $VELA_ROLLOUT_HELM_CHART/Chart.yaml
+      - name: Install ossutil
+        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
+      - name: Configure Alibaba Cloud OSSUTIL
+        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
+      - name: sync cloud to local
+        run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
+      - name: add artifacthub stuff to the repo
+        run: |
+          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
+          rsync $HELM_CHART/README.md $VELA_ROLLOUT_HELM_CHART/README.md
+          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
+          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
+      - name: Package helm charts
+        run: |
+          helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $MINIMAL_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
+      - name: sync local to cloud
+        run: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f

  publish-capabilities:
    env:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,11 +123,6 @@ jobs:
      - name: sync the latest version file
        if: ${{ !contains(env.VELA_VERSION,'alpha') && !contains(env.VELA_VERSION,'beta') }}
        run: |
-          LATEST_VERSION=$(curl -fsSl https://static.kubevela.net/binary/vela/latest_version)
-          verlte() {
-            [  "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
-          }
-          verlte ${{ env.VELA_VERSION }} $LATEST_VERSION && echo "${{ env.VELA_VERSION }} <= $LATEST_VERSION, skip update" && exit 0
          echo ${{ env.VELA_VERSION }} > ./latest_version
          ./ossutil --config-file .ossutilconfig cp -u ./latest_version oss://$BUCKET/binary/vela/latest_version

--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -15,7 +15,7 @@ env:
  # Common versions
  GO_VERSION: '1.17'
  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.14.0'
+  KIND_VERSION: 'v0.7.0'

 jobs:

@@ -26,7 +26,7 @@ jobs:
    steps:
      - name: Detect No-op Changes
        id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 bin
 _bin
 e2e/vela
-vela

 # Test binary, build with `go test -c`
 *.test
@@ -50,5 +49,4 @@ tmp/
 git-page/

 # e2e rollout runtime image build
-runtime/rollout/e2e/tmp
-vela.json
+runtime/rollout/e2e/tmp
--- a/CHANGELOG/CHANGELOG-1.0.md
+++ b/CHANGELOG/CHANGELOG-1.0.md
@@ -15,7 +15,7 @@ This is a minor fix for release-1.0, please refer to release-1.1.x for the lates
 # v1.0.5

 1. Fix Terraform application status issue (#1611)
-2. application supports specifying different versions of Definition (#1597)
+2. applicaiton supports specifying different versions of Definition (#1597)
 3. Enable Dynamic Admission Control for Application (#1619)
 4. Update inner samples for "vela show xxx --web" (#1616)
 5. fix empty rolloutBatch will panic whole controller bug (#1646)
--- a/CHANGELOG/CHANGELOG-1.2.md
+++ b/CHANGELOG/CHANGELOG-1.2.md
@@ -31,7 +31,7 @@
 ## What's Changed

 * Fix: can't query data from the MongoDB by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3095
-* Fix: use personal token of vela-bot instead of github token for homebrew update by @wonderflow in https://github.com/oam-dev/kubevela/pull/3096
+* Fix: use personel token of vela-bot instead of github token for homebrew update by @wonderflow in https://github.com/oam-dev/kubevela/pull/3096
 * Fix: acr image no version by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3100
 * Fix: support generate cloud resource docs in Chinese by @zzxwill in https://github.com/oam-dev/kubevela/pull/3079
 * Fix: clear old data in mongodb unit test case by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3103
--- a/Dockerfile.cloudshell
+++ b/Dockerfile.cloudshell
@@ -1,31 +0,0 @@
-ARG BASE_IMAGE
-# Build the cli binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
-ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
-WORKDIR /workspace
-# Copy the Go Modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
-
-# Copy the go source
-COPY apis/ apis/
-COPY pkg/ pkg/
-COPY version/ version/
-COPY references/ references/
-
-# Build
-ARG VERSION
-ARG GITVERSION
-
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
-    -o vela ./references/cmd/cli/main.go
-
-FROM ghcr.io/cloudtty/cloudshell:v0.2.0
-RUN apt-get install -y vim
-ENV API_TOKEN_PATH=/usr/local/kubeconfig/token
-COPY --from=builder /workspace/vela  /usr/local/bin/vela
--- a/2
+++ b/2
@@ -14,7 +14,7 @@ test: vet lint staticcheck unit-test-core test-cli-gen

 test-cli-gen: 
 	mkdir -p ./bin/doc
-	go run ./hack/docgen/cli/gen.go ./bin/doc
+	go run ./hack/docgen/gen.go ./bin/doc
 unit-test-core:
 	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... ./apis/... | grep -v apiserver | grep -v applicationconfiguration)
 	go test $(shell go list ./references/... | grep -v apiserver)
--- a/README.md
+++ b/README.md
@@ -21,29 +21,23 @@

 KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable.

-![kubevela](docs/resources/what-is-kubevela.png)
+![](docs/resources/what-is-kubevela.png)

 ## Highlights

 KubeVela practices the "render, orchestrate, deploy" workflow with below highlighted values added to existing ecosystem:

-* Deployment as Code
+- *Application Centric* - KubeVela introduces [Open Application Model (OAM)](https://oam.dev/) as the consistent yet higher level API to capture and render a full deployment of microservices on top of hybrid environments. Placement strategy, traffic shifting and rolling update are declared at application level. No infrastructure level concern, simply deploy.

-Declare your deployment plan as workflow, run it automatically with any CI/CD or GitOps system, extend or re-program the workflow steps with CUE. No add-hoc scripts, no dirty glue code, just deploy. The deployment workflow in KubeVela is powered by [Open Application Model](https://oam.dev/).
+- *Programmable Workflow* - KubeVela models application delivery as DAG (Directed Acyclic Graph) and expresses it with [CUE](https://cuelang.org/) - a modern data configuration language. This allows you to design application deployment steps per needs and orchestrate them in programmable approach. No restrictions, natively extensible.

-* Built-in security and compliance building blocks
-
-Choose from the wide range of LDAP integrations we provided out-of-box, enjoy multi-cluster authorization that is fully automated, pick and apply fine-grained RBAC modules and customize them per your own supply chain requirements.
-
-* Multi-cloud/hybrid-environments app delivery as first-class citizen
-
-Progressive rollout across test/staging/production environments, automatic canary, blue-green and continuous verification, rich placement strategy across clusters and clouds, fully managed cloud environments provision.
+- *Infrastructure Agnostic* - KubeVela works as an application delivery control plane that is fully decoupled from runtime infrastructure. It can deploy any workload types including containers, cloud services, databases, or even VM instances to any cloud or Kubernetes cluster, following the workflow designed by you.

 ## Getting Started

-* [Introduction](https://kubevela.io/docs)
-* [Installation](https://kubevela.io/docs/install)
-* [Deploy Your Application](https://kubevela.io/docs/quick-start)
+- [Introduction](https://kubevela.io/docs)
+- [Installation](https://kubevela.io/docs/install)
+- [Design Your First Deployment Plan](https://kubevela.io/docs/quick-start)

 ## Documentation

@@ -55,7 +49,7 @@ Official blog is available on [KubeVela blog](https://kubevela.io/blog).

 ## Community

-We want your contributions and suggestions!
+We want your contributions and suggestions! 
 One of the easiest ways to contribute is to participate in discussions on the Github Issues/Discussion, chat on IM or the bi-weekly community calls.
 For more information on the community engagement, developer and contributing guidelines and more, head over to the [KubeVela community repo](https://github.com/kubevela/community).

@@ -75,17 +69,23 @@ Every two weeks we host a community call to showcase new features, review upcomi

 - Bi-weekly Community Call:
  - [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs).
-  - [Video Records](https://www.youtube.com/channel/UCSCTHhGI5XJ0SEhDHVakPAA/videos).
+  - [Video Records](https://kubevela.io/videos/meetings/en/meetings).
 - Bi-weekly Chinese Community Call:
-  - [Video Records](https://space.bilibili.com/180074935/channel/seriesdetail?sid=1842207).
+  - [Video Records](https://kubevela.io/videos/meetings/cn/v1.3).

 ## Talks and Conferences

-Check out [KubeVela videos](https://kubevela.io/videos/talks/en/oam-dapr) for these talks and conferences.
+| Engagement | Link        |
+|:-----------|:------------|
+| 🎤  Talks | - [KubeVela - The Modern App Delivery System in Alibaba](https://docs.google.com/presentation/d/1CWCLcsKpDQB3bBDTfdv2BZ8ilGGJv2E8L-iOA5HMrV0/edit?usp=sharing) |
+| 🌎 KubeCon | - [ [NA 2020] Standardizing Cloud Native Application Delivery Across Different Clouds](https://www.youtube.com/watch?v=0yhVuBIbHcI) <br> - [ [EU 2021] Zero Pain Microservice Development and Deployment with Dapr and KubeVela](https://sched.co/iE4S) |
+| 📺 Conferences | - [Dapr, Rudr, OAM: Mark Russinovich presents next gen app development & deployment](https://www.youtube.com/watch?v=eJCu6a-x9uo) <br> - [Mark Russinovich presents "The Future of Cloud Native Applications with OAM and Dapr"](https://myignite.techcommunity.microsoft.com/sessions/82059)|
+
+For more talks, please checkout [KubeVela Talks](https://kubevela.io/videos/talks/en/standardizing-app).

 ## Contributing

-Check out [CONTRIBUTING](https://kubevela.io/docs/contributor/overview) to see how to develop with KubeVela.
+Check out [CONTRIBUTING](./CONTRIBUTING.md) to see how to develop with KubeVela.

 ## Report Vulnerability

--- a/apis/core.oam.dev/common/types.go
+++ b/apis/core.oam.dev/common/types.go
@@ -216,19 +216,19 @@ type WorkflowState string

 const (
 	// WorkflowStateInitializing means the workflow is in initial state
-	WorkflowStateInitializing WorkflowState = "Initializing"
+	WorkflowStateInitializing WorkflowState = "initializing"
 	// WorkflowStateTerminated means workflow is terminated manually, and it won't be started unless the spec changed.
-	WorkflowStateTerminated WorkflowState = "Terminated"
+	WorkflowStateTerminated WorkflowState = "terminated"
 	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
-	WorkflowStateSuspended WorkflowState = "Suspended"
+	WorkflowStateSuspended WorkflowState = "suspended"
 	// WorkflowStateSucceeded means workflow is running successfully, all steps finished.
 	WorkflowStateSucceeded WorkflowState = "Succeeded"
 	// WorkflowStateFinished means workflow is end.
-	WorkflowStateFinished WorkflowState = "Finished"
+	WorkflowStateFinished WorkflowState = "finished"
 	// WorkflowStateExecuting means workflow is still running or waiting some steps.
-	WorkflowStateExecuting WorkflowState = "Executing"
+	WorkflowStateExecuting WorkflowState = "executing"
 	// WorkflowStateSkipping means it will skip this reconcile and let next reconcile to handle it.
-	WorkflowStateSkipping WorkflowState = "Skipping"
+	WorkflowStateSkipping WorkflowState = "skipping"
 )

 // ApplicationComponentStatus record the health status of App component
@@ -342,8 +342,6 @@ type WorkflowStep struct {

 	Type string `json:"type"`

-	Meta *WorkflowStepMeta `json:"meta,omitempty"`
-
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Properties *runtime.RawExtension `json:"properties,omitempty"`

@@ -351,8 +349,6 @@ type WorkflowStep struct {

 	If string `json:"if,omitempty"`

-	Timeout string `json:"timeout,omitempty"`
-
 	DependsOn []string `json:"dependsOn,omitempty"`

 	Inputs StepInputs `json:"inputs,omitempty"`
@@ -360,11 +356,6 @@ type WorkflowStep struct {
 	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.
@@ -372,15 +363,11 @@ type WorkflowSubStep struct {

 	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"`
@@ -420,8 +407,6 @@ const (
 	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.
--- a/apis/core.oam.dev/common/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/common/zz_generated.deepcopy.go
@@ -684,11 +684,6 @@ func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
 // 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)
@@ -728,21 +723,6 @@ func (in *WorkflowStep) DeepCopy() *WorkflowStep {
 	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
@@ -769,11 +749,6 @@ func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
 // 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)
--- a/apis/core.oam.dev/v1alpha1/component_types.go
+++ b/apis/core.oam.dev/v1alpha1/component_types.go
@@ -25,8 +25,6 @@ const (
 type RefObjectsComponentSpec struct {
 	// Objects the referrers to the Kubernetes objects
 	Objects []ObjectReferrer `json:"objects,omitempty"`
-	// URLs are the links that stores the referred objects
-	URLs []string `json:"urls,omitempty"`
 }

 // ObjectReferrer selects Kubernetes objects
--- a/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
+++ b/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
@@ -18,7 +18,6 @@ package v1alpha1

 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/strings/slices"

 	"github.com/oam-dev/kubevela/pkg/oam"
 )
@@ -67,29 +66,6 @@ type ResourcePolicyRuleSelector struct {
 	OAMResourceTypes []string `json:"oamTypes"`
 	TraitTypes       []string `json:"traitTypes"`
 	ResourceTypes    []string `json:"resourceTypes"`
-	ResourceNames    []string `json:"resourceNames"`
-}
-
-// Match check if current rule selector match the target resource
-func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured) bool {
-	var compName, compType, oamType, traitType, resourceType, resourceName string
-	if labels := manifest.GetLabels(); labels != nil {
-		compName = labels[oam.LabelAppComponent]
-		compType = labels[oam.WorkloadTypeLabel]
-		oamType = labels[oam.LabelOAMResourceType]
-		traitType = labels[oam.TraitTypeLabel]
-	}
-	resourceType = manifest.GetKind()
-	resourceName = manifest.GetName()
-	match := func(src []string, val string) (found bool) {
-		return val != "" && slices.Contains(src, val)
-	}
-	return match(in.CompNames, compName) ||
-		match(in.CompTypes, compType) ||
-		match(in.OAMResourceTypes, oamType) ||
-		match(in.TraitTypes, traitType) ||
-		match(in.ResourceTypes, resourceType) ||
-		match(in.ResourceNames, resourceName)
 }

 // GarbageCollectStrategy the strategy for target resource to recycle
@@ -108,7 +84,23 @@ const (
 // FindStrategy find gc strategy for target resource
 func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
 	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
+		var compName, compType, oamType, traitType string
+		if labels := manifest.GetLabels(); labels != nil {
+			compName = labels[oam.LabelAppComponent]
+			compType = labels[oam.WorkloadTypeLabel]
+			oamType = labels[oam.LabelOAMResourceType]
+			traitType = labels[oam.TraitTypeLabel]
+		}
+		match := func(src []string, val string) (found bool) {
+			for _, _val := range src {
+				found = found || _val == val
+			}
+			return val != "" && found
+		}
+		if match(rule.Selector.CompNames, compName) ||
+			match(rule.Selector.CompTypes, compType) ||
+			match(rule.Selector.OAMResourceTypes, oamType) ||
+			match(rule.Selector.TraitTypes, traitType) {
 			return &rule.Strategy
 		}
 	}
--- a/apis/core.oam.dev/v1alpha1/policy_types.go
+++ b/apis/core.oam.dev/v1alpha1/policy_types.go
@@ -16,8 +16,6 @@ limitations under the License.

 package v1alpha1

-import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
 const (
 	// TopologyPolicyType refers to the type of topology policy
 	TopologyPolicyType = "topology"
@@ -25,8 +23,6 @@ const (
 	OverridePolicyType = "override"
 	// DebugPolicyType refers to the type of debug policy
 	DebugPolicyType = "debug"
-	// SharedResourcePolicyType refers to the type of shared resource policy
-	SharedResourcePolicyType = "shared-resource"
 )

 // TopologyPolicySpec defines the spec of topology policy
@@ -57,23 +53,3 @@ type OverridePolicySpec struct {
 	Components []EnvComponentPatch `json:"components,omitempty"`
 	Selector   []string            `json:"selector,omitempty"`
 }
-
-// SharedResourcePolicySpec defines the spec of shared-resource policy
-type SharedResourcePolicySpec struct {
-	Rules []SharedResourcePolicyRule `json:"rules"`
-}
-
-// SharedResourcePolicyRule defines the rule for sharing resources
-type SharedResourcePolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-}
-
-// FindStrategy return if the target resource should be shared
-func (in SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return true
-		}
-	}
-	return false
-}
--- a/apis/core.oam.dev/v1alpha1/policy_types_test.go
+++ b/apis/core.oam.dev/v1alpha1/policy_types_test.go
@@ -1,69 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-)
-
-func TestSharedResourcePolicySpec_FindStrategy(t *testing.T) {
-	testCases := map[string]struct {
-		rules   []SharedResourcePolicyRule
-		input   *unstructured.Unstructured
-		matched bool
-	}{
-		"shared resource rule resourceName match": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceNames: []string{"example"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"name": "example",
-				},
-			}},
-			matched: true,
-		},
-		"shared resource rule resourceType match": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceTypes: []string{"ConfigMap", "Namespace"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"kind": "Namespace",
-			}},
-			matched: true,
-		},
-		"shared resource rule mismatch": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceNames: []string{"mismatch"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"kind": "Namespace",
-			}},
-			matched: false,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			spec := SharedResourcePolicySpec{Rules: tc.rules}
-			r.Equal(tc.matched, spec.FindStrategy(tc.input))
-		})
-	}
-}
--- a/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
@@ -595,11 +595,6 @@ func (in *RefObjectsComponentSpec) DeepCopyInto(out *RefObjectsComponentSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.URLs != nil {
-		in, out := &in.URLs, &out.URLs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RefObjectsComponentSpec.
@@ -640,11 +635,6 @@ func (in *ResourcePolicyRuleSelector) DeepCopyInto(out *ResourcePolicyRuleSelect
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.ResourceNames != nil {
-		in, out := &in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourcePolicyRuleSelector.
@@ -657,44 +647,6 @@ func (in *ResourcePolicyRuleSelector) DeepCopy() *ResourcePolicyRuleSelector {
 	return out
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SharedResourcePolicyRule) DeepCopyInto(out *SharedResourcePolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharedResourcePolicyRule.
-func (in *SharedResourcePolicyRule) DeepCopy() *SharedResourcePolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(SharedResourcePolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SharedResourcePolicySpec) DeepCopyInto(out *SharedResourcePolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]SharedResourcePolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharedResourcePolicySpec.
-func (in *SharedResourcePolicySpec) DeepCopy() *SharedResourcePolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(SharedResourcePolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TopologyPolicySpec) DeepCopyInto(out *TopologyPolicySpec) {
 	*out = *in
--- a/apis/core.oam.dev/v1beta1/application_types.go
+++ b/apis/core.oam.dev/v1beta1/application_types.go
@@ -54,15 +54,8 @@ type WorkflowStep common.WorkflowStep

 // Workflow defines workflow steps and other attributes
 type Workflow struct {
-	Ref   string               `json:"ref,omitempty"`
-	Mode  *WorkflowExecuteMode `json:"mode,omitempty"`
-	Steps []WorkflowStep       `json:"steps,omitempty"`
-}
-
-// WorkflowExecuteMode defines the mode of workflow execution
-type WorkflowExecuteMode struct {
-	Steps    common.WorkflowMode `json:"steps,omitempty"`
-	SubSteps common.WorkflowMode `json:"subSteps,omitempty"`
+	Ref   string         `json:"ref,omitempty"`
+	Steps []WorkflowStep `json:"steps,omitempty"`
 }

 // ApplicationSpec is the spec of Application
--- a/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
@@ -927,11 +927,6 @@ func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
 // 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
-	if in.Mode != nil {
-		in, out := &in.Mode, &out.Mode
-		*out = new(WorkflowExecuteMode)
-		**out = **in
-	}
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
 		*out = make([]WorkflowStep, len(*in))
@@ -951,29 +946,9 @@ 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)
--- a/apis/types/capability.go
+++ b/apis/types/capability.go
@@ -80,8 +80,6 @@ const (
 	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
 	// UISchema is the key to store ui custom schema
 	UISchema string = "ui-schema"
-	// VelaQLConfigmapKey is the key to store velaql view
-	VelaQLConfigmapKey string = "template"
 )

 // CapabilityCategory defines the category of a capability
@@ -165,7 +163,6 @@ type Capability struct {
 	Center         string             `json:"center,omitempty"`
 	Status         string             `json:"status,omitempty"`
 	Description    string             `json:"description,omitempty"`
-	Example        string             `json:"example,omitempty"`
 	Labels         map[string]string  `json:"labels,omitempty"`
 	Category       CapabilityCategory `json:"category,omitempty"`

--- a/apis/types/types.go
+++ b/apis/types/types.go
@@ -48,8 +48,6 @@ var DefaultKubeVelaNS = "vela-system"
 const (
 	// AnnoDefinitionDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
 	AnnoDefinitionDescription = "definition.oam.dev/description"
-	// AnnoDefinitionExampleURL is the annotation which describe url of usage examples of the capability, it will be loaded in documentation generate.
-	AnnoDefinitionExampleURL = "definition.oam.dev/example-url"
 	// AnnoDefinitionAlias is the annotation for definition alias
 	AnnoDefinitionAlias = "definition.oam.dev/alias"
 	// AnnoDefinitionIcon is the annotation which describe the icon url
@@ -72,8 +70,6 @@ const (
 	AnnoIngressControllerHTTPSPort = "ingress.controller/https-port"
 	// AnnoIngressControllerHTTPPort define ingress controller listen port for http
 	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
-	// AnnoIngressControllerHost define ingress controller externally host
-	AnnoIngressControllerHost = "ingress.controller/host"
 	// LabelConfigType is the label for config type
 	LabelConfigType = "config.oam.dev/type"
 	// LabelConfigCatalog is the label for config catalog
--- a/charts/vela-core/README.md
+++ b/charts/vela-core/README.md
@@ -93,7 +93,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `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
--- a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
@@ -2198,17 +2198,6 @@ spec:
                          a context in annotation. - should mark "finish" phase in
                          status.conditions.'
                        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:
@@ -2236,13 +2225,6 @@ spec:
                                    - 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.
@@ -2289,13 +2271,6 @@ spec:
                                          - 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.
@@ -2317,8 +2292,6 @@ spec:
                                      properties:
                                        type: object
                                        x-kubernetes-preserve-unknown-fields: true
-                                      timeout:
-                                        type: string
                                      type:
                                        type: string
                                    required:
@@ -2326,8 +2299,6 @@ spec:
                                    - type
                                    type: object
                                  type: array
-                                timeout:
-                                  type: string
                                type:
                                  type: string
                              required:
@@ -4002,13 +3973,6 @@ spec:
                            - 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
@@ -4053,13 +4017,6 @@ spec:
                                  - 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.
@@ -4081,8 +4038,6 @@ spec:
                              properties:
                                type: object
                                x-kubernetes-preserve-unknown-fields: true
-                              timeout:
-                                type: string
                              type:
                                type: string
                            required:
@@ -4090,8 +4045,6 @@ spec:
                            - type
                            type: object
                          type: array
-                        timeout:
-                          type: string
                        type:
                          type: string
                      required:
--- a/charts/vela-core/crds/core.oam.dev_applications.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applications.yaml
@@ -1009,17 +1009,6 @@ spec:
                  order, and each step: - will have a context in annotation. - should
                  mark "finish" phase in status.conditions.'
                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:
@@ -1046,13 +1035,6 @@ spec:
                            - 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
@@ -1097,13 +1079,6 @@ spec:
                                  - 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.
@@ -1125,8 +1100,6 @@ spec:
                              properties:
                                type: object
                                x-kubernetes-preserve-unknown-fields: true
-                              timeout:
-                                type: string
                              type:
                                type: string
                            required:
@@ -1134,8 +1107,6 @@ spec:
                            - type
                            type: object
                          type: array
-                        timeout:
-                          type: string
                        type:
                          type: string
                      required:
--- a/charts/vela-core/crds/core.oam.dev_workflows.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workflows.yaml
@@ -57,13 +57,6 @@ spec:
                    - 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
@@ -107,13 +100,6 @@ spec:
                          - 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
@@ -133,8 +119,6 @@ spec:
                      properties:
                        type: object
                        x-kubernetes-preserve-unknown-fields: true
-                      timeout:
-                        type: string
                      type:
                        type: string
                    required:
@@ -142,8 +126,6 @@ spec:
                    - type
                    type: object
                  type: array
-                timeout:
-                  type: string
                type:
                  type: string
              required:
@@ -159,16 +141,6 @@ spec:
      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:
@@ -194,13 +166,6 @@ spec:
                    - 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
@@ -244,13 +209,6 @@ spec:
                          - 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
@@ -270,8 +228,6 @@ spec:
                      properties:
                        type: object
                        x-kubernetes-preserve-unknown-fields: true
-                      timeout:
-                        type: string
                      type:
                        type: string
                    required:
@@ -279,8 +235,6 @@ spec:
                    - type
                    type: object
                  type: array
-                timeout:
-                  type: string
                type:
                  type: string
              required:
--- a/charts/vela-core/templates/cluster-gateway/certmanager.yaml
+++ b/charts/vela-core/templates/cluster-gateway/certmanager.yaml
@@ -13,7 +13,7 @@ metadata:
  name: {{ template "kubevela.fullname" . }}-cluster-gateway-tls
  namespace: {{ .Release.Namespace }}
 spec:
-  secretName: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-v2
+  secretName: {{ template "kubevela.fullname" . }}-cluster-gateway-tls
  duration: 8760h # 1y
  issuerRef:
    name: {{ template "kubevela.fullname" . }}-cluster-gateway-issuer
--- a/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml
+++ b/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml
@@ -53,7 +53,7 @@ spec:
        - name: tls-cert-vol
          secret:
            defaultMode: 420
-            secretName: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-v2
+            secretName: {{ template "kubevela.fullname" . }}-cluster-gateway-tls
      {{ end }}
      {{- with .Values.nodeSelector }}
      nodeSelector:
@@ -106,7 +106,7 @@ metadata:
  name: v1alpha1.cluster.core.oam.dev
  annotations:
    {{- if and .Values.multicluster.clusterGateway.secureTLS.enabled .Values.multicluster.clusterGateway.secureTLS.certManager.enabled }}
-    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ template "kubevela.fullname" . }}-cluster-gateway-tls-v2"
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ template "kubevela.fullname" . }}-cluster-gateway-tls"
    {{- end }}
  labels:
    api: cluster-extension-apiserver
@@ -147,7 +147,4 @@ subjects:
  - kind: Group
    name: kubevela:client
    apiGroup: rbac.authorization.k8s.io
-  - kind: ServiceAccount
-    name: {{ include "kubevela.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
 {{ end }}
--- a/charts/vela-core/templates/cluster-gateway/job-patch.yaml
+++ b/charts/vela-core/templates/cluster-gateway/job-patch.yaml
@@ -86,7 +86,7 @@ spec:
          - create
          - --host={{ .Release.Name }}-cluster-gateway-service,{{ .Release.Name }}-cluster-gateway-service.{{ .Release.Namespace }}.svc
          - --namespace={{ .Release.Namespace }}
-          - --secret-name={{ template "kubevela.fullname" . }}-cluster-gateway-tls-v2
+          - --secret-name={{ template "kubevela.fullname" . }}-cluster-gateway-tls
          - --cert-name=tls.crt
          - --key-name=tls.key
      restartPolicy: OnFailure
@@ -131,7 +131,7 @@ spec:
          - /patch
        args:
          - --secret-namespace={{ .Release.Namespace }}
-          - --secret-name={{ template "kubevela.fullname" . }}-cluster-gateway-tls-v2
+          - --secret-name={{ template "kubevela.fullname" . }}-cluster-gateway-tls
      restartPolicy: OnFailure
      serviceAccountName: {{ include "kubevela.serviceAccountName" . }}
      securityContext:
--- a/charts/vela-core/templates/defwithtemplate/affinity.yaml
+++ b/charts/vela-core/templates/defwithtemplate/affinity.yaml
@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
  annotations:
-    definition.oam.dev/description: Affinity specifies affinity and toleration K8s pod for your workload which follows the pod spec in path 'spec.template'.
+    definition.oam.dev/description: affinity specify affinity and tolerationon K8s pod for your workload which follows the pod spec in path 'spec.template'.
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: affinity
--- a/charts/vela-core/templates/defwithtemplate/apply-once.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-once.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/apply-once.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the behaviour of preventing configuration drift.
-  name: apply-once
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #ApplyOnceStrategy: {
-        	// +usage=Specify the path of the resource that allow configuration drift
-        	path: [...string]
-        }
-        #ApplyOncePolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector?: #ResourcePolicyRuleSelector
-        	// +usage=Specify the strategy for configuring the resource level configuration drift behaviour
-        	strategy: #ApplyOnceStrategy
-        }
-        #ResourcePolicyRuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=Whether to enable apply-once for the whole application
-        	enable: *false | bool
-        	// +usage=Specify the rules for configuring apply-once policy in resource level
-        	rules?: [...#ApplyOncePolicyRule]
-        }
-
--- a/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml
+++ b/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml
@@ -4,13 +4,13 @@ apiVersion: core.oam.dev/v1beta1
 kind: ComponentDefinition
 metadata:
  annotations:
-    alias.config.oam.dev: Image Registry
+    custom.definition.oam.dev/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/catalog.config.oam.dev: velacore-config
+    custom.definition.oam.dev/multi-cluster.config.oam.dev: "true"
+    custom.definition.oam.dev/type.config.oam.dev: image-registry
    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:
@@ -20,7 +20,6 @@ spec:
        import (
        	"encoding/base64"
        	"encoding/json"
-        	"strconv"
        )

        output: {
@@ -43,29 +42,21 @@ spec:
        	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.auth != _|_ {
+        		stringData: ".dockerconfigjson": json.Marshal({
+        			auths: "\(parameter.registry)": {
+        				username: parameter.auth.username
+        				password: parameter.auth.password
+        				if parameter.auth.email != _|_ {
+        					email: parameter.auth.email
        				}
-        			})
-        		}
-        		if parameter.insecure != _|_ {
-        			"insecure-skip-verify": strconv.FormatBool(parameter.insecure)
-        		}
-        		if parameter.useHTTP != _|_ {
-        			"protocol-use-http": strconv.FormatBool(parameter.useHTTP)
-        		}
+        				auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        			}
+        		})
        	}
        }
        parameter: {
-        	// +usage=Image registry FQDN, such as: index.docker.io
+        	// +usage=Image registry FQDN
        	registry: string
        	// +usage=Authenticate the image registry
        	auth?: {
@@ -76,10 +67,6 @@ spec:
        		// +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
--- a/charts/vela-core/templates/defwithtemplate/container-image.yaml
+++ b/charts/vela-core/templates/defwithtemplate/container-image.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Set the image of the container.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: container-image
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-core/templates/defwithtemplate/cron-task.yaml
+++ b/charts/vela-core/templates/defwithtemplate/cron-task.yaml
@@ -196,14 +196,14 @@ spec:
        		// +usage=Specifies a source the value of this var should come from
        		valueFrom?: {
        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
+        			secretKeyRef: {
        				// +usage=The name of the secret in the pod's namespace to select from
        				name: string
        				// +usage=The key of the secret to select from. Must be a valid secret key
        				key: string
        			}
        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
+        			configMapKeyRef: {
        				// +usage=The name of the config map in the pod's namespace to select from
        				name: string
        				// +usage=The key of the config map to select from. Must be a valid secret key
--- a/charts/vela-core/templates/defwithtemplate/daemon.yaml
+++ b/charts/vela-core/templates/defwithtemplate/daemon.yaml
@@ -1,574 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/daemon.cue
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Describes daemonset services in Kubernetes.
-  name: daemon
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"strconv"
-        )
-
-        mountsArray: {
-        	pvc: *[
-        		for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
-        			}
-        		},
-        	] | []
-
-        	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"
-        	spec: {
-        		selector: matchLabels: "app.oam.dev/component": context.name
-
-        		template: {
-        			metadata: {
-        				labels: {
-        					if parameter.labels != _|_ {
-        						parameter.labels
-        					}
-        					if parameter.addRevisionLabel {
-        						"app.oam.dev/revision": context.revision
-        					}
-        					"app.oam.dev/name":      context.appName
-        					"app.oam.dev/component": context.name
-        				}
-        				if parameter.annotations != _|_ {
-        					annotations: parameter.annotations
-        				}
-        			}
-
-        			spec: {
-        				containers: [{
-        					name:  context.name
-        					image: parameter.image
-        					if parameter["port"] != _|_ && parameter["ports"] == _|_ {
-        						ports: [{
-        							containerPort: parameter.port
-        						}]
-        					}
-        					if parameter["ports"] != _|_ {
-        						ports: [ for v in parameter.ports {
-        							{
-        								containerPort: v.port
-        								protocol:      v.protocol
-        								if v.name != _|_ {
-        									name: v.name
-        								}
-        								if v.name == _|_ {
-        									name: "port-" + strconv.FormatInt(v.port, 10)
-        								}
-        							}}]
-        					}
-
-        					if parameter["imagePullPolicy"] != _|_ {
-        						imagePullPolicy: parameter.imagePullPolicy
-        					}
-
-        					if parameter["cmd"] != _|_ {
-        						command: parameter.cmd
-        					}
-
-        					if parameter["env"] != _|_ {
-        						env: parameter.env
-        					}
-
-        					if context["config"] != _|_ {
-        						env: context.config
-        					}
-
-        					if parameter["cpu"] != _|_ {
-        						resources: {
-        							limits: cpu:   parameter.cpu
-        							requests: cpu: parameter.cpu
-        						}
-        					}
-
-        					if parameter["memory"] != _|_ {
-        						resources: {
-        							limits: memory:   parameter.memory
-        							requests: memory: parameter.memory
-        						}
-        					}
-
-        					if parameter["volumes"] != _|_ && parameter["volumeMounts"] == _|_ {
-        						volumeMounts: [ for v in parameter.volumes {
-        							{
-        								mountPath: v.mountPath
-        								name:      v.name
-        							}}]
-        					}
-
-        					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
-        					}
-
-        					if parameter["livenessProbe"] != _|_ {
-        						livenessProbe: parameter.livenessProbe
-        					}
-
-        					if parameter["readinessProbe"] != _|_ {
-        						readinessProbe: parameter.readinessProbe
-        					}
-
-        				}]
-
-        				if parameter["hostAliases"] != _|_ {
-        					// +patchKey=ip
-        					hostAliases: parameter.hostAliases
-        				}
-
-        				if parameter["imagePullSecrets"] != _|_ {
-        					imagePullSecrets: [ for v in parameter.imagePullSecrets {
-        						name: v
-        					},
-        					]
-        				}
-
-        				if parameter["volumes"] != _|_ && parameter["volumeMounts"] == _|_ {
-        					volumes: [ for v in parameter.volumes {
-        						{
-        							name: v.name
-        							if v.type == "pvc" {
-        								persistentVolumeClaim: claimName: v.claimName
-        							}
-        							if v.type == "configMap" {
-        								configMap: {
-        									defaultMode: v.defaultMode
-        									name:        v.cmName
-        									if v.items != _|_ {
-        										items: v.items
-        									}
-        								}
-        							}
-        							if v.type == "secret" {
-        								secret: {
-        									defaultMode: v.defaultMode
-        									secretName:  v.secretName
-        									if v.items != _|_ {
-        										items: v.items
-        									}
-        								}
-        							}
-        							if v.type == "emptyDir" {
-        								emptyDir: medium: v.medium
-        							}
-        						}
-        					}]
-        				}
-
-        				if parameter["volumeMounts"] != _|_ {
-        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
-        				}
-        			}
-        		}
-        	}
-        }
-        exposePorts: [
-        	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)
-        		}
-        	},
-        ]
-        outputs: {
-        	if len(exposePorts) != 0 {
-        		webserviceExpose: {
-        			apiVersion: "v1"
-        			kind:       "Service"
-        			metadata: name: context.name
-        			spec: {
-        				selector: "app.oam.dev/component": context.name
-        				ports: exposePorts
-        				type:  parameter.exposeType
-        			}
-        		}
-        	}
-        }
-        parameter: {
-        	// +usage=Specify the labels in the workload
-        	labels?: [string]: string
-
-        	// +usage=Specify the annotations in the workload
-        	annotations?: [string]: string
-
-        	// +usage=Which image would you like to use for your service
-        	// +short=i
-        	image: string
-
-        	// +usage=Specify image pull policy for your service
-        	imagePullPolicy?: "Always" | "Never" | "IfNotPresent"
-
-        	// +usage=Specify image pull secrets for your service
-        	imagePullSecrets?: [...string]
-
-        	// +ignore
-        	// +usage=Deprecated field, please use ports instead
-        	// +short=p
-        	port?: int
-
-        	// +usage=Which ports do you want customer traffic sent to, defaults to 80
-        	ports?: [...{
-        		// +usage=Number of port to expose on the pod's IP address
-        		port: int
-        		// +usage=Name of the port
-        		name?: string
-        		// +usage=Protocol for port. Must be UDP, TCP, or SCTP
-        		protocol: *"TCP" | "UDP" | "SCTP"
-        		// +usage=Specify if the port should be exposed
-        		expose: *false | bool
-        	}]
-
-        	// +ignore
-        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer", "ExternalName"
-        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
-
-        	// +ignore
-        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
-        	addRevisionLabel: *false | bool
-
-        	// +usage=Commands to run in the container
-        	cmd?: [...string]
-
-        	// +usage=Define arguments by using environment variables
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
-        	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
-        	cpu?: string
-
-        	// +usage=Specifies the attributes of the memory resource required for the container.
-        	memory?: string
-
-        	volumeMounts?: {
-        		// +usage=Mount PVC type volume
-        		pvc?: [...{
-        			name:      string
-        			mountPath: string
-        			// +usage=The name of the PVC
-        			claimName: string
-        		}]
-        		// +usage=Mount ConfigMap type volume
-        		configMap?: [...{
-        			name:        string
-        			mountPath:   string
-        			defaultMode: *420 | int
-        			cmName:      string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}]
-        		// +usage=Mount Secret type volume
-        		secret?: [...{
-        			name:        string
-        			mountPath:   string
-        			defaultMode: *420 | int
-        			secretName:  string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}]
-        		// +usage=Mount EmptyDir type volume
-        		emptyDir?: [...{
-        			name:      string
-        			mountPath: string
-        			medium:    *"" | "Memory"
-        		}]
-        		// +usage=Mount HostPath type volume
-        		hostPath?: [...{
-        			name:              string
-        			mountPath:         string
-        			mountPropagation?: "None" | "HostToContainer" | "Bidirectional"
-        			path:              string
-        			readOnly?:         bool
-        		}]
-        	}
-
-        	// +usage=Deprecated field, use volumeMounts instead.
-        	volumes?: [...{
-        		name:      string
-        		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
-        		if type == "pvc" {
-        			claimName: string
-        		}
-        		if type == "configMap" {
-        			defaultMode: *420 | int
-        			cmName:      string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}
-        		if type == "secret" {
-        			defaultMode: *420 | int
-        			secretName:  string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}
-        		if type == "emptyDir" {
-        			medium: *"" | "Memory"
-        		}
-        	}]
-
-        	// +usage=Instructions for assessing whether the container is alive.
-        	livenessProbe?: #HealthProbe
-
-        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
-        	readinessProbe?: #HealthProbe
-
-        	// +usage=Specify the hostAliases to add
-        	hostAliases?: [...{
-        		ip: string
-        		hostnames: [...string]
-        	}]
-        }
-        #HealthProbe: {
-
-        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
-        	exec?: {
-        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
-        		command: [...string]
-        	}
-
-        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
-        	httpGet?: {
-        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
-        		path: string
-        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
-        		port:    int
-        		host?:   string
-        		scheme?: *"HTTP" | string
-        		httpHeaders?: [...{
-        			name:  string
-        			value: string
-        		}]
-        	}
-
-        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
-        	tcpSocket?: {
-        		// +usage=The TCP socket within the container that should be probed to assess container health.
-        		port: int
-        	}
-
-        	// +usage=Number of seconds after the container is started before the first probe is initiated.
-        	initialDelaySeconds: *0 | int
-
-        	// +usage=How often, in seconds, to execute the probe.
-        	periodSeconds: *10 | int
-
-        	// +usage=Number of seconds after which the probe times out.
-        	timeoutSeconds: *1 | int
-
-        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
-        	successThreshold: *1 | int
-
-        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
-        	failureThreshold: *3 | int
-        }
-  status:
-    customStatus: |-
-      ready: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.numberReady != _|_ {
-      		replicas: context.output.status.numberReady
-      	}
-      }
-      desired: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.desiredNumberScheduled != _|_ {
-      		replicas: context.output.status.desiredNumberScheduled
-      	}
-      }
-      message: "Ready:\(ready.replicas)/\(desired.replicas)"
-    healthPolicy: |-
-      ready: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.numberReady != _|_ {
-      		replicas: context.output.status.numberReady
-      	}
-      }
-      desired: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.desiredNumberScheduled != _|_ {
-      		replicas: context.output.status.desiredNumberScheduled
-      	}
-      }
-      current: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.currentNumberScheduled != _|_ {
-      		replicas: context.output.status.currentNumberScheduled
-      	}
-      }
-      updated: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.updatedNumberScheduled != _|_ {
-      		replicas: context.output.status.updatedNumberScheduled
-      	}
-      }
-      generation: {
-      	metadata: context.output.metadata.generation
-      	observed: *0 | int
-      } & {
-      	if context.output.status.observedGeneration != _|_ {
-      		observed: context.output.status.observedGeneration
-      	}
-      }
-      isHealth: (desired.replicas == ready.replicas) && (desired.replicas == updated.replicas) && (desired.replicas == current.replicas) && (generation.observed == generation.metadata || generation.observed > generation.metadata)
-  workload:
-    definition:
-      apiVersion: apps/v1
-      kind: DaemonSet
-    type: daemonsets.apps
-
--- a/charts/vela-core/templates/defwithtemplate/deploy2env.yaml
+++ b/charts/vela-core/templates/defwithtemplate/deploy2env.yaml
@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Deploy env binding component to target env
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: deploy2env
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-core/templates/defwithtemplate/expose.yaml
+++ b/charts/vela-core/templates/defwithtemplate/expose.yaml
@@ -14,20 +14,14 @@ spec:
  schematic:
    cue:
      template: |
-        import (
-        	"strconv"
-        )
-
        outputs: service: {
        	apiVersion: "v1"
        	kind:       "Service"
-        	metadata: name:        context.name
-        	metadata: annotations: parameter.annotations
+        	metadata: name: context.name
        	spec: {
        		selector: "app.oam.dev/component": context.name
        		ports: [
        			for p in parameter.port {
-        				name:       "port-" + strconv.FormatInt(p, 10)
        				port:       p
        				targetPort: p
        			},
@@ -38,33 +32,7 @@ spec:
        parameter: {
        	// +usage=Specify the exposion ports
        	port: [...int]
-        	// +usage=Specify the annotaions of the exposed service
-        	annotations: [string]: string
        	// +usage=Specify what kind of Service you want. options: "ClusterIP","NodePort","LoadBalancer","ExternalName"
        	type: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
        }
-  status:
-    customStatus: |-
-      message: *"" | string
-      service: context.outputs.service
-      if service.spec.type == "ClusterIP" {
-      	message: "ClusterIP: \(service.spec.clusterIP)"
-      }
-      if service.spec.type == "LoadBalancer" {
-      	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
-      	if !isHealth {
-      		message: "ExternalIP: Pending"
-      	}
-      	if isHealth {
-      		message: "ExternalIP: \(status.loadBalancer.ingress[0].ip)"
-      	}
-      }
-    healthPolicy: |-
-      isHealth: *true | bool
-      service: context.outputs.service
-      if service.spec.type == "LoadBalancer" {
-      	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
-      }

--- a/charts/vela-core/templates/defwithtemplate/garbage-collect.yaml
+++ b/charts/vela-core/templates/defwithtemplate/garbage-collect.yaml
@@ -1,40 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/garbage-collect.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the garbage collect behaviour for the application.
-  name: garbage-collect
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #GarbageCollectPolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector: [...#ResourcePolicyRuleSelector]
-        	// +usage=Specify the strategy for target resource to recycle
-        	strategy: *"onAppUpdate" | "onAppDelete" | "never"
-        }
-        #ResourcePolicyRuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=If is set, outdated versioned resourcetracker will not be recycled automatically, outdated resources will be kept until resourcetracker be deleted manually
-        	keepLegacyResource: *false | bool
-        	// +usage=Specify the list of rules to control gc strategy at resource level, if one resource is controlled by multiple rules, first rule will be used
-        	rules?: [...#GarbageCollectPolicyRule]
-        }
-
--- a/charts/vela-core/templates/defwithtemplate/gateway.yaml
+++ b/charts/vela-core/templates/defwithtemplate/gateway.yaml
@@ -38,9 +38,6 @@ spec:
        			if !parameter.classInSpec {
        				"kubernetes.io/ingress.class": parameter.class
        			}
-        			if parameter.gatewayHost != _|_ {
-        				"ingress.controller/host": parameter.gatewayHost
-        			}
        		}
        	}
        	spec: {
@@ -87,9 +84,6 @@ spec:

        	// +usage=Specify the secret name you want to quote.
        	secretName?: string
-
-        	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
-        	gatewayHost?: string
        }
  status:
    customStatus: |-
--- a/charts/vela-core/templates/defwithtemplate/init-container.yaml
+++ b/charts/vela-core/templates/defwithtemplate/init-container.yaml
@@ -43,7 +43,7 @@ spec:
        		volumeMounts: [{
        			name:      parameter.mountName
        			mountPath: parameter.initMountPath
-        		}] + parameter.extraVolumeMounts
+        		}]
        	}]
        	// +patchKey=name
        	volumes: [{
@@ -97,13 +97,5 @@ spec:

        	// +usage=Specify the mount path of init container
        	initMountPath: string
-
-        	// +usage=Specify the extra volume mounts for the init container
-        	extraVolumeMounts: [...{
-        		// +usage=The name of the volume to be mounted
-        		name: string
-        		// +usage=The mountPath for mount in the init container
-        		mountPath: string
-        	}]
        }

--- a/charts/vela-core/templates/defwithtemplate/json-merge-patch.yaml
+++ b/charts/vela-core/templates/defwithtemplate/json-merge-patch.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Patch the output following Json Merge Patch strategy, following RFC 7396.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: json-merge-patch
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-core/templates/defwithtemplate/json-patch.yaml
+++ b/charts/vela-core/templates/defwithtemplate/json-patch.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Patch the output following Json Patch strategy, following RFC 6902.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: json-patch
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-core/templates/defwithtemplate/ref-objects.yaml
+++ b/charts/vela-core/templates/defwithtemplate/ref-objects.yaml
@@ -5,8 +5,6 @@ kind: ComponentDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Ref-objects allow users to specify ref objects to use. Notice that this component type have special handle logic.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: ref-objects
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -14,26 +12,15 @@ spec:
    cue:
      template: |
        #K8sObject: {
-        	// +usage=The resource type for the Kubernetes objects
-        	resource?: string
-        	// +usage=The group name for the Kubernetes objects
-        	group?: string
-        	// +usage=If specified, fetch the Kubernetes objects with the name, exclusive to labelSelector
-        	name?: string
-        	// +usage=If specified, fetch the Kubernetes objects from the namespace. Otherwise, fetch from the application's namespace.
-        	namespace?: string
-        	// +usage=If specified, fetch the Kubernetes objects from the cluster. Otherwise, fetch from the local cluster.
-        	cluster?: string
-        	// +usage=If specified, fetch the Kubernetes objects according to the label selector, exclusive to name
-        	labelSelector?: [string]: string
-        	...
-        }
-        output: {
-        	if len(parameter.objects) > 0 {
-        		parameter.objects[0]
+        	apiVersion: string
+        	kind:       string
+        	metadata: {
+        		name: string
+        		...
        	}
        	...
        }
+        output: parameter.objects[0]
        outputs: {
        	for i, v in parameter.objects {
        		if i > 0 {
@@ -41,12 +28,7 @@ spec:
        		}
        	}
        }
-        parameter: {
-        	// +usage=If specified, application will fetch native Kubernetes objects according to the object description
-        	objects?: [...#K8sObject]
-        	// +usage=If specified, the objects in the urls will be loaded.
-        	urls?: [...string]
-        }
+        parameter: objects: [...#K8sObject]
  status:
    customStatus: |-
      if context.output.apiVersion == "apps/v1" && context.output.kind == "Deployment" {
--- a/charts/vela-core/templates/defwithtemplate/service-account.yaml
+++ b/charts/vela-core/templates/defwithtemplate/service-account.yaml
@@ -14,114 +14,10 @@ spec:
  schematic:
    cue:
      template: |
-        #Privileges: {
-        	// +usage=Specify the verbs to be allowed for the resource
-        	verbs: [...string]
-        	// +usage=Specify the apiGroups of the resource
-        	apiGroups?: [...string]
-        	// +usage=Specify the resources to be allowed
-        	resources?: [...string]
-        	// +usage=Specify the resourceNames to be allowed
-        	resourceNames?: [...string]
-        	// +usage=Specify the resource url to be allowed
-        	nonResourceURLs?: [...string]
-        	// +usage=Specify the scope of the privileges, default to be namespace scope
-        	scope: *"namespace" | "cluster"
-        }
        parameter: {
        	// +usage=Specify the name of ServiceAccount
        	name: string
-        	// +usage=Specify whether to create new ServiceAccount or not
-        	create: *false | bool
-        	// +usage=Specify the privileges of the ServiceAccount, if not empty, RoleBindings(ClusterRoleBindings) will be created
-        	privileges?: [...#Privileges]
        }
        // +patchStrategy=retainKeys
        patch: spec: template: spec: serviceAccountName: parameter.name
-        _clusterPrivileges: [ for p in parameter.privileges if p.scope == "cluster" {p}]
-        _namespacePrivileges: [ for p in parameter.privileges if p.scope == "namespace" {p}]
-        outputs: {
-        	if parameter.create {
-        		"service-account": {
-        			apiVersion: "v1"
-        			kind:       "ServiceAccount"
-        			metadata: name: parameter.name
-        		}
-        	}
-        	if parameter.privileges != _|_ {
-        		if len(_clusterPrivileges) > 0 {
-        			"cluster-role": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "ClusterRole"
-        				metadata: name: "\(context.namespace):\(parameter.name)"
-        				rules: [ for p in _clusterPrivileges {
-        					verbs: p.verbs
-        					if p.apiGroups != _|_ {
-        						apiGroups: p.apiGroups
-        					}
-        					if p.resources != _|_ {
-        						resources: p.resources
-        					}
-        					if p.resourceNames != _|_ {
-        						resourceNames: p.resourceNames
-        					}
-        					if p.nonResourceURLs != _|_ {
-        						nonResourceURLs: p.nonResourceURLs
-        					}
-        				}]
-        			}
-        			"cluster-role-binding": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "ClusterRoleBinding"
-        				metadata: name: "\(context.namespace):\(parameter.name)"
-        				roleRef: {
-        					apiGroup: "rbac.authorization.k8s.io"
-        					kind:     "ClusterRole"
-        					name:     "\(context.namespace):\(parameter.name)"
-        				}
-        				subjects: [{
-        					kind:      "ServiceAccount"
-        					name:      parameter.name
-        					namespace: "\(context.namespace)"
-        				}]
-        			}
-        		}
-        		if len(_namespacePrivileges) > 0 {
-        			role: {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "Role"
-        				metadata: name: parameter.name
-        				rules: [ for p in _namespacePrivileges {
-        					verbs: p.verbs
-        					if p.apiGroups != _|_ {
-        						apiGroups: p.apiGroups
-        					}
-        					if p.resources != _|_ {
-        						resources: p.resources
-        					}
-        					if p.resourceNames != _|_ {
-        						resourceNames: p.resourceNames
-        					}
-        					if p.nonResourceURLs != _|_ {
-        						nonResourceURLs: p.nonResourceURLs
-        					}
-        				}]
-        			}
-        			"role-binding": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "RoleBinding"
-        				metadata: name: parameter.name
-        				roleRef: {
-        					apiGroup: "rbac.authorization.k8s.io"
-        					kind:     "Role"
-        					name:     parameter.name
-        				}
-        				subjects: [{
-        					kind: "ServiceAccount"
-        					name: parameter.name
-        				}]
-        			}
-        		}
-        	}
-        }

--- a/charts/vela-core/templates/defwithtemplate/sidecar.yaml
+++ b/charts/vela-core/templates/defwithtemplate/sidecar.yaml
@@ -82,11 +82,6 @@ spec:
        				// +usage=The key of the config map to select from. Must be a valid secret key
        				key: string
        			}
-        			// +usage=Specify the field reference for env
-        			fieldRef?: {
-        				// +usage=Specify the field path for env
-        				fieldPath: string
-        			}
        		}
        	}]

--- a/charts/vela-core/templates/defwithtemplate/step-group.yaml
+++ b/charts/vela-core/templates/defwithtemplate/step-group.yaml
@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
  annotations:
    definition.oam.dev/description: step group
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: step-group
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-core/templates/defwithtemplate/storage.yaml
+++ b/charts/vela-core/templates/defwithtemplate/storage.yaml
@@ -64,9 +64,6 @@ spec:
        			{
        				name:      "pvc-" + v.name
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
        			}
        		}
        	},
@@ -76,9 +73,6 @@ spec:
        		{
        			name:      "configmap-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -109,9 +103,6 @@ spec:
        		{
        			name:      "secret-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -142,9 +133,6 @@ spec:
        		{
        			name:      "emptydir-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -153,28 +141,12 @@ spec:
        		{
        			name:       "pvc-" + v.name
        			devicePath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
-        volumesList: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList
-        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
-        	},
-        ]
        patch: spec: template: spec: {
        	// +patchKey=name
-        	volumes: deDupVolumesArray
+        	volumes: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList

        	containers: [{
        		// +patchKey=name
@@ -262,7 +234,6 @@ spec:
        		name:              string
        		mountOnly:         *false | bool
        		mountPath:         string
-        		subPath?:          string
        		volumeMode:        *"Filesystem" | string
        		volumeName?:       string
        		accessModes:       *["ReadWriteOnce"] | [...string]
@@ -304,7 +275,6 @@ spec:
        			configMapKey: string
        		}]
        		mountPath?:  string
-        		subPath?:    string
        		defaultMode: *420 | int
        		readOnly:    *false | bool
        		data?: {...}
@@ -328,7 +298,6 @@ spec:
        			secretKey: string
        		}]
        		mountPath?:  string
-        		subPath?:    string
        		defaultMode: *420 | int
        		readOnly:    *false | bool
        		stringData?: {...}
@@ -344,7 +313,6 @@ spec:
        	emptyDir?: [...{
        		name:      string
        		mountPath: string
-        		subPath?:  string
        		medium:    *"" | "Memory"
        	}]
        }
--- a/charts/vela-core/templates/defwithtemplate/task.yaml
+++ b/charts/vela-core/templates/defwithtemplate/task.yaml
@@ -149,14 +149,14 @@ spec:
        		// +usage=Specifies a source the value of this var should come from
        		valueFrom?: {
        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
+        			secretKeyRef: {
        				// +usage=The name of the secret in the pod's namespace to select from
        				name: string
        				// +usage=The key of the secret to select from. Must be a valid secret key
        				key: string
        			}
        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
+        			configMapKeyRef: {
        				// +usage=The name of the config map in the pod's namespace to select from
        				name: string
        				// +usage=The key of the config map to select from. Must be a valid secret key
--- a/charts/vela-core/templates/defwithtemplate/webservice.yaml
+++ b/charts/vela-core/templates/defwithtemplate/webservice.yaml
@@ -20,10 +20,7 @@ spec:
        		for v in parameter.volumeMounts.pvc {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -32,10 +29,7 @@ spec:
        			for v in parameter.volumeMounts.configMap {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -44,10 +38,7 @@ spec:
        		for v in parameter.volumeMounts.secret {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -56,10 +47,7 @@ spec:
        			for v in parameter.volumeMounts.emptyDir {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -68,10 +56,7 @@ spec:
        			for v in parameter.volumeMounts.hostPath {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -134,19 +119,6 @@ spec:
        		},
        	] | []
        }
-        volumesList: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
-        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
-        	},
-        ]
        output: {
        	apiVersion: "apps/v1"
        	kind:       "Deployment"
@@ -290,7 +262,7 @@ spec:
        				}

        				if parameter["volumeMounts"] != _|_ {
-        					volumes: deDupVolumesArray
+        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
        				}
        			}
        		}
@@ -357,8 +329,8 @@ spec:
        	}]

        	// +ignore
-        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer"
-        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer"
+        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer", "ExternalName"
+        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"

        	// +ignore
        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
@@ -403,7 +375,6 @@ spec:
        		pvc?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			// +usage=The name of the PVC
        			claimName: string
        		}]
@@ -411,7 +382,6 @@ spec:
        		configMap?: [...{
        			name:        string
        			mountPath:   string
-        			subPath?:    string
        			defaultMode: *420 | int
        			cmName:      string
        			items?: [...{
@@ -424,7 +394,6 @@ spec:
        		secret?: [...{
        			name:        string
        			mountPath:   string
-        			subPath?:    string
        			defaultMode: *420 | int
        			secretName:  string
        			items?: [...{
@@ -437,14 +406,12 @@ spec:
        		emptyDir?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			medium:    *"" | "Memory"
        		}]
        		// +usage=Mount HostPath type volume
        		hostPath?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			path:      string
        		}]
        	}
--- a/charts/vela-core/templates/kubevela-controller.yaml
+++ b/charts/vela-core/templates/kubevela-controller.yaml
@@ -20,54 +20,12 @@ metadata:
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: {{ if .Values.authentication.enabled }} {{ include "kubevela.fullname" . }}:manager {{ else }} "cluster-admin" {{ end }}
+  name: "cluster-admin"
 subjects:
  - kind: ServiceAccount
    name: {{ include "kubevela.serviceAccountName" . }}
    namespace: {{ .Release.Namespace }}

-{{ if .Values.authentication.enabled }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "kubevela.fullname" . }}:manager
-rules:
-  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev"]
-    resources: ["*"]
-    verbs: ["*"]
-  - apiGroups: ["cluster.open-cluster-management.io"]
-    resources: ["managedclusters"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["users", "groups", "serviceaccounts"]
-    verbs: ["impersonate"]
-  - apiGroups: [""]
-    resources: ["namespaces", "secrets", "services"]
-    verbs: ["get", "watch", "list"]
-  - apiGroups: [""]
-    resources: ["configmaps", "events"]
-    verbs: ["*"]
-  - apiGroups: ["apps"]
-    resources: ["controllerrevisions"]
-    verbs: ["*"]
-  - apiGroups: ["apiregistration.k8s.io"]
-    resources: ["apiservices"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["*"]
-  - apiGroups: ["admissionregistration.k8s.io"]
-    resources: ["mutatingwebhookconfigurations", "validatingwebhookconfigurations"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["flowcontrol.apiserver.k8s.io"]
-    resources: ["prioritylevelconfigurations", "flowschemas"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["authorization.k8s.io"]
-    resources: ["subjectaccessreviews"]
-    verbs: ["*"]
-{{ end }}
-
 ---
 # permissions to do leader election.
 apiVersion: rbac.authorization.k8s.io/v1
@@ -122,7 +80,6 @@ metadata:
  name: {{ include "kubevela.fullname" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    controller.oam.dev/name: vela-core
  {{- include "kubevela.labels" . | nindent 4 }}
 spec:
  replicas: {{ .Values.replicaCount }}
@@ -217,7 +174,6 @@ spec:
            - "--max-workflow-step-error-retry-times={{ .Values.workflow.step.errorRetryTimes }}"
            - "--feature-gates=EnableSuspendOnFailure={{- .Values.workflow.enableSuspendOnFailure | toString -}}"
            - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
-            - "--feature-gates=LegacyComponentRevision={{- .Values.featureGates.enableLegacyComponentRevision | toString -}}"
            {{ if .Values.authentication.enabled }}
            {{ if .Values.authentication.withUser }}
            - "--authentication-with-user"
--- a/charts/vela-core/templates/test/test-application.yaml
+++ b/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,6 +52,12 @@ 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"
--- a/charts/vela-core/values.yaml
+++ b/charts/vela-core/values.yaml
@@ -109,10 +109,6 @@ optimize:
  disableResourceApplyDoubleCheck: false
  enableResourceTrackerDeleteOnlyTrigger: true

-##@param featureGates.enableLegacyComponentRevision if disabled, only component with rollout trait will create component revisions
-featureGates:
-  enableLegacyComponentRevision: false
-
 ## @section MultiCluster parameters

 ## @param multicluster.enabled Whether to enable multi-cluster
@@ -230,7 +226,7 @@ admissionWebhooks:
    enabled: true
    image:
      repository: oamdev/kube-webhook-certgen
-      tag: v2.4.1
+      tag: v2.4.0
      pullPolicy: IfNotPresent
    nodeSelector: {}
    affinity: {}
--- a/charts/vela-minimal/crds/core.oam.dev_applicationrevisions.yaml
+++ b/charts/vela-minimal/crds/core.oam.dev_applicationrevisions.yaml
@@ -2198,17 +2198,6 @@ spec:
                          a context in annotation. - should mark "finish" phase in
                          status.conditions.'
                        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:
@@ -2236,13 +2225,6 @@ spec:
                                    - 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.
@@ -2289,13 +2271,6 @@ spec:
                                          - 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.
@@ -2317,8 +2292,6 @@ spec:
                                      properties:
                                        type: object
                                        x-kubernetes-preserve-unknown-fields: true
-                                      timeout:
-                                        type: string
                                      type:
                                        type: string
                                    required:
@@ -2326,8 +2299,6 @@ spec:
                                    - type
                                    type: object
                                  type: array
-                                timeout:
-                                  type: string
                                type:
                                  type: string
                              required:
@@ -4002,13 +3973,6 @@ spec:
                            - 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
@@ -4053,13 +4017,6 @@ spec:
                                  - 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.
@@ -4081,8 +4038,6 @@ spec:
                              properties:
                                type: object
                                x-kubernetes-preserve-unknown-fields: true
-                              timeout:
-                                type: string
                              type:
                                type: string
                            required:
@@ -4090,8 +4045,6 @@ spec:
                            - type
                            type: object
                          type: array
-                        timeout:
-                          type: string
                        type:
                          type: string
                      required:
--- a/charts/vela-minimal/crds/core.oam.dev_applications.yaml
+++ b/charts/vela-minimal/crds/core.oam.dev_applications.yaml
@@ -1009,17 +1009,6 @@ spec:
                  order, and each step: - will have a context in annotation. - should
                  mark "finish" phase in status.conditions.'
                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:
@@ -1046,13 +1035,6 @@ spec:
                            - 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
@@ -1097,13 +1079,6 @@ spec:
                                  - 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.
@@ -1125,8 +1100,6 @@ spec:
                              properties:
                                type: object
                                x-kubernetes-preserve-unknown-fields: true
-                              timeout:
-                                type: string
                              type:
                                type: string
                            required:
@@ -1134,8 +1107,6 @@ spec:
                            - type
                            type: object
                          type: array
-                        timeout:
-                          type: string
                        type:
                          type: string
                      required:
--- a/charts/vela-minimal/templates/cluster-gateway.yaml
+++ b/charts/vela-minimal/templates/cluster-gateway.yaml
@@ -212,7 +212,4 @@ subjects:
  - kind: Group
    name: kubevela:client
    apiGroup: rbac.authorization.k8s.io
-  - kind: ServiceAccount
-    name: {{ include "kubevela.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
 {{ end }}
--- a/charts/vela-minimal/templates/defwithtemplate/affinity.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/affinity.yaml
@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
  annotations:
-    definition.oam.dev/description: Affinity specifies affinity and toleration K8s pod for your workload which follows the pod spec in path 'spec.template'.
+    definition.oam.dev/description: affinity specify affinity and tolerationon K8s pod for your workload which follows the pod spec in path 'spec.template'.
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: affinity
--- a/charts/vela-minimal/templates/defwithtemplate/apply-once.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/apply-once.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/apply-once.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the behaviour of preventing configuration drift.
-  name: apply-once
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #ApplyOnceStrategy: {
-        	// +usage=Specify the path of the resource that allow configuration drift
-        	path: [...string]
-        }
-        #ApplyOncePolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector?: #ResourcePolicyRuleSelector
-        	// +usage=Specify the strategy for configuring the resource level configuration drift behaviour
-        	strategy: #ApplyOnceStrategy
-        }
-        #ResourcePolicyRuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=Whether to enable apply-once for the whole application
-        	enable: *false | bool
-        	// +usage=Specify the rules for configuring apply-once policy in resource level
-        	rules?: [...#ApplyOncePolicyRule]
-        }
-
--- a/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml
@@ -4,13 +4,13 @@ apiVersion: core.oam.dev/v1beta1
 kind: ComponentDefinition
 metadata:
  annotations:
-    alias.config.oam.dev: Image Registry
+    custom.definition.oam.dev/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/catalog.config.oam.dev: velacore-config
+    custom.definition.oam.dev/multi-cluster.config.oam.dev: "true"
+    custom.definition.oam.dev/type.config.oam.dev: image-registry
    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:
@@ -20,7 +20,6 @@ spec:
        import (
        	"encoding/base64"
        	"encoding/json"
-        	"strconv"
        )

        output: {
@@ -43,29 +42,21 @@ spec:
        	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.auth != _|_ {
+        		stringData: ".dockerconfigjson": json.Marshal({
+        			auths: "\(parameter.registry)": {
+        				username: parameter.auth.username
+        				password: parameter.auth.password
+        				if parameter.auth.email != _|_ {
+        					email: parameter.auth.email
        				}
-        			})
-        		}
-        		if parameter.insecure != _|_ {
-        			"insecure-skip-verify": strconv.FormatBool(parameter.insecure)
-        		}
-        		if parameter.useHTTP != _|_ {
-        			"protocol-use-http": strconv.FormatBool(parameter.useHTTP)
-        		}
+        				auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        			}
+        		})
        	}
        }
        parameter: {
-        	// +usage=Image registry FQDN, such as: index.docker.io
+        	// +usage=Image registry FQDN
        	registry: string
        	// +usage=Authenticate the image registry
        	auth?: {
@@ -76,10 +67,6 @@ spec:
        		// +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
--- a/charts/vela-minimal/templates/defwithtemplate/container-image.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/container-image.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Set the image of the container.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: container-image
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-minimal/templates/defwithtemplate/cron-task.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/cron-task.yaml
@@ -196,14 +196,14 @@ spec:
        		// +usage=Specifies a source the value of this var should come from
        		valueFrom?: {
        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
+        			secretKeyRef: {
        				// +usage=The name of the secret in the pod's namespace to select from
        				name: string
        				// +usage=The key of the secret to select from. Must be a valid secret key
        				key: string
        			}
        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
+        			configMapKeyRef: {
        				// +usage=The name of the config map in the pod's namespace to select from
        				name: string
        				// +usage=The key of the config map to select from. Must be a valid secret key
--- a/charts/vela-minimal/templates/defwithtemplate/daemon.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/daemon.yaml
@@ -1,574 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/daemon.cue
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Describes daemonset services in Kubernetes.
-  name: daemon
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"strconv"
-        )
-
-        mountsArray: {
-        	pvc: *[
-        		for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
-        			}
-        		},
-        	] | []
-
-        	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"
-        	spec: {
-        		selector: matchLabels: "app.oam.dev/component": context.name
-
-        		template: {
-        			metadata: {
-        				labels: {
-        					if parameter.labels != _|_ {
-        						parameter.labels
-        					}
-        					if parameter.addRevisionLabel {
-        						"app.oam.dev/revision": context.revision
-        					}
-        					"app.oam.dev/name":      context.appName
-        					"app.oam.dev/component": context.name
-        				}
-        				if parameter.annotations != _|_ {
-        					annotations: parameter.annotations
-        				}
-        			}
-
-        			spec: {
-        				containers: [{
-        					name:  context.name
-        					image: parameter.image
-        					if parameter["port"] != _|_ && parameter["ports"] == _|_ {
-        						ports: [{
-        							containerPort: parameter.port
-        						}]
-        					}
-        					if parameter["ports"] != _|_ {
-        						ports: [ for v in parameter.ports {
-        							{
-        								containerPort: v.port
-        								protocol:      v.protocol
-        								if v.name != _|_ {
-        									name: v.name
-        								}
-        								if v.name == _|_ {
-        									name: "port-" + strconv.FormatInt(v.port, 10)
-        								}
-        							}}]
-        					}
-
-        					if parameter["imagePullPolicy"] != _|_ {
-        						imagePullPolicy: parameter.imagePullPolicy
-        					}
-
-        					if parameter["cmd"] != _|_ {
-        						command: parameter.cmd
-        					}
-
-        					if parameter["env"] != _|_ {
-        						env: parameter.env
-        					}
-
-        					if context["config"] != _|_ {
-        						env: context.config
-        					}
-
-        					if parameter["cpu"] != _|_ {
-        						resources: {
-        							limits: cpu:   parameter.cpu
-        							requests: cpu: parameter.cpu
-        						}
-        					}
-
-        					if parameter["memory"] != _|_ {
-        						resources: {
-        							limits: memory:   parameter.memory
-        							requests: memory: parameter.memory
-        						}
-        					}
-
-        					if parameter["volumes"] != _|_ && parameter["volumeMounts"] == _|_ {
-        						volumeMounts: [ for v in parameter.volumes {
-        							{
-        								mountPath: v.mountPath
-        								name:      v.name
-        							}}]
-        					}
-
-        					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
-        					}
-
-        					if parameter["livenessProbe"] != _|_ {
-        						livenessProbe: parameter.livenessProbe
-        					}
-
-        					if parameter["readinessProbe"] != _|_ {
-        						readinessProbe: parameter.readinessProbe
-        					}
-
-        				}]
-
-        				if parameter["hostAliases"] != _|_ {
-        					// +patchKey=ip
-        					hostAliases: parameter.hostAliases
-        				}
-
-        				if parameter["imagePullSecrets"] != _|_ {
-        					imagePullSecrets: [ for v in parameter.imagePullSecrets {
-        						name: v
-        					},
-        					]
-        				}
-
-        				if parameter["volumes"] != _|_ && parameter["volumeMounts"] == _|_ {
-        					volumes: [ for v in parameter.volumes {
-        						{
-        							name: v.name
-        							if v.type == "pvc" {
-        								persistentVolumeClaim: claimName: v.claimName
-        							}
-        							if v.type == "configMap" {
-        								configMap: {
-        									defaultMode: v.defaultMode
-        									name:        v.cmName
-        									if v.items != _|_ {
-        										items: v.items
-        									}
-        								}
-        							}
-        							if v.type == "secret" {
-        								secret: {
-        									defaultMode: v.defaultMode
-        									secretName:  v.secretName
-        									if v.items != _|_ {
-        										items: v.items
-        									}
-        								}
-        							}
-        							if v.type == "emptyDir" {
-        								emptyDir: medium: v.medium
-        							}
-        						}
-        					}]
-        				}
-
-        				if parameter["volumeMounts"] != _|_ {
-        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
-        				}
-        			}
-        		}
-        	}
-        }
-        exposePorts: [
-        	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)
-        		}
-        	},
-        ]
-        outputs: {
-        	if len(exposePorts) != 0 {
-        		webserviceExpose: {
-        			apiVersion: "v1"
-        			kind:       "Service"
-        			metadata: name: context.name
-        			spec: {
-        				selector: "app.oam.dev/component": context.name
-        				ports: exposePorts
-        				type:  parameter.exposeType
-        			}
-        		}
-        	}
-        }
-        parameter: {
-        	// +usage=Specify the labels in the workload
-        	labels?: [string]: string
-
-        	// +usage=Specify the annotations in the workload
-        	annotations?: [string]: string
-
-        	// +usage=Which image would you like to use for your service
-        	// +short=i
-        	image: string
-
-        	// +usage=Specify image pull policy for your service
-        	imagePullPolicy?: "Always" | "Never" | "IfNotPresent"
-
-        	// +usage=Specify image pull secrets for your service
-        	imagePullSecrets?: [...string]
-
-        	// +ignore
-        	// +usage=Deprecated field, please use ports instead
-        	// +short=p
-        	port?: int
-
-        	// +usage=Which ports do you want customer traffic sent to, defaults to 80
-        	ports?: [...{
-        		// +usage=Number of port to expose on the pod's IP address
-        		port: int
-        		// +usage=Name of the port
-        		name?: string
-        		// +usage=Protocol for port. Must be UDP, TCP, or SCTP
-        		protocol: *"TCP" | "UDP" | "SCTP"
-        		// +usage=Specify if the port should be exposed
-        		expose: *false | bool
-        	}]
-
-        	// +ignore
-        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer", "ExternalName"
-        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
-
-        	// +ignore
-        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
-        	addRevisionLabel: *false | bool
-
-        	// +usage=Commands to run in the container
-        	cmd?: [...string]
-
-        	// +usage=Define arguments by using environment variables
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
-        	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
-        	cpu?: string
-
-        	// +usage=Specifies the attributes of the memory resource required for the container.
-        	memory?: string
-
-        	volumeMounts?: {
-        		// +usage=Mount PVC type volume
-        		pvc?: [...{
-        			name:      string
-        			mountPath: string
-        			// +usage=The name of the PVC
-        			claimName: string
-        		}]
-        		// +usage=Mount ConfigMap type volume
-        		configMap?: [...{
-        			name:        string
-        			mountPath:   string
-        			defaultMode: *420 | int
-        			cmName:      string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}]
-        		// +usage=Mount Secret type volume
-        		secret?: [...{
-        			name:        string
-        			mountPath:   string
-        			defaultMode: *420 | int
-        			secretName:  string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}]
-        		// +usage=Mount EmptyDir type volume
-        		emptyDir?: [...{
-        			name:      string
-        			mountPath: string
-        			medium:    *"" | "Memory"
-        		}]
-        		// +usage=Mount HostPath type volume
-        		hostPath?: [...{
-        			name:              string
-        			mountPath:         string
-        			mountPropagation?: "None" | "HostToContainer" | "Bidirectional"
-        			path:              string
-        			readOnly?:         bool
-        		}]
-        	}
-
-        	// +usage=Deprecated field, use volumeMounts instead.
-        	volumes?: [...{
-        		name:      string
-        		mountPath: string
-        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
-        		type: "pvc" | "configMap" | "secret" | "emptyDir"
-        		if type == "pvc" {
-        			claimName: string
-        		}
-        		if type == "configMap" {
-        			defaultMode: *420 | int
-        			cmName:      string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}
-        		if type == "secret" {
-        			defaultMode: *420 | int
-        			secretName:  string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}
-        		if type == "emptyDir" {
-        			medium: *"" | "Memory"
-        		}
-        	}]
-
-        	// +usage=Instructions for assessing whether the container is alive.
-        	livenessProbe?: #HealthProbe
-
-        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
-        	readinessProbe?: #HealthProbe
-
-        	// +usage=Specify the hostAliases to add
-        	hostAliases?: [...{
-        		ip: string
-        		hostnames: [...string]
-        	}]
-        }
-        #HealthProbe: {
-
-        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
-        	exec?: {
-        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
-        		command: [...string]
-        	}
-
-        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
-        	httpGet?: {
-        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
-        		path: string
-        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
-        		port:    int
-        		host?:   string
-        		scheme?: *"HTTP" | string
-        		httpHeaders?: [...{
-        			name:  string
-        			value: string
-        		}]
-        	}
-
-        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
-        	tcpSocket?: {
-        		// +usage=The TCP socket within the container that should be probed to assess container health.
-        		port: int
-        	}
-
-        	// +usage=Number of seconds after the container is started before the first probe is initiated.
-        	initialDelaySeconds: *0 | int
-
-        	// +usage=How often, in seconds, to execute the probe.
-        	periodSeconds: *10 | int
-
-        	// +usage=Number of seconds after which the probe times out.
-        	timeoutSeconds: *1 | int
-
-        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
-        	successThreshold: *1 | int
-
-        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
-        	failureThreshold: *3 | int
-        }
-  status:
-    customStatus: |-
-      ready: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.numberReady != _|_ {
-      		replicas: context.output.status.numberReady
-      	}
-      }
-      desired: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.desiredNumberScheduled != _|_ {
-      		replicas: context.output.status.desiredNumberScheduled
-      	}
-      }
-      message: "Ready:\(ready.replicas)/\(desired.replicas)"
-    healthPolicy: |-
-      ready: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.numberReady != _|_ {
-      		replicas: context.output.status.numberReady
-      	}
-      }
-      desired: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.desiredNumberScheduled != _|_ {
-      		replicas: context.output.status.desiredNumberScheduled
-      	}
-      }
-      current: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.currentNumberScheduled != _|_ {
-      		replicas: context.output.status.currentNumberScheduled
-      	}
-      }
-      updated: {
-      	replicas: *0 | int
-      } & {
-      	if context.output.status.updatedNumberScheduled != _|_ {
-      		replicas: context.output.status.updatedNumberScheduled
-      	}
-      }
-      generation: {
-      	metadata: context.output.metadata.generation
-      	observed: *0 | int
-      } & {
-      	if context.output.status.observedGeneration != _|_ {
-      		observed: context.output.status.observedGeneration
-      	}
-      }
-      isHealth: (desired.replicas == ready.replicas) && (desired.replicas == updated.replicas) && (desired.replicas == current.replicas) && (generation.observed == generation.metadata || generation.observed > generation.metadata)
-  workload:
-    definition:
-      apiVersion: apps/v1
-      kind: DaemonSet
-    type: daemonsets.apps
-
--- a/charts/vela-minimal/templates/defwithtemplate/expose.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/expose.yaml
@@ -14,20 +14,14 @@ spec:
  schematic:
    cue:
      template: |
-        import (
-        	"strconv"
-        )
-
        outputs: service: {
        	apiVersion: "v1"
        	kind:       "Service"
-        	metadata: name:        context.name
-        	metadata: annotations: parameter.annotations
+        	metadata: name: context.name
        	spec: {
        		selector: "app.oam.dev/component": context.name
        		ports: [
        			for p in parameter.port {
-        				name:       "port-" + strconv.FormatInt(p, 10)
        				port:       p
        				targetPort: p
        			},
@@ -38,33 +32,7 @@ spec:
        parameter: {
        	// +usage=Specify the exposion ports
        	port: [...int]
-        	// +usage=Specify the annotaions of the exposed service
-        	annotations: [string]: string
        	// +usage=Specify what kind of Service you want. options: "ClusterIP","NodePort","LoadBalancer","ExternalName"
        	type: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
        }
-  status:
-    customStatus: |-
-      message: *"" | string
-      service: context.outputs.service
-      if service.spec.type == "ClusterIP" {
-      	message: "ClusterIP: \(service.spec.clusterIP)"
-      }
-      if service.spec.type == "LoadBalancer" {
-      	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
-      	if !isHealth {
-      		message: "ExternalIP: Pending"
-      	}
-      	if isHealth {
-      		message: "ExternalIP: \(status.loadBalancer.ingress[0].ip)"
-      	}
-      }
-    healthPolicy: |-
-      isHealth: *true | bool
-      service: context.outputs.service
-      if service.spec.type == "LoadBalancer" {
-      	status: service.status
-      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
-      }

--- a/charts/vela-minimal/templates/defwithtemplate/garbage-collect.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/garbage-collect.yaml
@@ -1,40 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/garbage-collect.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the garbage collect behaviour for the application.
-  name: garbage-collect
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #GarbageCollectPolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector: [...#ResourcePolicyRuleSelector]
-        	// +usage=Specify the strategy for target resource to recycle
-        	strategy: *"onAppUpdate" | "onAppDelete" | "never"
-        }
-        #ResourcePolicyRuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=If is set, outdated versioned resourcetracker will not be recycled automatically, outdated resources will be kept until resourcetracker be deleted manually
-        	keepLegacyResource: *false | bool
-        	// +usage=Specify the list of rules to control gc strategy at resource level, if one resource is controlled by multiple rules, first rule will be used
-        	rules?: [...#GarbageCollectPolicyRule]
-        }
-
--- a/charts/vela-minimal/templates/defwithtemplate/gateway.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/gateway.yaml
@@ -38,9 +38,6 @@ spec:
        			if !parameter.classInSpec {
        				"kubernetes.io/ingress.class": parameter.class
        			}
-        			if parameter.gatewayHost != _|_ {
-        				"ingress.controller/host": parameter.gatewayHost
-        			}
        		}
        	}
        	spec: {
@@ -87,9 +84,6 @@ spec:

        	// +usage=Specify the secret name you want to quote.
        	secretName?: string
-
-        	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
-        	gatewayHost?: string
        }
  status:
    customStatus: |-
--- a/charts/vela-minimal/templates/defwithtemplate/init-container.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/init-container.yaml
@@ -43,7 +43,7 @@ spec:
        		volumeMounts: [{
        			name:      parameter.mountName
        			mountPath: parameter.initMountPath
-        		}] + parameter.extraVolumeMounts
+        		}]
        	}]
        	// +patchKey=name
        	volumes: [{
@@ -97,13 +97,5 @@ spec:

        	// +usage=Specify the mount path of init container
        	initMountPath: string
-
-        	// +usage=Specify the extra volume mounts for the init container
-        	extraVolumeMounts: [...{
-        		// +usage=The name of the volume to be mounted
-        		name: string
-        		// +usage=The mountPath for mount in the init container
-        		mountPath: string
-        	}]
        }

--- a/charts/vela-minimal/templates/defwithtemplate/json-merge-patch.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/json-merge-patch.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Patch the output following Json Merge Patch strategy, following RFC 7396.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: json-merge-patch
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-minimal/templates/defwithtemplate/json-patch.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/json-patch.yaml
@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Patch the output following Json Patch strategy, following RFC 6902.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: json-patch
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-minimal/templates/defwithtemplate/ref-objects.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/ref-objects.yaml
@@ -5,8 +5,6 @@ kind: ComponentDefinition
 metadata:
  annotations:
    definition.oam.dev/description: Ref-objects allow users to specify ref objects to use. Notice that this component type have special handle logic.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: ref-objects
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -14,26 +12,15 @@ spec:
    cue:
      template: |
        #K8sObject: {
-        	// +usage=The resource type for the Kubernetes objects
-        	resource?: string
-        	// +usage=The group name for the Kubernetes objects
-        	group?: string
-        	// +usage=If specified, fetch the Kubernetes objects with the name, exclusive to labelSelector
-        	name?: string
-        	// +usage=If specified, fetch the Kubernetes objects from the namespace. Otherwise, fetch from the application's namespace.
-        	namespace?: string
-        	// +usage=If specified, fetch the Kubernetes objects from the cluster. Otherwise, fetch from the local cluster.
-        	cluster?: string
-        	// +usage=If specified, fetch the Kubernetes objects according to the label selector, exclusive to name
-        	labelSelector?: [string]: string
-        	...
-        }
-        output: {
-        	if len(parameter.objects) > 0 {
-        		parameter.objects[0]
+        	apiVersion: string
+        	kind:       string
+        	metadata: {
+        		name: string
+        		...
        	}
        	...
        }
+        output: parameter.objects[0]
        outputs: {
        	for i, v in parameter.objects {
        		if i > 0 {
@@ -41,12 +28,7 @@ spec:
        		}
        	}
        }
-        parameter: {
-        	// +usage=If specified, application will fetch native Kubernetes objects according to the object description
-        	objects?: [...#K8sObject]
-        	// +usage=If specified, the objects in the urls will be loaded.
-        	urls?: [...string]
-        }
+        parameter: objects: [...#K8sObject]
  status:
    customStatus: |-
      if context.output.apiVersion == "apps/v1" && context.output.kind == "Deployment" {
--- a/charts/vela-minimal/templates/defwithtemplate/service-account.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/service-account.yaml
@@ -14,114 +14,10 @@ spec:
  schematic:
    cue:
      template: |
-        #Privileges: {
-        	// +usage=Specify the verbs to be allowed for the resource
-        	verbs: [...string]
-        	// +usage=Specify the apiGroups of the resource
-        	apiGroups?: [...string]
-        	// +usage=Specify the resources to be allowed
-        	resources?: [...string]
-        	// +usage=Specify the resourceNames to be allowed
-        	resourceNames?: [...string]
-        	// +usage=Specify the resource url to be allowed
-        	nonResourceURLs?: [...string]
-        	// +usage=Specify the scope of the privileges, default to be namespace scope
-        	scope: *"namespace" | "cluster"
-        }
        parameter: {
        	// +usage=Specify the name of ServiceAccount
        	name: string
-        	// +usage=Specify whether to create new ServiceAccount or not
-        	create: *false | bool
-        	// +usage=Specify the privileges of the ServiceAccount, if not empty, RoleBindings(ClusterRoleBindings) will be created
-        	privileges?: [...#Privileges]
        }
        // +patchStrategy=retainKeys
        patch: spec: template: spec: serviceAccountName: parameter.name
-        _clusterPrivileges: [ for p in parameter.privileges if p.scope == "cluster" {p}]
-        _namespacePrivileges: [ for p in parameter.privileges if p.scope == "namespace" {p}]
-        outputs: {
-        	if parameter.create {
-        		"service-account": {
-        			apiVersion: "v1"
-        			kind:       "ServiceAccount"
-        			metadata: name: parameter.name
-        		}
-        	}
-        	if parameter.privileges != _|_ {
-        		if len(_clusterPrivileges) > 0 {
-        			"cluster-role": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "ClusterRole"
-        				metadata: name: "\(context.namespace):\(parameter.name)"
-        				rules: [ for p in _clusterPrivileges {
-        					verbs: p.verbs
-        					if p.apiGroups != _|_ {
-        						apiGroups: p.apiGroups
-        					}
-        					if p.resources != _|_ {
-        						resources: p.resources
-        					}
-        					if p.resourceNames != _|_ {
-        						resourceNames: p.resourceNames
-        					}
-        					if p.nonResourceURLs != _|_ {
-        						nonResourceURLs: p.nonResourceURLs
-        					}
-        				}]
-        			}
-        			"cluster-role-binding": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "ClusterRoleBinding"
-        				metadata: name: "\(context.namespace):\(parameter.name)"
-        				roleRef: {
-        					apiGroup: "rbac.authorization.k8s.io"
-        					kind:     "ClusterRole"
-        					name:     "\(context.namespace):\(parameter.name)"
-        				}
-        				subjects: [{
-        					kind:      "ServiceAccount"
-        					name:      parameter.name
-        					namespace: "\(context.namespace)"
-        				}]
-        			}
-        		}
-        		if len(_namespacePrivileges) > 0 {
-        			role: {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "Role"
-        				metadata: name: parameter.name
-        				rules: [ for p in _namespacePrivileges {
-        					verbs: p.verbs
-        					if p.apiGroups != _|_ {
-        						apiGroups: p.apiGroups
-        					}
-        					if p.resources != _|_ {
-        						resources: p.resources
-        					}
-        					if p.resourceNames != _|_ {
-        						resourceNames: p.resourceNames
-        					}
-        					if p.nonResourceURLs != _|_ {
-        						nonResourceURLs: p.nonResourceURLs
-        					}
-        				}]
-        			}
-        			"role-binding": {
-        				apiVersion: "rbac.authorization.k8s.io/v1"
-        				kind:       "RoleBinding"
-        				metadata: name: parameter.name
-        				roleRef: {
-        					apiGroup: "rbac.authorization.k8s.io"
-        					kind:     "Role"
-        					name:     parameter.name
-        				}
-        				subjects: [{
-        					kind: "ServiceAccount"
-        					name: parameter.name
-        				}]
-        			}
-        		}
-        	}
-        }

--- a/charts/vela-minimal/templates/defwithtemplate/sidecar.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/sidecar.yaml
@@ -82,11 +82,6 @@ spec:
        				// +usage=The key of the config map to select from. Must be a valid secret key
        				key: string
        			}
-        			// +usage=Specify the field reference for env
-        			fieldRef?: {
-        				// +usage=Specify the field path for env
-        				fieldPath: string
-        			}
        		}
        	}]

--- a/charts/vela-minimal/templates/defwithtemplate/step-group.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/step-group.yaml
@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
  annotations:
    definition.oam.dev/description: step group
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
  name: step-group
  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
--- a/charts/vela-minimal/templates/defwithtemplate/storage.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/storage.yaml
@@ -64,9 +64,6 @@ spec:
        			{
        				name:      "pvc-" + v.name
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
        			}
        		}
        	},
@@ -76,9 +73,6 @@ spec:
        		{
        			name:      "configmap-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -109,9 +103,6 @@ spec:
        		{
        			name:      "secret-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -142,9 +133,6 @@ spec:
        		{
        			name:      "emptydir-" + v.name
        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
@@ -153,28 +141,12 @@ spec:
        		{
        			name:       "pvc-" + v.name
        			devicePath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
        		}
        	},
        ] | []
-        volumesList: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList
-        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
-        	},
-        ]
        patch: spec: template: spec: {
        	// +patchKey=name
-        	volumes: deDupVolumesArray
+        	volumes: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList

        	containers: [{
        		// +patchKey=name
@@ -262,7 +234,6 @@ spec:
        		name:              string
        		mountOnly:         *false | bool
        		mountPath:         string
-        		subPath?:          string
        		volumeMode:        *"Filesystem" | string
        		volumeName?:       string
        		accessModes:       *["ReadWriteOnce"] | [...string]
@@ -304,7 +275,6 @@ spec:
        			configMapKey: string
        		}]
        		mountPath?:  string
-        		subPath?:    string
        		defaultMode: *420 | int
        		readOnly:    *false | bool
        		data?: {...}
@@ -328,7 +298,6 @@ spec:
        			secretKey: string
        		}]
        		mountPath?:  string
-        		subPath?:    string
        		defaultMode: *420 | int
        		readOnly:    *false | bool
        		stringData?: {...}
@@ -344,7 +313,6 @@ spec:
        	emptyDir?: [...{
        		name:      string
        		mountPath: string
-        		subPath?:  string
        		medium:    *"" | "Memory"
        	}]
        }
--- a/charts/vela-minimal/templates/defwithtemplate/task.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/task.yaml
@@ -149,14 +149,14 @@ spec:
        		// +usage=Specifies a source the value of this var should come from
        		valueFrom?: {
        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
+        			secretKeyRef: {
        				// +usage=The name of the secret in the pod's namespace to select from
        				name: string
        				// +usage=The key of the secret to select from. Must be a valid secret key
        				key: string
        			}
        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
+        			configMapKeyRef: {
        				// +usage=The name of the config map in the pod's namespace to select from
        				name: string
        				// +usage=The key of the config map to select from. Must be a valid secret key
--- a/charts/vela-minimal/templates/defwithtemplate/webservice.yaml
+++ b/charts/vela-minimal/templates/defwithtemplate/webservice.yaml
@@ -20,10 +20,7 @@ spec:
        		for v in parameter.volumeMounts.pvc {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -32,10 +29,7 @@ spec:
        			for v in parameter.volumeMounts.configMap {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -44,10 +38,7 @@ spec:
        		for v in parameter.volumeMounts.secret {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -56,10 +47,7 @@ spec:
        			for v in parameter.volumeMounts.emptyDir {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -68,10 +56,7 @@ spec:
        			for v in parameter.volumeMounts.hostPath {
        			{
        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        				name:      v.name
        			}
        		},
        	] | []
@@ -134,19 +119,6 @@ spec:
        		},
        	] | []
        }
-        volumesList: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
-        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
-        	},
-        ]
        output: {
        	apiVersion: "apps/v1"
        	kind:       "Deployment"
@@ -290,7 +262,7 @@ spec:
        				}

        				if parameter["volumeMounts"] != _|_ {
-        					volumes: deDupVolumesArray
+        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
        				}
        			}
        		}
@@ -357,8 +329,8 @@ spec:
        	}]

        	// +ignore
-        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer"
-        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer"
+        	// +usage=Specify what kind of Service you want. options: "ClusterIP", "NodePort", "LoadBalancer", "ExternalName"
+        	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"

        	// +ignore
        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
@@ -403,7 +375,6 @@ spec:
        		pvc?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			// +usage=The name of the PVC
        			claimName: string
        		}]
@@ -411,7 +382,6 @@ spec:
        		configMap?: [...{
        			name:        string
        			mountPath:   string
-        			subPath?:    string
        			defaultMode: *420 | int
        			cmName:      string
        			items?: [...{
@@ -424,7 +394,6 @@ spec:
        		secret?: [...{
        			name:        string
        			mountPath:   string
-        			subPath?:    string
        			defaultMode: *420 | int
        			secretName:  string
        			items?: [...{
@@ -437,14 +406,12 @@ spec:
        		emptyDir?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			medium:    *"" | "Memory"
        		}]
        		// +usage=Mount HostPath type volume
        		hostPath?: [...{
        			name:      string
        			mountPath: string
-        			subPath?:  string
        			path:      string
        		}]
        	}
--- a/charts/vela-minimal/templates/kubevela-controller.yaml
+++ b/charts/vela-minimal/templates/kubevela-controller.yaml
@@ -15,7 +15,6 @@ metadata:

 ---

-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -23,54 +22,12 @@ metadata:
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: {{ if .Values.authentication.enabled }} {{ include "kubevela.fullname" . }}:manager {{ else }} "cluster-admin" {{ end }}
+  name: "cluster-admin"
 subjects:
  - kind: ServiceAccount
    name: {{ include "kubevela.serviceAccountName" . }}
    namespace: {{ .Release.Namespace }}

-{{ if .Values.authentication.enabled }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "kubevela.fullname" . }}:manager
-rules:
-  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev"]
-    resources: ["*"]
-    verbs: ["*"]
-  - apiGroups: ["cluster.open-cluster-management.io"]
-    resources: ["managedclusters"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["users", "groups", "serviceaccounts"]
-    verbs: ["impersonate"]
-  - apiGroups: [""]
-    resources: ["namespaces", "secrets", "services"]
-    verbs: ["get", "watch", "list"]
-  - apiGroups: [""]
-    resources: ["configmaps", "events"]
-    verbs: ["*"]
-  - apiGroups: ["apps"]
-    resources: ["controllerrevisions"]
-    verbs: ["*"]
-  - apiGroups: ["apiregistration.k8s.io"]
-    resources: ["apiservices"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["*"]
-  - apiGroups: ["admissionregistration.k8s.io"]
-    resources: ["mutatingwebhookconfigurations", "validatingwebhookconfigurations"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["flowcontrol.apiserver.k8s.io"]
-    resources: ["prioritylevelconfigurations", "flowschemas"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["authorization.k8s.io"]
-    resources: ["subjectaccessreviews"]
-    verbs: ["*"]
-{{ end }}
-
 ---
 # permissions to do leader election.
 apiVersion: rbac.authorization.k8s.io/v1
@@ -125,7 +82,6 @@ metadata:
  name: {{ include "kubevela.fullname" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    controller.oam.dev/name: vela-core
  {{- include "kubevela.labels" . | nindent 4 }}
 spec:
  replicas: {{ .Values.replicaCount }}
--- a/charts/vela-minimal/values.yaml
+++ b/charts/vela-minimal/values.yaml
@@ -203,7 +203,7 @@ admissionWebhooks:
    enabled: true
    image:
      repository: oamdev/kube-webhook-certgen
-      tag: v2.4.1
+      tag: v2.4.0
      pullPolicy: IfNotPresent
    nodeSelector: {}
    affinity: {}
--- a/cmd/core/main.go
+++ b/cmd/core/main.go
@@ -36,7 +36,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"

-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	"github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	ctrlClient "github.com/oam-dev/kubevela/pkg/client"
@@ -47,7 +46,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 	"github.com/oam-dev/kubevela/pkg/cue/packages"
 	_ "github.com/oam-dev/kubevela/pkg/monitor/metrics"
-	"github.com/oam-dev/kubevela/pkg/monitor/watcher"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
@@ -56,7 +54,8 @@ import (
 	"github.com/oam-dev/kubevela/pkg/utils/system"
 	"github.com/oam-dev/kubevela/pkg/utils/util"
 	oamwebhook "github.com/oam-dev/kubevela/pkg/webhook/core.oam.dev"
-	wfTypes "github.com/oam-dev/kubevela/pkg/workflow/types"
+	"github.com/oam-dev/kubevela/pkg/workflow"
+	"github.com/oam-dev/kubevela/pkg/workflow/tasks/custom"
 	"github.com/oam-dev/kubevela/version"
 )

@@ -142,9 +141,9 @@ func main() {
 	standardcontroller.AddOptimizeFlags()
 	standardcontroller.AddAdmissionFlags()
 	flag.IntVar(&resourcekeeper.MaxDispatchConcurrent, "max-dispatch-concurrent", 10, "Set the max dispatch concurrent number, default is 10")
-	flag.IntVar(&wfTypes.MaxWorkflowWaitBackoffTime, "max-workflow-wait-backoff-time", 60, "Set the max workflow wait backoff time, default is 60")
-	flag.IntVar(&wfTypes.MaxWorkflowFailedBackoffTime, "max-workflow-failed-backoff-time", 300, "Set the max workflow wait backoff time, default is 300")
-	flag.IntVar(&wfTypes.MaxWorkflowStepErrorRetryTimes, "max-workflow-step-error-retry-times", 10, "Set the max workflow step error retry times, default is 10")
+	flag.IntVar(&workflow.MaxWorkflowWaitBackoffTime, "max-workflow-wait-backoff-time", 60, "Set the max workflow wait backoff time, default is 60")
+	flag.IntVar(&workflow.MaxWorkflowFailedBackoffTime, "max-workflow-failed-backoff-time", 300, "Set the max workflow wait backoff time, default is 300")
+	flag.IntVar(&custom.MaxWorkflowStepErrorRetryTimes, "max-workflow-step-error-retry-times", 10, "Set the max workflow step error retry times, default is 10")
 	utilfeature.DefaultMutableFeatureGate.AddFlag(flag.CommandLine)

 	flag.Parse()
@@ -324,13 +323,6 @@ func main() {
 	}
 	klog.InfoS("Use storage driver", "storageDriver", os.Getenv(system.StorageDriverEnv))

-	klog.Info("Start the vela application monitor")
-	informer, err := mgr.GetCache().GetInformer(context.Background(), &v1beta1.Application{})
-	if err != nil {
-		klog.ErrorS(err, "Unable to get informer for application")
-	}
-	watcher.StartApplicationMetricsWatcher(informer)
-
 	klog.Info("Start the vela controller manager")

 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
--- a/design/vela-core/shared-resource-1.png
+++ b/design/vela-core/shared-resource-1.png
--- a/design/vela-core/shared-resource-2.png
+++ b/design/vela-core/shared-resource-2.png
--- a/design/vela-core/shared-resource.md
+++ b/design/vela-core/shared-resource.md
@@ -1,47 +0,0 @@
-# Shared Resource
-
-### Background
-
-In KubeVela, by default, application **owns** resources.
-It means that resources create by the application should only be controlled by the application that creates it.
-
-So there are basically two requirements for application creating resources:
-1. The resource must not exist before the application creating it. It exists, there will be a resource conflict error.
-2. The resource is expected to be only manageable through its creator. "Others" should not be able to modify it or edit it.
-
-While dispatching resources, the application will
-1. Check if resource exists. If exists, check its labels. 
-If "app.oam.dev/name" and "app.oam.dev/namespace" equals to the application's name and namespace, it means this resource is previously created by the same application and the dispatching operation now will become an update operation.
-The two labels identify the owner of the resource.
-2. If resource exists, but no label found, then this resource is created before this application. At this time, the application will report a resource conflict error.
-3. If resource exists, and the labels point to another application, then this resource is managed by other applications. At this time, the current application will also report a resource conflict error.
-
-With these checks, different applications cannot manage the same resource. 
-
-### Usage
-
-However, there are scenarios that these two requirements are not met. One of the scenarios is sharing across different Applications.
-For example, each application wants to create a ConfigMap, but their ConfigMaps are the same.
-
-To achieve that, KubeVela application could utilize the `shared-resource` policy to make it possible.
-
-#### create
-
-When one resource is created as sharing resource, one special annotation `app.oam.dev/shared-by` will be added to the resource.
-It will record the "sharer" of the resource in time order. The application that firstly creates the resource will set its owner labels to itself.
-Then it will add itself to the sharer annotation.
-
-#### share
-
-When another application comes and wants to share the resource, it will check if the resource is sharable, aka there is at least one sharer in the sharer annotation.
-If it is sharable, it will add itself to the sharer annotation, but not modify the content of the resource.
-
-#### delete
-
-With this mechanism, only the owner of the resource can modify the resource (including updating and state-keeping). Other sharer can only see that resource.
-When the owner of the resource is gone (application is deleted or do not use this resource anymore), it will give the owner of the application to the next sharer. If no sharer exists, it will finally delete that resource.
-
-See the following figures for details.
-
-![shared-resource-1](./shared-resource-1.png)
-![shared-resource-2](./shared-resource-2.png)
--- a/docs/apidoc/swagger.json
+++ b/docs/apidoc/swagger.json
--- a/docs/examples/app-with-policy/gc-policy/reverse-dependency.md
+++ b/docs/examples/app-with-policy/gc-policy/reverse-dependency.md
@@ -1,6 +1,6 @@
 # How to garbage collect resources in the order of dependency

-If you want to garbage collect resources in the order of reverse dependency, you can add `order: dependency` in the `garbage-collect` policy.
+If you want to garbage collect resources in the order of dependency, you can add `order: dependency` in the `garbage-collect` policy.

 > Notice that this order policy is only valid for the resources that are created in the components.

@@ -8,7 +8,7 @@ In the following example, component `test1` depends on `test2`, and `test2` need

 So the order of deployment is: `test3 -> test2 -> test1`.

-When we add `order: dependency` in `garbage-collect` policy and delete the application, the order of garbage collect is: `test1 -> test2 -> test3`.
+When we add `order: dependency` in `garbage-collect` policy and delete the application, the order of garbage collect is: `test3 -> test2 -> test1`.

 ```yaml
 apiVersion: core.oam.dev/v1beta1
--- a/docs/examples/app-with-policy/shared-resource-policy/shared-resource.md
+++ b/docs/examples/app-with-policy/shared-resource-policy/shared-resource.md
@@ -1,91 +0,0 @@
-## How to share resources across applications
-
-Sometimes, you may want different applications to share the same resource.
-For example, you might have various applications that needs the same namespace to exist.
-In this case, you can use the `shared-resource` policy to declare which resources should be shared.
-
-### Usage
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: app1
-spec:
-  components:
-    - name: ns1
-      type: k8s-objects
-      properties:
-        objects:
-          - apiVersion: v1
-            kind: Namespace
-            metadata:
-              name: example
-    - name: cm1
-      type: k8s-objects
-      properties:
-        objects:
-          - apiVersion: v1
-            kind: ConfigMap
-            metadata:
-              name: cm1
-              namespace: example
-            data:
-              key: value1
-  policies:
-    - name: shared-resource
-      type: shared-resource
-      properties:
-        rules:
-          - selector:
-              resourceTypes: ["Namespace"]
-```
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: app2
-spec:
-  components:
-    - name: ns2
-      type: k8s-objects
-      properties:
-        objects:
-          - apiVersion: v1
-            kind: Namespace
-            metadata:
-              name: example
-    - name: cm2
-      type: k8s-objects
-      properties:
-        objects:
-          - apiVersion: v1
-            kind: ConfigMap
-            metadata:
-              name: cm2
-              namespace: example
-            data:
-              key: value2
-  policies:
-    - name: shared-resource
-      type: shared-resource
-      properties:
-        rules:
-          - selector:
-              resourceTypes: ["Namespace"]
-```
-
-The above two applications will dispatch the same namespace "example".
-They will create two different ConfigMap inside namespace "example" respectively.
-
-Both application use the `shared-resource` policy and declared the namespace resource as shared.
-In this way, there will be no conflict for creating the same namespace.
-If the `shared-resource` policy is not used, the second application will report error after it finds that the namespace "example" is managed by the first application. 
-
-The namespace will only be recycled when both applications are removed.
-
-### Working Detail
-
-One of the problem for sharing resource is that what will happen if different application holds different configuration for the shared resource.
-In the `shared-resource` policy, all sharers will be recorded by time order. The first sharer will be able to write the resource while other sharers can only read it. After the first sharer is deleted, it will give the control of the resource to the next sharer. If no sharer is handling it, the resource will be finally removed.
--- a/docs/examples/config/image-registry/README.md
+++ b/docs/examples/config/image-registry/README.md
@@ -2,9 +2,9 @@

 ## General

- list all configuration types. Note before vela v1.5, the key is "custom.definition.oam.dev/catalog.config.oam.dev"
+- list all configuration types
 ```shell
-$ vela components --label catalog.config.oam.dev=velacore-config
+$ vela components --label custom.definition.oam.dev/catalog.config.oam.dev=velacore-config
 NAME                  	DEFINITION
 config-dex-connector  	autodetects.core.oam.dev
 config-helm-repository	autodetects.core.oam.dev
--- a/docs/examples/core-definitions/component/webservice.yaml
+++ b/docs/examples/core-definitions/component/webservice.yaml
@@ -25,7 +25,3 @@ spec:
            - name: my-mount
              mountPath: /test
              claimName: myclaim
-            - name: my-mount
-              mountPath: /test2
-              subPath: /sub
-              claimName: myclaim
--- a/docs/examples/core-definitions/trait/storage.yaml
+++ b/docs/examples/core-definitions/trait/storage.yaml
@@ -16,9 +16,8 @@ spec:
            pvc:
              - name: test1
                mountPath: /test/mount/pvc
-              - name: test1
+              - name: test2
                mountPath: /test/mount2/pvc
-                subPath: /sub
            configMap:
              - name: test1
                mountPath: /test/mount/cm
--- a/docs/examples/terraform/cloud-resource-provision-and-consume/application-oss-deploy-website.yaml
+++ b/docs/examples/terraform/cloud-resource-provision-and-consume/application-oss-deploy-website.yaml
@@ -1,38 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: a-static-website
-spec:
-  components:
-    - name: create-bucket
-      type: alibaba-oss-website
-      properties:
-        bucket: oss-website-20220302-2135
-        acl: public-read
-        index_document: index.html
-        error_document: error/index.html
-        writeConnectionSecretToRef:
-          name: oss-website-conn
-      outputs:
-        - name: bucket
-          valueFrom: output.status.apply.outputs.BUCKET_NAME.value
-        - name: endpoint
-          valueFrom: output.status.apply.outputs.EXTERNAL_ENDPOINT.value
-        - name: index_document
-          valueFrom: properties.index_document
-#          valueFrom: output.spec.variable.index_document
-
-    - name: deploy-website
-      type: deploy-website
-      inputs:
-        - from: bucket
-          parameterKey: properties.bucket
-        - from: endpoint
-          parameterKey: properties.endpoint
-        - from: index_document
-          parameterKey: properties.index_document
-      properties:
-        static_web_url: "https://github.com/cloudacademy/static-website-example.git"
-
-
-
--- a/docs/examples/terraform/cloud-resource-provision-and-consume/application-rds-data-outputs.yaml
+++ b/docs/examples/terraform/cloud-resource-provision-and-consume/application-rds-data-outputs.yaml
@@ -1,44 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: webapp
-spec:
-  components:
-    - name: express-server
-      type: webservice
-      properties:
-        image: zzxwill/flask-web-application:v0.3.1-crossplane
-        ports: 80
-      traits:
-        - type: service-binding
-          properties:
-            envMappings:
-              # environments refer to db-conn secret
-              DB_PASSWORD:
-                secret: db-conn                                   # 1) If the env name is the same as the secret key, secret key can be omitted.
-              endpoint:
-                secret: db-conn
-                key: DB_HOST                                      # 2) If the env name is different from secret key, secret key has to be set.
-              username:
-                secret: db-conn
-                key: DB_USER
-              # environments refer to oss-conn secret
-              BUCKET_NAME:
-                secret: oss-conn
-
-    - name: sample-db
-      type: alibaba-rds
-      properties:
-        instance_name: sample-db
-        account_name: oamtest
-        password: U34rfwefwefffaked
-        writeConnectionSecretToRef:
-          name: db-conn
-
-    - name: sample-oss
-      type: alibaba-oss
-      properties:
-        bucket: vela-website
-        acl: private
-        writeConnectionSecretToRef:
-          name: oss-conn
--- a/docs/examples/velaql-views/usage.md
+++ b/docs/examples/velaql-views/usage.md
@@ -83,7 +83,7 @@ component-pod-view{appName=demo,appNs=default,cluster=prod,clusterNs=default,nam

 #### describe

-Query the pods detail information
+Query the pods detail infomation

 #### parameter

--- a/docs/examples/workflow/app-with-if/README.md
+++ b/docs/examples/workflow/app-with-if/README.md
@@ -1,130 +0,0 @@
-# Steps with if
-
-Every step can specify a `if`, you can use the `if` to determine whether the step should be executed or not.
-
-## Always
-
-If you want to execute the step no matter what, for example, send a notification after the component is deployed even it's failed, you can use the `if` with the value `always` like:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: if-always-with-err
-  namespace: default
-spec:
-  components:
-  - name: err-component
-    type: k8s-objects
-    properties:
-      objects:
-        - err: "error case"
-  workflow:
-    steps:
-    - name: apply-err-comp
-      type: apply-component
-      properties:
-        component: err-component
-    - name: notification
-      type: notification
-      if: always
-      properties:
-        slack:
-          url:
-            value: <your slack webhook url>
-          message:
-            text: always
-```
-
-## Custom Judgement
-
-You can also write your own judgement logic to determine whether the step should be executed or not, note that the values of `if` will be executed as cue code. We support some built-in variables to use in `if`, they are:
-
-* `status`: in this value, you can get the status of the step for judgement like `status.<step-name>.phase == "succeeded"`, or you can use the simplify way `status.<step-name>.succeeded`.
-* `inputs`: in this value, you can get the inputs of the step for judgement like `inputs.<input-name> == "value"`.
-
-### Status Example
-
-If you want to control the step by the status of another step, you can follow the example:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: if-timeout
-  namespace: default
-spec:
-  components:
-  - name: comp-custom-timeout
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-  workflow:
-    steps:
-    - name: suspend
-      timeout: 5s
-      type: suspend
-    - name: suspend2
-      # or `status.suspend.reason == "Timeout"`
-      if: status.suspend.timeout
-      type: suspend
-      timeout: 5s
-    - name: notification-1
-      type: notification
-      if: suspend.timeout
-      properties:
-        slack:
-          url:
-            value: <your slack webhook url>
-          message:
-            text: suspend is timeout
-    - name: notification-2
-      type: notification
-      if: status["notification-1"].succeeded
-      properties:
-        slack:
-          url:
-            value: <your slack webhook url>
-          message:
-            text: notification-1 is succeeded
-```
-
-### Inputs example
-
-If you want to control the step by the inputs of another step, you can follow the example:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: if-input
-  namespace: default
-spec:
-  components:
-  - name: comp-custom-timeout
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-  workflow:
-    steps:
-    - name: suspend
-      type: suspend
-      timeout: 5s
-      outputs:
-        - name: test
-          valueFrom: context.name + " message"
-    - name: notification
-      type: notification
-      inputs:
-        - from: test
-          parameterKey: slack.message.text
-      if: inputs.test == "if-input message"
-      properties:
-        slack:
-          url:
-            value: <your slack webhook url>
-          message:
-            text: from input
-```
--- a/docs/examples/workflow/app-with-timeout/README.md
+++ b/docs/examples/workflow/app-with-timeout/README.md
@@ -1,62 +0,0 @@
-# Timeout steps
-
-Every step can specify a `timeout`, if the timeout expires and the step has not succeeded, the step will fail with the reason `Timeout`.
-
-Here is an example:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: app-with-timeout
-  namespace: default
-spec:
-  components:
-  - name: comp
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-    traits:
-    - type: scaler
-      properties:
-        replicas: 10
-  workflow:
-    steps:
-    - name: apply
-      timeout: 1m
-      type: apply-component
-      properties:
-        component: comp
-    - name: suspend
-      type: suspend
-      timeout: 5s
-```
-
-If the first step is succeeded in the time of `1m`, the second step will be executed. If the second step is not resumed in the time of `5s`, the suspend step will be failed with the reason `Timeout`, and the application will end up with the status of `WorkflowTerminated` like:
-
-```yaml
-status:
-  status: workflowTerminated
-  workflow:
-    ...
-    finished: true
-    message: Terminated
-    mode: StepByStep
-    steps:
-    - firstExecuteTime: "2022-06-22T09:19:42Z"
-      id: gdcwh929ih
-      lastExecuteTime: "2022-06-22T09:20:08Z"
-      name: apply
-      phase: succeeded
-      type: apply-component
-    - firstExecuteTime: "2022-06-22T09:20:08Z"
-      id: rloz8axnju
-      lastExecuteTime: "2022-06-22T09:20:13Z"
-      name: suspend
-      phase: failed
-      reason: Timeout
-      type: suspend
-    suspend: false
-    terminated: true
-```
--- a/docs/examples/workflow/step-group/README.md
+++ b/docs/examples/workflow/step-group/README.md
@@ -14,3 +14,10 @@ Edit a yaml file as `example.yaml`, then execute it with `vela up` command.

 When executing the `step-group` step, the subSteps in the step group are executed in dag mode. The step group will only complete when all subSteps have been executed to completion.
 SubStep has the same execution behavior as a normal step.
+
+
+
+
+
+
+
--- a/e2e/addon/addon_test.go
+++ b/e2e/addon/addon_test.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"time"

-	"github.com/Netflix/go-expect"
+	v1 "k8s.io/api/core/v1"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"

@@ -49,13 +49,13 @@ var _ = Describe("Addon Test", func() {
 		It("Enable addon test-addon", func() {
 			output, err := e2e.Exec("vela addon enable test-addon")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("enabled successfully."))
+			Expect(output).To(ContainSubstring("enabled Successfully."))
 		})

 		It("Upgrade addon test-addon", func() {
 			output, err := e2e.Exec("vela addon upgrade test-addon")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("enabled successfully."))
+			Expect(output).To(ContainSubstring("enabled Successfully."))
 		})

 		It("Disable addon test-addon", func() {
@@ -71,7 +71,7 @@ var _ = Describe("Addon Test", func() {
 		It("Enable addon with input", func() {
 			output, err := e2e.LongTimeExec("vela addon enable test-addon example=redis", 300*time.Second)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("enabled successfully."))
+			Expect(output).To(ContainSubstring("enabled Successfully."))
 		})

 		It("Disable addon test-addon", func() {
@@ -83,12 +83,6 @@ var _ = Describe("Addon Test", func() {
 			}, 60*time.Second).Should(Succeed())
 		})

-		It("Enable local addon with . as path", func() {
-			output, err := e2e.LongTimeExec("vela addon enable ../../e2e/addon/mock/testdata/sample/.", 600*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("sample enabled successfully."))
-		})
-
 		It("Test Change default namespace can work", func() {
 			output, err := e2e.LongTimeExecWithEnv("vela addon list", 600*time.Second, []string{"DEFAULT_VELA_NS=test-vela"})
 			Expect(err).NotTo(HaveOccurred())
@@ -97,7 +91,7 @@ var _ = Describe("Addon Test", func() {

 			output, err = e2e.LongTimeExecWithEnv("vela addon enable test-addon", 600*time.Second, []string{"DEFAULT_VELA_NS=test-vela"})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("enabled successfully."))
+			Expect(output).To(ContainSubstring("enabled Successfully."))

 			Eventually(func(g Gomega) {
 				g.Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-test-addon", Namespace: "test-vela"}, &v1beta1.Application{})).Should(BeNil())
@@ -110,30 +104,6 @@ var _ = Describe("Addon Test", func() {
 				g.Expect(apierrors.IsNotFound(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-test-addon", Namespace: "test-vela"}, &v1beta1.Application{}))).Should(BeTrue())
 			}, 60*time.Second).Should(Succeed())
 		})
-
-		It("Enable fluxcd-test-version whose version can't suit system requirements", func() {
-			output, err := e2e.InteractiveExec("vela addon enable fluxcd-test-version", func(c *expect.Console) {
-				_, err = c.SendLine("y")
-				Expect(err).NotTo(HaveOccurred())
-			})
-			Expect(output).To(ContainSubstring("enabled successfully"))
-			Expect(err).NotTo(HaveOccurred())
-		})
-
-		It("Disable addon fluxcd-test-version", func() {
-			output, err := e2e.LongTimeExec("vela addon disable fluxcd-test-version", 600*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Successfully disable addon"))
-		})
-
-		It("Enable fluxcd-test-version whose version can't suit system requirements with 'n' input", func() {
-			output, err := e2e.InteractiveExec("vela addon enable fluxcd-test-version", func(c *expect.Console) {
-				_, err = c.SendLine("n")
-				Expect(err).NotTo(HaveOccurred())
-			})
-			Expect(output).To(ContainSubstring("you can try another version by command"))
-			Expect(err).NotTo(HaveOccurred())
-		})
 	})

 	Context("Addon registry test", func() {
--- a/e2e/addon/mock/testdata/sample/metadata.yaml
+++ b/e2e/addon/mock/testdata/sample/metadata.yaml
@@ -1,15 +0,0 @@
-name: sample
-version: 1.0.1
-description: This is a test sample addon
-icon: https://www.terraform.io/assets/images/logo-text-8c3ba8a6.svg
-url: https://terraform.io/
-
-tags: []
-
-deployTo:
-  control_plane: true
-  runtime_cluster: false
-
-dependencies: []
-
-invisible: false
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
qiaozp	cd171d27db	Fix: release script condition syntax (#4043 ) Signed-off-by: qiaozp <chivalry.pp@gmail.com>	2022-05-27 23:29:31 +08:00
github-actions[bot]	6d8be8b061	[Backport release-1.4] Feat: add if in workflow (#4041 ) * Feat: add if in workflow struct Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `e800ed3e98`) * Feat: implement the if in workflow Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `e171fa9212`) * Feat: support dependency and skip for suspend step Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `6c045dc593`) * Fix: fix the rebase from sub steps Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `f6746e7d26`) * Fix: fix the lint Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `9cb9887327`) * Feat: support if in sub steps Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `c41ccfabb9`) * Feat: add tests in application controller Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `b308d89912`) * Fix: fix the lint Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `2c784b185a`) * Test: add more tests in discover and custom Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `39f49fd901`) * Lint: fix lint Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `f5149c859a`) * Tests: add more tests in application controller Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `255f4014c2`) * Fix: change failed after retries into reason Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `dfbba699c5`) * Fix: fix the terminate cli Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `14192e1fb3`) * fix lint Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `d1dd602cc8`) * remove the terminate workflow to pkg and add feature gates Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `bf5c8d138a`) * resolve comments Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `8a1b499f24`) * nit fix Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `784e5f5db3`) * make finish condition more clear Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `b4c1ca36b0`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2022-05-27 22:02:02 +08:00
github-actions[bot]	e93912acff	Fix: env trait error when existing env exists (#4040 ) Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `2d5a16d45f`) Co-authored-by: Somefive <yd219913@alibaba-inc.com>	2022-05-27 21:12:35 +08:00
github-actions[bot]	e48e39987f	some small fixes (#4034 ) Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `99af188f91`) Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>	2022-05-27 18:38:12 +08:00
github-actions[bot]	6264a66021	Feat: add the creating and deleting permission APIs (#4032 ) Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `193515dfaf`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-27 17:42:49 +08:00
github-actions[bot]	9191127e01	Feat: add affinity trait to merge node and pod affinity (#4030 ) Signed-off-by: ZhongsJie <zhongsjie@gmail.com> (cherry picked from commit `a4966310ae`) Co-authored-by: ZhongsJie <zhongsjie@gmail.com>	2022-05-27 17:39:10 +08:00
github-actions[bot]	1b047c10ba	Fix: error message of `vela init env` is not clear (#4029 ) Signed-off-by: fourierr <maxiangboo@qq.com> (cherry picked from commit `378fdbdafb`) Co-authored-by: fourierr <maxiangboo@qq.com>	2022-05-27 17:35:23 +08:00
github-actions[bot]	02a1d390c4	Fix: vela port-forward not working for webservice component (#4028 ) Signed-off-by: fourierr <maxiangboo@qq.com> (cherry picked from commit `391532dd24`) Co-authored-by: fourierr <maxiangboo@qq.com>	2022-05-27 17:15:51 +08:00
github-actions[bot]	62866e19d8	Fix: unknown field ignoreTerraformComponent (#4027 ) Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `0c27fe8199`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-27 17:15:23 +08:00
github-actions[bot]	3dc645ed52	Fix: velaql fail to parse query result to json format (#4025 ) Signed-off-by: yangsoon <songyang.song@alibaba-inc.com> (cherry picked from commit `6c1576c5a6`) Co-authored-by: yangsoon <songyang.song@alibaba-inc.com>	2022-05-27 16:57:38 +08:00
github-actions[bot]	e20ef02a6a	[Backport release-1.4] Feat: enhance controller auth by removing useless features & add authentication for componentrevision+healthcheck (#4023 ) * Feat: use application identity in gc & componentrevision & collectHealthStatus Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `63fc4bcc69`) * Chore: remove useless features and roles Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `f4ef77b2b3`) * Fix: remove DELETE from mutating webhook Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `75f3d5dc35`) * Chore: enhance deploy error display Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `e69079bdae`) * Fix: e2e test vela cli output match & controllerrevision recycle for serviceaccount impersonation Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `05b85573a2`) Co-authored-by: Somefive <yd219913@alibaba-inc.com>	2022-05-27 16:00:04 +08:00
github-actions[bot]	371affb389	Fix: step group documentation update and bug fix of firstExecuteTime not record (#4021 ) Signed-off-by: Qiang Zheng <zhengq20018@cmbchina.com> Fix: step group documentation update and bug fix of firstExecuteTime not record Signed-off-by: Qiang Zheng <zhengq20018@cmbchina.com> (cherry picked from commit `751dd181be`) Co-authored-by: Qiang Zheng <zhengq20018@cmbchina.com>	2022-05-27 11:50:58 +08:00
github-actions[bot]	b35145be82	Fix: fail to query the count with mongodb (#4014 ) Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `ee2b446b5c`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-27 10:56:13 +08:00
github-actions[bot]	d92c8844ba	[Backport release-1.4] Feat: optimize some logic of topology resource-tree (#4010 ) * format finish tests Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `e7c8c37237`) * add comments Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> no lint Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `e8c5185534`) * add pvc Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `c972fe0cd3`) * go mod tidy Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `8bad8f417a`) * fix panic bug Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> fix panic Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `a5e6024abf`) Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>	2022-05-26 22:18:12 +08:00
github-actions[bot]	82aaf5098b	Fix: optimized the version comparison (#4006 ) Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `8bfab07f8f`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-26 19:34:47 +08:00
github-actions[bot]	7399666275	Fix: add some default permissions about the configuration (#4005 ) Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `595ccea622`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-26 17:27:06 +08:00
github-actions[bot]	0b394e766b	[Backport release-1.4] Feat: upgrade cluster-gateway version (#4004 ) * Feat: upgrade cluster-gateway version Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `e677ef707a`) * Fix: multicluster test unstable Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `09d43391ef`) Co-authored-by: Somefive <yd219913@alibaba-inc.com>	2022-05-26 17:26:34 +08:00
github-actions[bot]	eb386ce9f7	Feat: support impersonation for application in apiserver (#4000 ) Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `10dc83b60a`) Co-authored-by: Somefive <yd219913@alibaba-inc.com>	2022-05-26 16:55:09 +08:00
github-actions[bot]	e4fa5a5cf1	Fix: add Target fail by fetch terraform-provider error (#3999 ) Signed-off-by: StevenLeiZhang <zhangleiic@163.com> (cherry picked from commit `4a44ba2550`) Co-authored-by: StevenLeiZhang <zhangleiic@163.com>	2022-05-26 15:46:07 +08:00
github-actions[bot]	165e011bd0	Fix: delete Project fail (#3996 ) Signed-off-by: StevenLeiZhang <zhangleiic@163.com> (cherry picked from commit `87347f128d`) Co-authored-by: StevenLeiZhang <zhangleiic@163.com>	2022-05-26 11:31:40 +08:00
github-actions[bot]	9489b8d511	Fix: don't update version file when publish alpha/beta version (#3995 ) Signed-off-by: qiaozp <chivalry.pp@gmail.com> (cherry picked from commit `2c2809b975`) Co-authored-by: qiaozp <chivalry.pp@gmail.com>	2022-05-26 11:31:16 +08:00
github-actions[bot]	d95942c992	Feat: build docker image(oamdev/vela-cli) for vela-cli (#3991 ) fixes #1392 One of the use case could be https://github.com/kubevela/kubevela/discussions/3821 Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com> (cherry picked from commit `1c46dec107`) Co-authored-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>	2022-05-26 10:30:37 +08:00
github-actions[bot]	c6aa8ddbbc	[Backport release-1.4] Fix: initialize kube config multiple times (#3990 ) * Fix: initialize kube config multiple times Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `ef38b04a07`) * Fix: e2e test case Signed-off-by: barnettZQG <barnett.zqg@gmail.com> (cherry picked from commit `9e41954a75`) Co-authored-by: barnettZQG <barnett.zqg@gmail.com>	2022-05-26 10:21:16 +08:00
github-actions[bot]	c370ef04f3	[Backport release-1.4] Feat: mechanism to let user add relationship mapping rule by configmap (#3982 ) * WIP add some code Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> small fix Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> fix all tests Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `0b3c72bd66`) * add comment Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> fix ci delete useless code Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> go mod vendor Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `f5a0bacee6`) * fix failed test Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `65b6ee66ce`) * more test Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `a1f3794ee0`) Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>	2022-05-25 16:45:42 +08:00