[Backport release-1.4] Fix: gc failure cause workflow restart not working properly (#5241)

* Fix: gc failure cause workflow restart not working properly

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

* Feat: switch ci machine

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

* Fix: enhance test

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

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

.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
 

.github/workflows/apiserver-test.yaml

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

.github/workflows/chart.yaml

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

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

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

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

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

.github/workflows/e2e-test.yml

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

.github/workflows/go.yml

@@ -15,6 +15,7 @@ env:
   # Common versions
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
 
 jobs:
 
@@ -25,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"]'

.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

.github/workflows/release.yml

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

.github/workflows/unit-test.yml

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

.gitignore

@@ -1,4 +1,4 @@
-# Binaries for programs and docgen
+# Binaries for programs and plugins
 *.exe
 *.exe~
 *.dll
@@ -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

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)

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

Dockerfile.cli

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

Makefile

@@ -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)
@@ -82,17 +82,19 @@ endif
 
 
 
-# load docker image to the k3d cluster
-image-load:
+# load docker image to the kind cluster
+kind-load: kind-load-rollout
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
-	k3d image import $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
+	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
-image-load-runtime-cluster:
+kind-load-rollout:
 	/bin/sh hack/e2e/build_runtime_rollout.sh
 	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
 	rm -rf runtime/rollout/e2e/tmp
-	k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
-	k3d cluster get $(RUNTIME_CLUSTER_NAME) && k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --cluster=$(RUNTIME_CLUSTER_NAME) || echo "no worker cluster"
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+
+kind-load-runtime-cluster:
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
 
 # Run tests
 core-test: fmt vet manifests

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
 

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.

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)

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

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

apis/core.oam.dev/v1alpha1/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

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

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

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
-}

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))
-		})
-	}
-}

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

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

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

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

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

@@ -82,8 +82,6 @@ type ManagedResource struct {
 	Data *runtime.RawExtension `json:"raw,omitempty"`
 	// Deleted marks the resource to be deleted
 	Deleted bool `json:"deleted,omitempty"`
-	// SkipGC marks the resource to skip gc
-	SkipGC bool `json:"skipGC,omitempty"`
 }
 
 // Equal check if two managed resource equals
@@ -123,13 +121,12 @@ func (in ManagedResource) NamespacedName() types.NamespacedName {
 
 // ResourceKey computes the key for managed resource, resources with the same key points to the same resource
 func (in ManagedResource) ResourceKey() string {
-	group := in.GroupVersionKind().Group
-	kind := in.GroupVersionKind().Kind
+	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
 	cluster := in.Cluster
 	if cluster == "" {
 		cluster = velatypes.ClusterLocalName
 	}
-	return strings.Join([]string{group, kind, cluster, in.Namespace, in.Name}, "/")
+	return strings.Join([]string{gv, kind, cluster, in.Namespace, in.Name}, "/")
 }
 
 // ComponentKey computes the key for the component which managed resource belongs to
@@ -218,9 +215,8 @@ func (in *ResourceTracker) ContainsManagedResource(rsc client.Object) bool {
 }
 
 // AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, skipGC bool, creator common.ResourceCreatorRole) (updated bool) {
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, creator common.ResourceCreatorRole) (updated bool) {
 	mr := newManagedResourceFromResource(rsc)
-	mr.SkipGC = skipGC
 	if !metaOnly {
 		mr.Data = &runtime.RawExtension{Object: rsc}
 	}

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

@@ -125,7 +125,7 @@ func TestManagedResourceKeys(t *testing.T) {
 		},
 	}
 	r.Equal("namespace/name", input.NamespacedName().String())
-	r.Equal("apps/Deployment/cluster/namespace/name", input.ResourceKey())
+	r.Equal("apps/v1/Deployment/cluster/namespace/name", input.ResourceKey())
 	r.Equal("env/component", input.ComponentKey())
 	r.Equal("Deployment name (Cluster: cluster, Namespace: namespace)", input.DisplayName())
 	var deploy1, deploy2 v12.Deployment
@@ -156,16 +156,16 @@ func TestResourceTracker_ManagedResource(t *testing.T) {
 	r := require.New(t)
 	input := &ResourceTracker{}
 	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true, false, "")
+	input.AddManagedResource(&deploy1, true, "")
 	r.Equal(1, len(input.Spec.ManagedResources))
 	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false, false, "")
+	input.AddManagedResource(&cm2, false, "")
 	r.Equal(2, len(input.Spec.ManagedResources))
 	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false, false, "")
+	input.AddManagedResource(&pod3, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false, false, "")
+	input.AddManagedResource(&deploy1, false, "")
 	r.Equal(3, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&cm2, false)
 	r.Equal(3, len(input.Spec.ManagedResources))

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)

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"`
 

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

charts/vela-core/README.md

@@ -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

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

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:

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

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

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

@@ -105,9 +105,6 @@ spec:
                       description: 'Specific resourceVersion to which this reference
                         is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
                       type: string
-                    skipGC:
-                      description: SkipGC marks the resource to skip gc
-                      type: boolean
                     trait:
                       type: string
                     uid:

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

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

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

@@ -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:

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

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

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

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

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

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

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

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

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

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

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: Allow configuration drift for applied resources, delivery the resource without continuously reconciliation.
-  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]
-        }
-

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

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

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

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

charts/vela-core/templates/defwithtemplate/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:

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

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

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

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

charts/vela-core/templates/defwithtemplate/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
-

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,6 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy application to runtime clusters
   labels:
-    custom.definition.oam.dev/deprecated: "true"
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{ include "systemDefinitionNamespace" . }}

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

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

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

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

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

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

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

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

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

@@ -5,30 +5,23 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Expose port to enable web traffic for your component.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: expose
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
   podDisruptive: false
   schematic:
     cue:
       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
         			},
@@ -39,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
-      }
 

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]
-        }
-

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

@@ -9,8 +9,7 @@ metadata:
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
+    - '*'
   podDisruptive: false
   schematic:
     cue:
@@ -39,9 +38,6 @@ spec:
         			if !parameter.classInSpec {
         				"kubernetes.io/ingress.class": parameter.class
         			}
-        			if parameter.gatewayHost != _|_ {
-        				"ingress.controller/host": parameter.gatewayHost
-        			}
         		}
         	}
         	spec: {
@@ -86,11 +82,8 @@ spec:
         	// +usage=Set ingress class in '.spec.ingressClassName' instead of 'kubernetes.io/ingress.class' annotation.
         	classInSpec: *false | bool
 
-        	// +usage=Specify the secret name you want to quote to use tls.
+        	// +usage=Specify the secret name you want to quote.
         	secretName?: string
-
-        	// +usage=Specify the host of the ingress gateway, which is used to generate the endpoints when the host is empty.
-        	gatewayHost?: string
         }
   status:
     customStatus: |-
@@ -104,7 +97,7 @@ spec:
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
         	}
         }
         if igs[0].ip == _|_ {

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

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

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

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

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

@@ -5,14 +5,13 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
   podDisruptive: true
   schematic:
     cue:
@@ -28,9 +27,8 @@ spec:
         		}]
         	}]
         	initContainers: [{
-        		name:            parameter.name
-        		image:           parameter.image
-        		imagePullPolicy: parameter.imagePullPolicy
+        		name:  parameter.name
+        		image: parameter.image
         		if parameter.cmd != _|_ {
         			command: parameter.cmd
         		}
@@ -60,9 +58,6 @@ spec:
         	// +usage=Specify the image of init container
         	image: string
 
-        	// +usage=Specify image pull policy for your service
-        	imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
-
         	// +usage=Specify the commands run in the init container
         	cmd?: [...string]
 

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Send notifications to Email, DingTalk, Slack, Lark or webhook in your workflow.
+    definition.oam.dev/description: Send message to webhook
   name: notification
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -17,11 +17,9 @@ spec:
         )
 
         parameter: {
-        	// +usage=Please fulfill its url and message if you want to send Lark messages
         	lark?: {
         		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
         		url: {
-        			// +usage=the url address content in string
         			value: string
         		} | {
         			secretRef: {
@@ -31,7 +29,7 @@ spec:
         				key: string
         			}
         		}
-        		// +usage=Specify the message that you want to sent, refer to [Lark messaging](https://open.feishu.cn/document/ukTMukTMukTM/ucTM5YjL3ETO24yNxkjN#8b0f2a1b).
+        		// +useage=Specify the message that you want to sent
         		message: {
         			// +usage=msg_type can be text, post, image, interactive, share_chat, share_user, audio, media, file, sticker
         			msg_type: string
@@ -39,11 +37,10 @@ spec:
         			content: string
         		}
         	}
-        	// +usage=Please fulfill its url and message if you want to send DingTalk messages
+
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
         		url: {
-        			// +usage=the url address content in string
         			value: string
         		} | {
         			secretRef: {
@@ -53,9 +50,8 @@ spec:
         				key: string
         			}
         		}
-        		// +usage=Specify the message that you want to sent, refer to [dingtalk messaging](https://developers.dingtalk.com/document/robots/custom-robot-access/title-72m-8ag-pqw)
+        		// +useage=Specify the message that you want to sent
         		message: {
-        			// +usage=Specify the message content of dingtalk notification
         			text?: *null | {
         				content: string
         			}
@@ -97,11 +93,10 @@ spec:
         			}
         		}
         	}
-        	// +usage=Please fulfill its url and message if you want to send Slack messages
+
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
         		url: {
-        			// +usage=the url address content in string
         			value: string
         		} | {
         			secretRef: {
@@ -111,9 +106,8 @@ spec:
         				key: string
         			}
         		}
-        		// +usage=Specify the message that you want to sent, refer to [slack messaging](https://api.slack.com/reference/messaging/payload)
+        		// +useage=Specify the message that you want to sent
         		message: {
-        			// +usage=Specify the message text for slack notification
         			text:         string
         			blocks?:      *null | [...block]
         			attachments?: *null | {
@@ -121,11 +115,10 @@ spec:
         				color?:  string
         			}
         			thread_ts?: string
-        			// +usage=Specify the message text format in markdown for slack notification
-        			mrkdwn?: *true | bool
+        			mrkdwn?:    *true | bool
         		}
         	}
-        	// +usage=Please fulfill its from, to and content if you want to send email
+
         	email?: {
         		// +usage=Specify the email info that you want to send from
         		from: {
@@ -135,7 +128,6 @@ spec:
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
         			password: {
-        				// +usage=the password content in string
         				value: string
         			} | {
         				secretRef: {

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

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

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

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

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

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

charts/vela-core/templates/defwithtemplate/ref-objects.yaml

@@ -28,12 +28,7 @@ spec:
         	labelSelector?: [string]: string
         	...
         }
-        output: {
-        	if len(parameter.objects) > 0 {
-        		parameter.objects[0]
-        	}
-        	...
-        }
+        output: parameter.objects[0]
         outputs: {
         	for i, v in parameter.objects {
         		if i > 0 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

charts/vela-core/templates/defwithtemplate/step-group.yaml

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

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

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

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

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

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: PolicyDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Describe the destination where components should be deployed to.
+    definition.oam.dev/description: Determining the destination where components should be deployed to.
   name: topology
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -13,7 +13,7 @@ spec:
       template: |
         parameter: {
         	// +usage=Specify the names of the clusters to select.
-        	clusters?: [...string]
+        	cluster?: [...string]
         	// +usage=Specify the label selector for clusters
         	clusterLabelSelector?: [string]: string
         	// +usage=Deprecated: Use clusterLabelSelector instead.

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

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Send a request to the specified Webhook URL. If no request body is specified, the current Application body will be sent by default.
+    definition.oam.dev/description: Send webhook request to the url
   name: webhook
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -306,9 +306,6 @@ spec:
         		if v.name == _|_ {
         			name: "port-" + strconv.FormatInt(v.port, 10)
         		}
-        		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
-        			nodePort: v.nodePort
-        		}
         	},
         ]
         outputs: {
@@ -357,13 +354,11 @@ spec:
         		protocol: *"TCP" | "UDP" | "SCTP"
         		// +usage=Specify if the port should be exposed
         		expose: *false | bool
-        		// +usage=exposed node port. Only Valid when exposeType is NodePort
-        		nodePort?: int
         	}]
 
         	// +ignore
-        	// +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

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

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

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

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

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

@@ -1,77 +0,0 @@
-{{- if not (lookup "v1" "ConfigMap" (include "systemDefinitionNamespace" .) "component-pod-view") }}
-apiVersion: v1
-data:
-  template: |
-      import (
-      "vela/ql"
-      )
-
-      parameter: {
-        appName:    string
-        appNs:      string
-        name?:      string
-        cluster?:   string
-        clusterNs?: string
-      }
-
-      result: ql.#CollectPods & {
-        app: {
-          name:      parameter.appName
-          namespace: parameter.appNs
-          filter: {
-            if parameter.cluster != _|_ {
-              cluster: parameter.cluster
-            }
-            if parameter.clusterNs != _|_ {
-              clusterNamespace: parameter.clusterNs
-            }
-            if parameter.name != _|_ {
-              components: [parameter.name]
-            }
-          }
-        }
-      }
-
-      if result.err == _|_ {
-        status: {
-          podList: [ for pod in result.list if pod.object != _|_ {
-            cluster:   pod.cluster
-            workload:  pod.workload
-            component: pod.component
-            metadata: {
-              name:         pod.object.metadata.name
-              namespace:    pod.object.metadata.namespace
-              creationTime: pod.object.metadata.creationTimestamp
-              labels:       pod.object.metadata.labels
-              version: {
-                if pod.publishVersion != _|_ {
-                  publishVersion: pod.publishVersion
-                }
-                if pod.deployVersion != _|_ {
-                  deployVersion: pod.deployVersion
-                }
-              }
-            }
-            status: {
-              phase: pod.object.status.phase
-              // refer to https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
-              if phase != "Pending" && phase != "Unknown" {
-                podIP:    pod.object.status.podIP
-                hostIP:   pod.object.status.hostIP
-                nodeName: pod.object.spec.nodeName
-              }
-            }
-          }]
-        }
-      }
-
-      if result.err != _|_ {
-        status: {
-          error: result.err
-        }
-      }
-kind: ConfigMap
-metadata:
-  name: component-pod-view
-  namespace: {{ include "systemDefinitionNamespace" . }}
-{{- end }}

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

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

charts/vela-core/values.yaml

@@ -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

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

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:

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

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

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

@@ -105,9 +105,6 @@ spec:
                       description: 'Specific resourceVersion to which this reference
                         is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
                       type: string
-                    skipGC:
-                      description: SkipGC marks the resource to skip gc
-                      type: boolean
                     trait:
                       type: string
                     uid:

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

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

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

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

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

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

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

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

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

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