Fix: backport all Terraform related features to release-1.1 (#2553 )

Copy all Terraform related code to release-1.1 to fix probelms and support features. Fix #2547
[Backport release-1.1] Feat: Commit step-generate data without success (#2565 )
2026-02-23 14:23:54 +00:00 · 2021-10-28 11:37:41 +08:00 · 2021-10-28 10:48:39 +08:00 · 2021-10-27 16:03:39 +08:00 · 2021-10-27 11:56:11 +08:00 · 2021-10-27 10:08:29 +08:00
1034 changed files with 57163 additions and 92141 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,37 +1,36 @@
+<!--

-### Description of your changes
+Thank you for sending a pull request! Here are some tips:
+
+1. If this is your first time, please read our contribution guide at https://github.com/oam-dev/kubevela/blob/master/CONTRIBUTING.md
+
+2. Ensure you include and run the appropriate tests as part of your Pull Request.
+
+3. In a new feature or configuration option, an update to the documentation is necessary. Everything related to the documentation is under the docs folder in the root of the repository.
+
+4. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such.
+
+5. If you can not merge your Pull Request due to a merge conflict, Rebase it. This gets it in sync with the master branch.
+
+6. Name your PR as "<FeatureArea>: Describe your change", e.g. Application: Add health check for application.
+   If it's a fix or feature relevant for the changelog describe the user impact in the title.
+   The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label.
+
+-->
+
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes**:

 <!--

-Briefly describe what this pull request does. We love pull requests that resolve an open KubeVela issue. If yours does, you
-can uncomment the below line to indicate which issue your PR fixes, for example
-"Fixes #500":
+- Automatically closes linked issue when the Pull Request is merged.
+
+Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"

 -->

 Fixes #

-I have:
+**Special notes for your reviewer**:

- [ ] Read and followed KubeVela's [contribution process](https://github.com/oam-dev/kubevela/blob/master/contribute/create-pull-request.md).
- [ ] [Related Docs](https://github.com/oam-dev/kubevela.io) updated properly. In a new feature or configuration option, an update to the documentation is necessary. 
- [ ] Run `make reviewable` to ensure this PR is ready for review.
- [ ] Added `backport release-x.y` labels to auto-backport this PR if necessary.
-
-### How has this code been tested
-
-<!--
-Before reviewers can be confident in the correctness of this pull request, it
-needs to tested and shown to be correct. Briefly describe the testing that has
-already been done or which is planned for this change.
-->
-
-
-### Special notes for your reviewer
-
-<!--
-
-Be sure to direct your reviewers'
-attention to anything that needs special consideration.
-
-->
--- a/.github/pr-title-checker-config.json
+++ b/.github/pr-title-checker-config.json
@@ -1,10 +0,0 @@
-{
-  "LABEL": {
-    "name": "title-needs-formatting",
-    "color": "EEEEEE"
-  },
-  "CHECKS": {
-    "prefixes": ["Fix: ", "Feat: ", "Docs: ", "Test: ", "Chore: ", "CI: ", "Perf: ", "Refactor: ", "Revert: ", "Style: ", "Test: ",
-      "Fix(", "Feat(", "Docs(", "Test(", "Chore(", "CI(", "Perf(", "Refactor(", "Revert(", "Style(", "Test(", "[Backport"]
-  }
-}
--- a/.github/workflows/apiserver-test.yaml
+++ b/.github/workflows/apiserver-test.yaml
@@ -1,122 +0,0 @@
-name: APIServer Unit Test & E2E Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-      - apiserver
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-      - apiserver
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.7.0'
-
-jobs:
-
-  detect-noop:
-    runs-on: ubuntu-20.04
-    outputs:
-      noop: ${{ steps.noop.outputs.should_skip }}
-    steps:
-      - name: Detect No-op Changes
-        id: noop
-        uses: fkirc/skip-duplicate-actions@v3.3.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  apiserver-unit-tests:
-    runs-on: aliyun
-    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: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
-      - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
-        with:
-          version: ${{ env.KIND_VERSION }}
-          skipClusterCreation: true
-
-      - name: Setup Kind Cluster (Worker)
-        run: |
-          kind delete cluster --name worker
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4 --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: Setup Kind Cluster (Hub)
-        run: |
-          kind delete cluster
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
-          kubectl version
-          kubectl cluster-info
-
-      - name: Load Image to kind cluster
-        run: make kind-load
-
-      - name: Cleanup for e2e tests
-        run: |
-          make e2e-cleanup
-          make e2e-setup-core
-
-          make vela-cli
-          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'
-          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
-
-      - name: Run apiserver unit test
-        run: make unit-test-apiserver
-
-      - name: Run apiserver e2e test
-        run: |
-          export ALIYUN_ACCESS_KEY_ID=${{ secrets.ALIYUN_ACCESS_KEY_ID }}
-          export ALIYUN_ACCESS_KEY_SECRET=${{ secrets.ALIYUN_ACCESS_KEY_SECRET }}
-          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          make e2e-apiserver-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e-core
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage.txt,/tmp/e2e_apiserver_test.out
-          flags: apiserver-unittests
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup
--- a/.github/workflows/back-port.yaml
+++ b/.github/workflows/back-port.yaml
@@ -1,22 +0,0 @@
-name: Backport
-on:
-  pull_request_target:
-    types:
-      - closed
-
-jobs:
-  # align with crossplane's choice https://github.com/crossplane/crossplane/blob/master/.github/workflows/backport.yml
-  open-pr:
-    runs-on: ubuntu-20.04
-    if: github.event.pull_request.merged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}
--- a/.github/workflows/commit-lint.yml
+++ b/.github/workflows/commit-lint.yml
@@ -1,19 +1,13 @@
-name: PR Title Checker
-on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - labeled
-      - unlabeled
+name: Lint Commit Messages
+on: [push, pull_request]

 jobs:
-  check:
+  commitlint:
    runs-on: ubuntu-latest
    steps:
-      - uses: thehanimo/pr-title-checker@v1.3.1
+      - uses: actions/checkout@v2
        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pass_on_octokit_error: true
-          configuration_path: ".github/pr-title-checker-config.json"
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v4
+        with:
+          helpURL: https://github.com/oam-dev/kubevela/blob/master/contribute/create-pull-request.md#commit-message-format
--- a/.github/workflows/e2e-multicluster-test.yml
+++ b/.github/workflows/e2e-multicluster-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -76,22 +76,13 @@ jobs:
      - name: Load Image to kind cluster (Hub)
        run: make kind-load

-      - name: Load Image to kind cluster (Worker)
-        run: |
-          make kind-load-runtime-cluster
-
      - name: Cleanup for e2e tests
        run: |
          make e2e-cleanup
          make e2e-setup-core
-          make
-          make setup-runtime-e2e-cluster
-          make vela-cli

      - name: Run e2e multicluster tests
-        run: |
-          export PATH=$(pwd)/bin:$PATH
-          make e2e-multicluster-test
+        run: make e2e-multicluster-test

      - name: Stop kubevela, get profile
        run: make end-e2e-core
@@ -100,7 +91,7 @@ jobs:
        uses: codecov/codecov-action@v1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
+          files: /tmp/e2e-profile.out,/tmp/e2e_multicluster_test.out
          flags: e2e-multicluster-test
          name: codecov-umbrella

--- a/.github/workflows/e2e-rollout-test.yml
+++ b/.github/workflows/e2e-rollout-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -90,12 +90,12 @@ jobs:
        uses: codecov/codecov-action@v1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
+          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
          flags: e2e-rollout-tests
          name: codecov-umbrella

      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
+        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out

      - name: Cleanup image
        if: ${{ always() }}
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -83,9 +83,6 @@ jobs:
      - name: Run api e2e tests
        run: make e2e-api-test

-      - name: Run addons e2e tests
-        run: make e2e-addon-test
-
      - name: Run e2e tests
        run: make e2e-test

@@ -96,12 +93,12 @@ jobs:
        uses: codecov/codecov-action@v1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
+          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
          flags: e2etests
          name: codecov-umbrella

      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
+        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out

      - name: Cleanup image
        if: ${{ always() }}
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -33,6 +33,52 @@ jobs:
          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
          concurrent_skipping: false

+  compatibility-test:
+    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: Setup Kind Cluster
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+
+      - name: install Kubebuilder
+        uses: RyanSiu1995/kubebuilder-action@v1.2
+        with:
+          version: 3.1.0
+          kubebuilderOnly: false
+          kubernetesVersion: v1.21.2
+
+      - name: Run Make compatibility-test
+        run: make compatibility-test
+
+      - name: Clean up testdata
+        run: make compatibility-testdata-cleanup
+
  staticcheck:
    runs-on: ubuntu-20.04
    needs: detect-noop
--- a/.github/workflows/issue-commands.yml
+++ b/.github/workflows/issue-commands.yml
@@ -6,7 +6,7 @@ on:
    types: [created]

 jobs:
-  bot:
+  main:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Actions
@@ -22,48 +22,3 @@ jobs:
        with:
          token: ${{secrets.VELA_BOT_TOKEN}}
          configPath: issue-commands
-
-  backport:
-    runs-on: ubuntu-18.04
-    if: github.event.issue.pull_request && contains(github.event.comment.body, '/backport')
-    steps:
-      - name: Extract Command
-        id: command
-        uses: xt0rted/slash-command-action@v1
-        with:
-          repo-token: ${{ secrets.VELA_BOT_TOKEN }}
-          command: backport
-          reaction: "true"
-          reaction-type: "eyes"
-          allow-edits: "false"
-          permission-level: read
-      - name: Handle Command
-        uses: actions/github-script@v4
-        env:
-          VERSION: ${{ steps.command.outputs.command-arguments }}
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const version = process.env.VERSION
-            let label = "backport release-" + version
-            if (version.includes("release")) {
-              label = "backport " + version
-            }
-            // Add our backport label.
-            github.issues.addLabels({
-              // Every pull request is an issue, but not every issue is a pull request.
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: [label]
-            })
-            console.log("Added '" + label + "' label.")
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}
--- a/.github/workflows/registry.yml
+++ b/.github/workflows/registry.yml
@@ -44,23 +44,12 @@ jobs:
          registry: docker.io
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@v1
-        with:
-          registry: kubevela-registry.cn-hangzhou.cr.aliyuncs.com
-          username: ${{ secrets.ACR_USERNAME }}@aliyun-inner.com
-          password: ${{ secrets.ACR_PASSWORD }}
      - uses: docker/setup-qemu-action@v1
      - uses: docker/setup-buildx-action@v1
        with:
          driver-opts: image=moby/buildkit:master
-
-      - name: Build & Pushing vela-core for ACR
-        run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }} .
-          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
      - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-core for Dockerhub and GHCR
+        name: Build & Pushing
        with:
          context: .
          file: Dockerfile
@@ -72,39 +61,11 @@ jobs:
          build-args: |
            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
          tags: |-
-            docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
-
-      - name: Build & Pushing vela-apiserver for ACR
-        run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }} -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.apiserver .
-          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
+            docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
      - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-apiserver for Dockerhub and GHCR
-        with:
-          context: .
-          file: Dockerfile.apiserver
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository }}/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-
-      - name: Build & Pushing vela runtime rollout for ACR
-        run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }} .
-          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-      - uses: docker/build-push-action@v2
-        name: Build & Pushing runtime rollout for Dockerhub and GHCR
+        name: Build & Pushing runtime rollout
        with:
          context: .
          file: runtime/rollout/Dockerfile
@@ -116,10 +77,9 @@ jobs:
          build-args: |
            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
          tags: |-
-            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
            ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}

  publish-charts:
    env:
@@ -155,7 +115,7 @@ jobs:
          releases-only: true
        id: latest_tag
      - name: Tag helm chart image
-        run: |
+        run:  |
          latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
          sub="."
          major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
@@ -219,6 +179,6 @@ jobs:
      - name: sync capabilities bucket to local
        run: ./ossutil --config-file .ossutilconfig sync oss://$CAPABILITY_BUCKET $CAPABILITY_DIR
      - name: rsync all capabilites
-        run: rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
+        run:  rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
      - name: sync local to cloud
        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,146 +4,126 @@ on:
  push:
    tags:
      - "v*"
-  workflow_dispatch: { }
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  workflow_dispatch: {}

 jobs:
-  build:
+  publish-cli:
    runs-on: ubuntu-latest
-    name: build
-    strategy:
-      matrix:
-        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
    env:
-      VELA_VERSION_KEY: github.com/oam-dev/kubevela/version.VelaVersion
-      VELA_GITVERSION_KEY: github.com/oam-dev/kubevela/version.GitRevision
-      GO_BUILD_ENV: GO111MODULE=on CGO_ENABLED=0
-      DIST_DIRS: find * -type d -exec
+      VELA_VERSION: ${{ github.ref }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
      - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.17
-      - name: Get release
-        id: get_release
-        uses: bruceadams/get-release@v1.2.2
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Get matrix
-        id: get_matrix
-        run: |
-          TARGETS=${{matrix.TARGETS}}
-          echo ::set-output name=OS::${TARGETS%/*}
-          echo ::set-output name=ARCH::${TARGETS#*/}
-      - name: Get ldflags
-        id: get_ldflags
-        run: |
-          LDFLAGS="-s -w -X ${{ env.VELA_VERSION_KEY }}=${{ env.VELA_VERSION }} -X ${{ env.VELA_GITVERSION_KEY }}=git-$(git rev-parse --short HEAD)"
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV
-      - name: Build
-        run: |
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/vela -v \
-            ./references/cmd/cli/main.go
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/kubectl-vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/kubectl-vela -v \
-            ./cmd/plugin/main.go
-      - name: Compress
-        run: |
-          echo "\n## Release Info\nVERSION: ${{ env.VELA_VERSION }}" >> README.md && \
-          echo "GIT_COMMIT: ${GITHUB_SHA}\n" >> README.md && \
-          cd _bin/vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r vela-{}.zip {} \; && \
-          cd ../kubectl-vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf kubectl-vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r kubectl-vela-{}.zip {} \; && \
-          cd .. && \
-          sha256sum vela/vela-* kubectl-vela/kubectl-vela-* >> sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt \
-      - name: Upload Vela tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Vela zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_content_type: binary/octet-stream
-      - name: Post sha256
-        uses: actions/upload-artifact@v2
-        with:
-          name: sha256sums
-          path: ./_bin/sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt
-          retention-days: 1
-
-  upload-plugin-homebrew:
-    needs: build
-    runs-on: ubuntu-latest
-    name: upload-sha256sums
-    steps:
-      - name: Checkout
+          go-version: 1.16
+        id: go
+      - name: Check out code into the Go module directory
        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+      - name: Tag helm chart image
+        run:  |
+          sed -i 's/latest/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/values.yaml
+          sed -i 's/0.1.0/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/Chart.yaml
+      - name: Run cross-build
+        run: make cross-build
+      - name: Run compress binary
+        run: make compress
      - name: Get release
        id: get_release
        uses: bruceadams/get-release@v1.2.2
-      - name: Download sha256sums
-        uses: actions/download-artifact@v2
+      - name: Upload Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
        with:
-          name: sha256sums
-          path: cli-artifacts
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: cli-artifacts
-      - shell: bash
-        working-directory: cli-artifacts
-        run: |
-          for file in *
-          do
-            cat ${file} >> sha256sums.txt
-          done
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-linux-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-linux-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-darwin-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
      - name: Upload Checksums
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: cli-artifacts/sha256sums.txt
+          asset_path: ./_bin/sha256sums.txt
          asset_name: sha256sums.txt
          asset_content_type: text/plain
      - name: Update kubectl plugin version in krew-index
        uses: rajatjindal/krew-release-bot@v0.0.38
-      - name: Update Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
-        with:
-          token: ${{ secrets.HOMEBREW_TOKEN }}
-          formula: kubevela
-          tag: ${{ github.ref }}
-          revision: ${{ github.sha }}
-          force: false
--- a/.github/workflows/sync-api.yml
+++ b/.github/workflows/sync-api.yml
@@ -11,10 +11,10 @@ jobs:
  sync-core-api:
    runs-on: ubuntu-20.04
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.16
        uses: actions/setup-go@v1
        env:
-          GO_VERSION: '1.17'
+          GO_VERSION: '1.16'
          GOLANGCI_VERSION: 'v1.38'
        with:
          go-version: ${{ env.GO_VERSION }}
--- a/.github/workflows/timed-task.yml
+++ b/.github/workflows/timed-task.yml
@@ -1,7 +1,7 @@
 name: Timed Task
 on:
  schedule:
-    - cron: '* * * * *'
+    - cron: '0 * * * *'
 jobs:
  clean-image:
    runs-on: aliyun
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -72,7 +72,7 @@ jobs:
          version: 3.1.0
          kubebuilderOnly: false
          kubernetesVersion: v1.21.2
-      
+
      - name: Run Make test
        run: make test

@@ -81,5 +81,5 @@ jobs:
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          file: ./coverage.txt
-          flags: core-unittests
+          flags: unittests
          name: codecov-umbrella
--- a/.gitignore
+++ b/.gitignore
@@ -41,12 +41,8 @@ references/cmd/cli/fake/source.go
 references/cmd/cli/fake/chart_source.go
 charts/vela-core/crds/_.yaml
 .test_vela
-tmp/

 .vela/

 # check docs
-git-page/
-
-# e2e rollout runtime image build
-runtime/rollout/e2e/tmp
+git-page/
--- a/.krew.yaml
+++ b/.krew.yaml
@@ -33,8 +33,8 @@ spec:
        arch: amd64
    {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-windows-amd64.zip" .TagName }}
    files:
-    - from: "*/kubectl-vela"
-      to: "kubectl-vela.exe"
+    - from: "*/kubectl-vela.exe"
+      to: "."
    - from: "*/LICENSE"
      to: "."
    bin: "kubectl-vela.exe"
--- a/CHANGELOG/CHANGELOG-1.0.md
+++ b/CHANGELOG/CHANGELOG-1.0.md
@@ -1,260 +0,0 @@
-# v1.0.7
-
-This is a minor fix for release-1.0, please refer to release-1.1.x for the latest feature.
-
-1. Fix podDisruptive field for inner traits #1844
-
-
-# v1.0.6
-
-1. fix bug: When the Component contains multiple traits of the same type, the status of the trait in the Application is reported incorrectly (#1731) (#1743)
-2. Fix terraform component can't work normally, generate OpenAPI JSON schema for Terraform Component (#1738) (#1753)
-3. Improve the logging system #1735 #1758
-4. add ConcurrentReconciles for setting the concurrent reconcile number of the controller  #1775 
-
-# v1.0.5
-
-1. Fix Terraform application status issue (#1611)
-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)
-6. Use stricter syntax check for CUE (#1643)
-7. make ResourceTracker to own cluster-scope resource (#1634)
-8. update docs
-
-# v1.0.4
-
-## Upgrade to this release
-
-**Please update Application CRD to upgrade from v1.0.3 to this release**
-
-```
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applications.yaml
-```
-
-**Check the upgrade docs to upgrade from other release: https://kubevela.io/docs/advanced-install#upgrade**
-
-
-## Changelog
-
-1. add more PVC volume traits and docs (#1524)
-2. automatically sync vela api code to the repo([kubevela-core-api](https://github.com/oam-dev/kubevela-core-api)) on release, you can use this repo as import package for kubevela integration (#1523)
-3. fix cue template of worker and ingress with more accurate error info (#1532)
-4. add critical path k8s event for Application (#1463)
-5. support K8s Deployment for AppRollout #1539 #1557
-6. vela cli: enable "vela show" to support namespaced capability (#1521)
-7. Add scpoe reference in Application object `status.Service` (#1540)
-8. vela cli: `vela show` support list the parameter of ComponentDefinition created by helm charts (#1543)
-9. Add revision mechanism for Component/Trait Definition and default revision histroy will keep 20 revisions #1531
-10. fix CRD for legacy K8s cluser(<=1.14) (#1531)
-11. fix duplate key in kubevela chart webhook yaml (#1571)
-12. Check whether parameter.cmd is nill for `sidecar` trait (#1575)
-13. add e2e-test into test coverage report (#1553)
-14. support krew install for kubectl vela plugin #1582
-15. fix controller cannot start due to the format error of the third-party CRD (#1584)
-16. use accelerate domain for helm chart repo to speed up for global users (#1585)
-17.  embed rollout in an application, now you can use rolloutPlan in Application (#1568)
-18. Support server-side Terraform as cloud resource provider #1519
-
-# v1.0.3
-
-More end user guide was added in `Application Deployment` section.
-
-1. add helm test to verify the chart of KubeVela have been installed successfully  (#1415)
-2. fix bug which Component/TraitDefinition won't work when contains “`_|_`” in value (#1450)
-3. add volumes definition in worker/webservice (#1459)
-4. Remove local kind binary dependency #1458
-5. ignore error not found when deleting resourceTracker (#1462)
-6. add context.appRevisionNum as runtime context (#1466)
-7. implement cli `vela system live-diff` to check diff before upgrade (#1419)
-8. add webhook validation on CUE template outputs name (#1460)
-9. Fix helm chart about wrong webhook policy (#1483)
-10. Remove trait-injector from controller options (#1490)
-12. add app name as label for AppRevision (#1488)
-13. Introduce vela as a kubectl plugin (#1485)
-14. update status of appContext by patch to avoid resourceVersion conflict error (#1500)
-15. add workloadDefinitionRef to application status.services (#1471)
-16. Add garbage collection mechanism for AppRevision, it will only keep 10 revisions by default (#1501)
-17. Remove AGE in definition crd print columns (#1509)
-
-
-# v1.0.2
-
-1. remove no used ingress notes in KubeVela charts (#1405)
-2. fix import inner package in the format of third party package path and add docs (#1412  #1417)
-3. vela cli support use "vela system cue-packages" to list cue-package (#1417)
-4. Fix bug that the registered k8s built-in gvk does not exist in third party package path (#1414)
-5. Fix bug that patchKey not work when strategyUnify function not work with close call (#1430)
-6. add podDisruptive to traitdefinition to notify wether a trait update will cause restart of pod or not (#1192)
-7. Add a new cloneset scale controller (#1301)
-8. Support garbage collection for across-namespace workloads and traits  (#1421)
-9. Add short name for crds && Remove redundant and ambiguous short names #1434
-10. Refresh built-in packages when component/trait definition are registered (#1402)
-
-
-**You should upgrade following CRDs to upgrade from v1.0.1, all CRDs changes are backward compatible**:
-
-```
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/standard.oam.dev_rollouttraits.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applications.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_approllouts.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
-```
-
-
-# v1.0.1
-
-There are some fixes contained for release v1.0.0:
-
-1. add initial finalizer and abandon support for app rollout, you can revert quickly now(#1362)
-2. fix vela show fail to get component definition (#1366)
-3. fix application context controller should not own application object (#1370)
-4. fix: "system-definition-namespace" chart args not work in vela chart (#1371)
-5. fix resources created in different namespace can not be updated (#1374)
-6. fix automatically generate schema for helm values fail in array list value (#1375)
-7. upgrade API version of mutate/validate webhook to v1 (#1383)
-8. fix webhook not work by helm install kubevela without cert-manager #1267
-7. remove create cert-manager issuer in vela CLI env command (#1267)
-8. refine CRD print results: add additional print column and short Name for CRD (#1377)
-
-Many other docs improvements.
-
-Thanks for all the contributors!
-
-# v1.0.0
-
-We're excited to announce the release of KubeVela 1.0.0! 🎉🎉🎉🎉
-
-Thanks to all the new and existing contributors who helped make this release happen!
-
-You may already noticed the awesome community has shipped a brand new KubeVela website https://kubevela.io ! 🎉🎉
-
-If you're new to KubeVela, feel free to start with its [getting started page](https://kubevela.io/docs/quick-start) and learning about [its core concepts](https://kubevela.io/docs/concepts). The full feature of vela is explained in [platform builder guide](https://kubevela.io/docs/platform-engineers/overview).
-
-For existing adopters, please follow the [installing](https://kubevela.io/docs/install) or [upgrading](https://kubevela.io/docs/install#upgrade) KubeVela to version 1.0.0.
-
-## Acknowledgements ❤️
-
-Thanks to everyone who made this release possible!
-
-@captainroy-hy @sunny0826 @leejanee  @yangsoon @wangyikewxgm @hongchaodeng @zzxwill @ryanzhang-oss @resouer @wonderflow  @hprotzek @vnzongzna  @majian159 @Cweiping @mengjiao-liu @kushthedude @unknwon @Ghostbaby @mosesyou @dylandee @wangkai1994 @LeoLiuYan @just-do1 @hoopoe61 @Incubator4th @TomorJM @hahchenchen @zeed-w-beez @allenhaozi @mason1kwok @kinsolee @shikanon @96RadhikaJadhav
-
-# What's New
-
-## API version upgraded to `v1beta1`
-
-All user facing APIs have been upgraded to `v1beta1`, you could learn more details in the [API Changes](#API-Changes) section below.
-
-## `ComponentDefinition`
-
-The [`ComponentDefinition`](https://kubevela.io/docs/platform-engineers/definition-and-templates) now takes the responsibility of defining encapsulation and abstraction for your app components. And you are free to choose to use Helm chart or CUE to define them. This leaves `WorkloadDefinition` focusing on declaring workload characteristic such as `replicable`, `childResource`  etc, so the `spec.schematic` field in `WorkloadDefinition` could be deprecated in next few releases.
-
-## Application Versioning and Progressive Rollout
-
-* A rolling style upgrade was supported by the object called [`AppRollout`](https://kubevela.io/docs/rollout/rollout/). It can help you to upgrade an Application from source revision to the target and support Blue/Green, Canary and A/B testing rollout strategy.
-* Multi-Version, Multi-Cluster Application Deployment was supported by the object called [`AppDeployment`](https://kubevela.io/docs/rollout/appdeploy). It can help you to deploy multiple revision apps to multiple clusters with leverage of Service Mesh.
-
-## Visualization Enhancement
-
-KubeVela now automatically generates Open-API-v3 Schema for all the definition abstractions including CUE, Helm and raw Kubernetes resource templates. You can integrate KubeVela with your own dashboard and [generate forms from definitions](https://kubevela.io/docs/platform-engineers/openapi-v3-json-schema) at ease!
-
-## Application Abstraction
-
-There're several major updates on the `Application` abstraction itself:
-* [Helm based abstraction](https://kubevela.io/docs/helm/component) was supported with few [limitations](https://kubevela.io/docs/helm/known-issues). In other words, you can now declare any existing Helm chart as an app component in KubeVela. The most exciting part is the trait system of KubeVela works seamlessly with the Helm based components, yes, just [attach trait](https://kubevela.io/docs/helm/trait) to it!
-* [Raw Kubernetes resource templates](https://kubevela.io/docs/kube/component) was still supported, that's simpler but less powerful comparing to [the CUE way](https://kubevela.io/docs/cue/component). Of course, the trait system also [works seamless](https://kubevela.io/docs/kube/trait) with it.
-
-
-## CUE Template Enhancement
-
-* [Runtime information context](https://kubevela.io/docs/cue/component#full-available-information-in-cue-context) was supported, you could use this information to render the resources in CUE template.
-* [Data passing](https://kubevela.io/docs/cue/advanced#data-passing) was supported during CUE rendering. Specifically, the `context.output` contains the rendered workload API resource and the `context.outputs.<xx>` contains all the other rendered API resources.
-* [K8s API resources are now built-in packages](https://kubevela.io/docs/cue/basic#import-kube-package): the K8s built-in API including CRD will be discovered by KubeVela and automatically built as CUE packages, you can use it in your CUE template. This is very helpful in validation especially on writing new CUE templates.
-* [Dry-run Application](https://kubevela.io/docs/platform-engineers/debug-test-cue) was supported along with a debug and test guide for building CUE template. You can create CUE based definitions with confidence now!
-* [Deploy resources in different namespaces](https://kubevela.io/docs/cue/cross-namespace-resource/) was supported now, you can specify namespace in your CUE template.
-
-## Declare and Consume Cloud Resources
-
-* [Declare and consume cloud resources](https://kubevela.io/docs/platform-engineers/cloud-services/) were supported now in KubeVela, you can easily register cloud resources by `ComponentDefinition` and bind the service into the applications.
-
-## A brand new website
-
-We have upgraded our website [kubevela.io](https://github.com/oam-dev/kubevela.io) based on "Docusaurus". All docs is automatically generated from [KubeVela](https://github.com/oam-dev/kubevela/tree/master/docs) while the blogs are on [kubevela.io/blogs](https://github.com/oam-dev/kubevela.io/tree/main/blog).
-
-
-# Changes
-
-## API Changes
-
-1. Change definition from cluster scope to namespace scope #1085 the cluster scope CRD was still compatible.
-2. Application Spec changes.
-    - `spec.components[x].settings` in v1alpha2 was changed to `spec.components[x].properties` in v1beta1
-    - `spec.components[x].traits[x].name` in v1alpha2 was changed to `spec.components[x].traits[x].type` in v1beta1
-
-Example of the v1alpha2 Spec:
-
-```
-apiVersion: core.oam.dev/v1alpha2
-kind: Application
-metadata:
-  name: first-vela-app
-spec:
-  components:
-    - name: express-server
-      type: webservice
-      settings:
-        ...
-      traits:
-        - name: ingress
-          properties:
-            ...
-```
-
-Example of the v1beta1 Spec:
-
-```
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: first-vela-app
-spec:
-  components:
-    - name: express-server
-      type: webservice
-      properties:
-        ...
-      traits:
-        - type: ingress
-          properties:
-            ...
-```
-
-
-## Deprecation
-
-1. route/autoscaler/metrics these three traits and their controllers were moved out from the vela core.  #1172 You could still find and use them from https://github.com/oam-dev/catalog.
-2. the dashboard was deprecated in KubeVela and we will merge these features and create a new in [velacp](https://github.com/oam-dev/velacp) soon.
-3. vela CLI will only support run/modify an app from appfile by using `vela up`, so some other commands related were deprecated, such as `vela svc deploy`, `vela <trait> ...`
-
-
-## Other Notable changes
-
-1. `prometheus` and `certmanager` CRD are not required in installation #1005
-2. Parent overrides child when annotation/labels conflicts && one revision will apply once only in force mode && AC.status CRD updated #1109
-3. `ApplicationRevision` CRD Object was introduced as revision of Application #1214
-4. KubeVela chart image pull policy was changed to `Always` from `IfNotPresent` #1228
-   5.` Application` Controller will use `AppContext` to manage the resources generation #1245, in other word, you can run KubeVela `Application Controller` without any `v1apha2 Object`.
-6. The regular time for all events automatically sync changed from 5min to 1 hour   #1285
-7. `vela system dry-run` will print raw K8s resources in a better format  #1246
-
-
-# Known Issues
-
-1. Built-in CUE package was not supported now for K8s Cluster v1.20, we will support in the next release. #1313
-2. Resources created in different namespace from application will only be garbage collected (GC) when the application deleted, an update will not trigger GC for now, we will fix it in the next release. #1339
-
-
-Thanks again to all the contributors!
--- a/CHANGELOG/CHANGELOG-1.1.md
+++ b/CHANGELOG/CHANGELOG-1.1.md
@@ -1,243 +0,0 @@
-# v1.1.3
-
-## What's Changed
-* Fix: remove ocm addon enable in Makefile by @Somefive in https://github.com/oam-dev/kubevela/pull/2327
-* Chore(cli): remove useless deploy.yaml by @chivalryq in https://github.com/oam-dev/kubevela/pull/2335
-* Fix: do not override the workload name if its specified by @FogDong in https://github.com/oam-dev/kubevela/pull/2336
-* Fix: remove appcontext CRD and controller by @wonderflow in https://github.com/oam-dev/kubevela/pull/2270
-* Feat: add revisionHistoryLimit to helm chart by @haugom in https://github.com/oam-dev/kubevela/pull/2343
-* Chore: deprecate 'vela dashboard' apiserver by @chivalryq in https://github.com/oam-dev/kubevela/pull/2341
-* Chore: remove e2e-api-test in rollout test to speed up by @chivalryq in https://github.com/oam-dev/kubevela/pull/2345
-* Docs: rollout demo by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2348
-* Feat: add vela minimal chart by @FogDong in https://github.com/oam-dev/kubevela/pull/2340
-* Fix: runc security issue by @Somefive in https://github.com/oam-dev/kubevela/pull/2350
-* Docs: add a WeChat QR code by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2351
-* Feat: Initialize api for vela dashboard and CLI by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2339
-* Fix(helm chart): fix startup args for apiserver by @yangsoon in https://github.com/oam-dev/kubevela/pull/2362
-* Fix: dockerfile e2e test command lack environment configuration by @Somefive in https://github.com/oam-dev/kubevela/pull/2231
-* Feat: inputs support setting value in array by @leejanee in https://github.com/oam-dev/kubevela/pull/2358
-* Feat: support rollout controller for StatefulSet by @whichxjy in https://github.com/oam-dev/kubevela/pull/1969
-* Fix: delete deprecated vela dashboard in e2e setup by @FogDong in https://github.com/oam-dev/kubevela/pull/2379
-* Fix: try fix CI unit test by @wonderflow in https://github.com/oam-dev/kubevela/pull/2376
-* Feat: Addon REST API by @hongchaodeng in https://github.com/oam-dev/kubevela/pull/2369
-* Fix: fix built in workflow steps by @FogDong in https://github.com/oam-dev/kubevela/pull/2378
-* Feat: add vela minimal in make manifests by @FogDong in https://github.com/oam-dev/kubevela/pull/2389
-* Chore(deps): bump go.mongodb.org/mongo-driver from 1.3.2 to 1.5.1 by @wonderflow in https://github.com/oam-dev/kubevela/pull/2391
-* Fix: use aliyun oss istio chart by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2392
-* Support remote git repo for Terraform configuration by @zzxwill in https://github.com/oam-dev/kubevela/pull/2337
-* Feat: add inputs test cases and optimize code by @leejanee in https://github.com/oam-dev/kubevela/pull/2388
-* Fix: pass owner to workload if rollout failed by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2397
-* Feat: bootstrap multicluster testing by @Somefive in https://github.com/oam-dev/kubevela/pull/2368
-* Feat(workflow): add depends on in workflow by @FogDong in https://github.com/oam-dev/kubevela/pull/2387
-* Fix: make the name of Terraform credential secret same to component name by @zzxwill in https://github.com/oam-dev/kubevela/pull/2399
-* Fix: revision GC in workflow mode by @FogDong in https://github.com/oam-dev/kubevela/pull/2355
-* Fix: Applied Resources Statistics  Error by @leejanee in https://github.com/oam-dev/kubevela/pull/2398
-
-
-# v1.1.2
-
-This is a bug fix release.
-Since the big v1.1.1 release, many users had given it try for our new features. We sincerely appreciate your enthusiasm and amazing feedback.
-
-There are some small issues found by our users and we have fixed them. Most notably:
-
- The Charts of addons (prometheus, etc.) are moved to OSS to provide better accessibility and network speed.
- The FluxCD and Terraform addons are not enabled by default. Users can install them via `vela addon enable ...`.
-
-We have located more small issues around templates as well and fixed them, and decided a bug fix release ASAP.
-
-Users are highly recommended to use the v1.1.2 release instead. We want to thank all of our users sincerely! ❤️ ❤️ ❤️
-
-## What's Changed
-* Fix(rollout): improve rollback experience by @hongchaodeng in https://github.com/oam-dev/kubevela/pull/2294
-* Fix: fix typo by @hughxia in https://github.com/oam-dev/kubevela/pull/2317
-* Fix: fix cluster-gateway image tag in chart by @Somefive in https://github.com/oam-dev/kubevela/pull/2318
-* Fix: workflow example by @leejanee in https://github.com/oam-dev/kubevela/pull/2323
-* Fix: fix multicluster values bug by @Somefive in https://github.com/oam-dev/kubevela/pull/2326
-* Fix(helm): Do not install fluxcd and terraform by default by @yangsoon in https://github.com/oam-dev/kubevela/pull/2328
-* Fix: move charts from github repo to Alibaba Cloud OSS repo by @zzxwill in https://github.com/oam-dev/kubevela/pull/2324
-* Fix: add comments and adjust helm typed component's spec by @zzxwill in https://github.com/oam-dev/kubevela/pull/2332
-* Fix: fix multicluster template bug by @Somefive in https://github.com/oam-dev/kubevela/pull/2333
-* Feat: add args for init-contianer and sidecar by @Gallardot in https://github.com/oam-dev/kubevela/pull/2331
-
-# v1.1.1
-
-Users are highly recommended to use the v1.1.2 release instead.
-
-# Changes since v1.1.0
-
-1. rollout trait change IncreaseFirst to DecreaseFirst (#2142)
-2. Feat(definition): add built-in dingtalk workflow step definition (#2152)
-3. Fix(dryrun): add default name and namespace in dry run (#2150)
-4. Docs: fix typo about workflow rollout (#2163)
-5. Fix: traitdefinition controller reconcile in a infinite loop (#2157)
-6. Refactor: change the ownerReference of configMap which store the parameter for each revision to definitionRevision (#2164)
-7. Fix: add fluxcd dashbaords (#2130)
-8. Feat: modify apply component cue action to support skipWorkload trait (#2167)
-9.  Trait: Add TraitDefinition for PVC (#2158)
-10. initilize KubeVela codeowner file (#2178)
-11. Feat(cue): support access components artifacts in cue template context (#2161)
-12. Feat(addon): add default enable addon (#2172)
-13. Feat(envbinding): add resourceTracker for envBinding (#2179)
-14. Fix: align all CUE template keyword to use parameter (#2181)
-15. Feat: add vela live-diff , dry-run, cue-packages into vela commands (#2182)
-16. Fix: move Terraform defintions charts/vela-core/templates/definitions (#2176)
-17. Fix: add patchkey to volumes (#2191)
-18. Feat(workflow): add depends-on workflow step definition (#2190)
-19. Feat: add pprof (#2192)
-20. Feat: add more registry traits as internal ones (#2184)
-21. Fix: support more Terraform variable types (#2194)
-22. Fix: update help message of ingress trait (#2198)
-23. Refactor(#2185): remove unused config options in Makefile (#2200)
-24. Docs: update environment design (#2199)
-25. Fix: modify service-binding with more accurate type (#2209)
-26. Feat(healthscope): add health-scope-binding policy and e2e test for health scope (#2205)
-27. Feat(workflow): support dingding and slack in webhook notification (#2213)
-28. Feat(workflow): add apply application workflow step definition (#2186)
-29. Feat(workflow): input.ParameterKey described like paths notation (#2214)
-30. Fix(upgrade): upgrade controller-tools from 0.2 to 0.6.2 (#2215)
-31. Fix(app): When only the policy is specified, the resources in the app need to be rendered and created (#2197)
-32. Feat(workflow): outputs support script notation (#2218)
-33. Fix(addon): rename clonset-service to clonse (#2219)
-34. Feat(workflow): Add op.#Task action (#2220)
-35. Fix(webhook): only check the uniqueness of component names under the same namespace (#2222)
-36. Feat(apiserver): add apiserver service to helm chart (#2225)
-37. Fix: add flag --label to filer components and traits (#2217)
-38. Fix(addons): remove kruise addon (#2226)
-39. Feat: add pressure-test parameter optimize (#2230)
-40. Fix: align the envbind-app name with the original application name (#2232)
-41. Feat(workflow): add status check for workflow mutil-env deploy (#2229)
-42. Refactor: move from io/ioutil to io and os package (#2234)
-43. Feat(trait): annotation and labels trait should also affect the workload object along with pod (#2237)
-44. Feat(app): show health status from HealthScope in application (#2228)
-45. Fix: kustomize json patch trait definition (#2239)
-46. Docs: canary rollout demo (rollout part only) (#2177)
-47. Feat: vela show annotations display undefined should be refined (#2244)
-48. Feat: support code-generator and sync to kubevela-core-api (#2174)
-49. Feat: add image auto update for gitops (#2251)
-50. Fix: fix the output DB_PASSWORD for rds definition (#2267)
-51. Fix: add alibaba eip cloud resource (#2268)
-52. Refactor application code to make it run as Dag workflow (#2236)
-53. Fix: remove podspecworkload controller and CRD (#2269)
-54. Feat: add more options for leader election configuration to avoid pressure on apiserver
-55. Feat: istio addon and use case demo (#2276)
-56. Fix: patch any key using retainKeys strategy (#2280)
-57. Fix: add exponential backoff wait time for workflow reconciling (#2279)
-58. Refactor: change field exportKey to valueFrom (#2284)
-59. Fix(helm): enable apiserver by default (#2249)
-60. Feat: alibaba provider addon (#2243)
-61. Support MultiCluster EnvBinding with cluster-gateway (#2247)
-62. Fix: fix apply application workflow step (#2288)
-63. Fix: fix alibaba cloud rds module (#2293)
-64. Feat: add commit msg in kustomize (#2296)
-65. Feat: allow user specify alibaba provider addon's region (#2297)
-66. Fix: generate service in canary-traffic trait (#2300)
-67. Fix: imagePullSecrets error from cloneset (#2305)
-68. Fix: add application logging dashboard (#2301)
-69. Feat: Make applicationComponent can be modified in step (#2304)
-70. Fix: generate service in canary-traffic trait (#2307)
-
-
-# v1.1.0
-
-Note: the documents (https://kubevela.io/)  for v1.1.0 is still WIP, so we mark it as pre-release. The ETA for documents is next 2 weeks.
-
-We would like to extend our thanks to all [the new and existing contributors](https://github.com/oam-dev/kubevela/graphs/contributors) who helped make this release happen.
-
-Please follow the guide to [install](https://kubevela.io/docs/next/getting-started/quick-install) or [upgrade](https://kubevela.io/docs/next/platform-engineers/advanced-install/) KubeVela to version v1.1.0.
-
-## What's New
-
- **Hybrid Environment App Delivery Control plane**
-    - In the new release, we have fully upgraded KubeVela to a multi-cluster/hybrid-cloud/multi-cloud app delivery control plane with leverage of OAM as the consistent app delivery model across clouds and infrastructures.
- **Workflow**
-    - KubeVela has added a Workflow mechanism that empowers users to glue any operational tasks to customize the control logic to build more complex operations. Workflow is modular by design and each module is mainly composed in CUE -- so you can define complex operations in a declarative, data-driven manner.
- **Environment**
-    - KubeVela added an Initializer which allow users to define what constructs the environment. The environment Initialized by the Initilizer could contain different kinds of resources include K8s cluster, system components, policies and almost everything. Of course, you can destry an environment very easily with the help of Initializer.
- **Out of Box Addons**
-    - With the help of Initilizer, KubeVela has support lots of out of box addons. You can list/enable/disable them by `vela addon` command. Each addon is an Initializer that deloy the CRD Controllers and other resources related.
- **Cloud Resources Support**
-    - We also support terraform to provision almost every cloud resources and pass through to other components defined in KubeVela application.
- **Tools to edit and manage X-Definition**
-    - We also provide the `vela def` tool sets to provide unified CUE based capability to manage X-Definition.
- **Others**
-    - Allow specify name for component revision auto-generated by Application. Allow specify name for auto generated Definition revision.
-    - Controller runtime dependency upgrade that can compatible with Kubernetes v1.21 . KubeVela support Kubernetes v1.18~v1.21.
-    - Other details you could read changelog in the release history.
-    
-## Change log since v1.1-rc2
-
-1. fix configmap patchkey bug (#2080)
-2. Merge velacp to apiserver branch in oam repo (#2039) (#2127)  (#2087)
-3. support rollout controller seprated and install as helm chart in runtime cluster  (#2075)
-4. fix bug that KubeVela can not be installed in specified namespace (#2083)
-5. enable vela def to use import decl (#2084)
-6. enhance envbinding: support apply resources to cluster (#2093)
-7. Add obsevability addon (#2091)
-8. Feat(vela): add vela workflow suspend command (#2108)
-9. feat(def): add built-in workflow definitions (#2094)
-10. Feat(vela): add vela workflow resume command (#2114)
-11. upgrade openkruise version to v0.9.0 (#2076)
-12. Fix(workflow): set workload name in configmap if the name is not specified (#2119)
-13. helm component support OSS bucket (#2104)
-14. add rollout demo with Workflow (#2121)
-15. Support script as parameter and make the WorkflowStepDefinition more universal  (#2124)
-16. fix(cli) fix bug when vela show componetdefinition's workload type is AutoDetectWorkloadDefinition (#2125)
-17. Fix(workflow): set the namespace to app's ns if it's not specified (#2133)
-18. fix specify external revision bug (#2126)
-19. add CUE-based health check in HealthScope controller (#1956)
-20. Feat(addon): Add source and patch to kustomize definition (#2138)
-21. Feat(vela): add vela workflow terminate and restart command (#2131)
-
-
-# v1.1.0-rc.2
-
-1. Allow users to specify component revision name in Application (#1929) the new field `externalRevision` can specify the revision name.
-
-```
-kind: Application
-spec:
-  components:
-  - name: mycomp
-    type: webservice
-    externalRevision: my-revision-v1
-    properties:
-      ...
-```
-
-2. Add more workflow demo and fix some demos #2042  #2059 #2060 #2064
-3. Add cloneset ComponentDefinition into kruise addon (#2050)
-4. definitions support specify the revision name (#2044), you can specify the name by adding an annotation `definitionrevision.oam.dev/name`
-
-```
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  name: worker
-  annotations:
-    # you can specify the revision name in annotations
-    definitionrevision.oam.dev/name: "1.1.3"
-spec:
-  ...
-```
-
-5. fix definition controller log error cause by openapi schema generation error (#2063)
-6. Add add-on input go-template implementation (#2049)
-
-# v1.1.0-rc.1
-
-
-1. Workflow support specify Order Steps by Field Tag (#2022)
-2. support application policy (#2011)
-3. add OCM multi cluster demo (#1992)
-4. Fix(volume): seperate volume to trait (#2027)
-5. allow application skip gc resource and leave workload ownerReference controlled by rollout(#2024)
-6. Store component parameters in context (#2030)
-7. Allow specify chart values for helm trait(#2033)
-8. workflow support http provider (#2029)
-9.  Use vela def commands to replace mergedef.sh for internal definition generation (#2031)
-
-
-# Other release histories
-
-Refer to https://github.com/oam-dev/kubevela/releases
--- a/CHANGELOG/CHANGELOG-1.2.md
+++ b/CHANGELOG/CHANGELOG-1.2.md
@@ -1,5 +0,0 @@
-# v1.2.0-alpha1
-
-## What's changed
-
-1. Feature: support terraform/provider-azure addon #2402 by @zzxwill 
--- a/CHANGELOG/README.md
+++ b/CHANGELOG/README.md
@@ -1,13 +0,0 @@
-# CHANGELOGs
-
-## Development release
-
- [CHANGELOG-1.2.md](./CHANGELOG-1.2.md)
-
-## Current release
-
- [CHANGELOG-1.1.md](./CHANGELOG-1.1.md)
-
-## Older releases
-
- [CHANGELOG-1.0.md](./CHANGELOG-1.0.md)
--- a/18
+++ b/18
@@ -1,16 +1,10 @@
-ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-
-# It's a proxy for CN developer, please unblock it if you have network issue
-ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
-
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
@@ -30,18 +24,24 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
    -o manager-${TARGETARCH} main.go

+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
+    -o apiserver-${TARGETARCH} cmd/apiserver/main.go
+
 # Use alpine as base image due to the discussion in issue #1448
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-FROM ${BASE_IMAGE:-alpine:3.15}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

 ARG TARGETARCH
 COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager
+COPY --from=builder /workspace/apiserver-${TARGETARCH} /usr/local/bin/apiserver

 COPY entrypoint.sh /usr/local/bin/

--- a/Dockerfile.apiserver
+++ b/Dockerfile.apiserver
@@ -1,48 +0,0 @@
-ARG BASE_IMAGE
-# Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
-ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
-WORKDIR /workspace
-# Copy the Go Modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
-
-# Copy the go source
-COPY cmd/core/main.go main.go
-COPY cmd/apiserver/main.go cmd/apiserver/main.go
-COPY apis/ apis/
-COPY pkg/ pkg/
-COPY version/ version/
-
-# Build
-ARG TARGETARCH
-ARG VERSION
-ARG GITVERSION
-
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
-    -o apiserver-${TARGETARCH} cmd/apiserver/main.go
-
-# Use alpine as base image due to the discussion in issue #1448
-# You can replace distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
-# Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-
-FROM ${BASE_IMAGE:-alpine:3.15}
-# This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
-
-WORKDIR /
-
-ARG TARGETARCH
-COPY --from=builder /workspace/apiserver-${TARGETARCH} /usr/local/bin/apiserver
-
-COPY entrypoint.sh /usr/local/bin/
-
-ENTRYPOINT ["entrypoint.sh"]
-
-CMD ["apiserver"]
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,6 +1,5 @@
-ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -25,8 +24,8 @@ ARG VERSION
 ARG GITVERSION

 RUN  apk add gcc musl-dev libc-dev ;\
-    GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .
+     GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+     go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .

 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
@@ -36,10 +35,10 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-
-FROM ${BASE_IMAGE:-alpine:3.15}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

--- a/273
+++ b/273
@@ -1,39 +1,108 @@
-include makefiles/const.mk
-include makefiles/dependency.mk
-include makefiles/release.mk
-include makefiles/develop.mk
-include makefiles/build.mk
-include makefiles/e2e.mk
+# Vela version
+VELA_VERSION ?= master
+# Repo info
+GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
+GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
+VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
+VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
+LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
+
+GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
+GOX         = go run github.com/mitchellh/gox
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
+DIST_DIRS   := find * -type d -exec
+
+TIME_LONG	= `date +%Y-%m-%d' '%H:%M:%S`
+TIME_SHORT	= `date +%H:%M:%S`
+TIME		= $(TIME_SHORT)
+
+BLUE         := $(shell printf "\033[34m")
+YELLOW       := $(shell printf "\033[33m")
+RED          := $(shell printf "\033[31m")
+GREEN        := $(shell printf "\033[32m")
+CNone        := $(shell printf "\033[0m")
+
+INFO	= echo ${TIME} ${BLUE}[ .. ]${CNone}
+WARN	= echo ${TIME} ${YELLOW}[WARN]${CNone}
+ERR		= echo ${TIME} ${RED}[FAIL]${CNone}
+OK		= echo ${TIME} ${GREEN}[ OK ]${CNone}
+FAIL	= (echo ${TIME} ${RED}[FAIL]${CNone} && false)
+
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+# Image URL to use all building/pushing image targets
+VELA_CORE_IMAGE      ?= vela-core:latest
+VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
+VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest

-.DEFAULT_GOAL := all
 all: build

 # Run tests
-test: vet lint staticcheck unit-test-core test-cli-gen
+test: vet lint staticcheck
+	go test -coverprofile=coverage.txt ./pkg/... ./cmd/...
+	go test ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
 	@$(OK) unit-tests pass

-test-cli-gen: 
-	mkdir -p ./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)
-	go test $(shell go list ./references/... | grep -v apiserver)
-unit-test-apiserver:
-	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/...  | grep -E 'apiserver|velaql')
-
 # Build vela cli binary
 build: fmt vet lint staticcheck vela-cli kubectl-vela
 	@$(OK) build succeed

+vela-cli:
+	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
+
+kubectl-vela:
+	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
+
+doc-gen:
+	rm -r docs/en/cli/*
+	go run hack/docgen/gen.go
+
+PWD := $(shell pwd)	
+cross-build:
+	rm -rf _bin
+	go get github.com/mitchellh/gox@v0.4.0
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/vela/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/kubectl-vela/{{.OS}}-{{.Arch}}/kubectl-vela" -osarch='$(TARGETS)' ./cmd/plugin
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/apiserver/{{.OS}}-{{.Arch}}/apiserver" -osarch="$(TARGETS)" ./cmd/apiserver
+
 build-cleanup:
 	rm -rf _bin

+compress:
+	( \
+		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
+		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
+		cd _bin/vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
+		cd ../kubectl-vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
+		cd .. && \
+		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
+	)
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+run:
+	go run ./cmd/core/main.go --application-revision-limit 5
+
+run-apiserver:
+	go run ./cmd/apiserver/main.go
+
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
 	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w $$(go list -f {{.Dir}} ./...)
 	$(CUE) fmt ./vela-templates/definitions/internal/*
-	$(CUE) fmt ./vela-templates/definitions/deprecated/*
 	$(CUE) fmt ./vela-templates/definitions/registry/*
 	$(CUE) fmt ./pkg/stdlib/pkgs/*
 	$(CUE) fmt ./pkg/stdlib/op.cue
@@ -57,42 +126,89 @@ check-diff: reviewable
 	git diff --quiet || ($(ERR) please run 'make reviewable' to include all changes && false)
 	@$(OK) branch is clean

+# Build the docker image
+docker-build:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
+
+# Build the runtime docker image
+docker-build-runtime-rollout:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_RUNTIME_ROLLOUT_IMAGE) -f runtime/rollout/Dockerfile .
+
 # Push the docker image
 docker-push:
 	docker push $(VELA_CORE_IMAGE)

-build-swagger:
-	go run ./cmd/apiserver/main.go build-swagger ./docs/apidoc/swagger.json
+e2e-setup-core:
+	sh ./hack/e2e/modify_charts.sh
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --set multicluster.enabled=true --wait kubevela ./charts/vela-core
+	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s

+e2e-setup:
+	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.9.0/kruise-chart.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
+	sh ./hack/e2e/modify_charts.sh
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
+	helm upgrade --install --create-namespace --namespace oam-runtime-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait oam-runtime ./charts/oam-runtime
+	bin/vela addon enable fluxcd
+	bin/vela addon enable terraform
+	ginkgo version
+	ginkgo -v -r e2e/setup

+	timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $$? -eq 0 ] ; then break; else sleep 5; fi;done'
+	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
+
+e2e-api-test:
+	# Run e2e test
+	ginkgo -v -skipPackage capability,setup,application -r e2e
+	ginkgo -v -r e2e/application
+
+e2e-test:
+	# Run e2e test
+	ginkgo -v  --skip="rollout related e2e-test." ./test/e2e-test
+	@$(OK) tests pass
+
+e2e-rollout-test:
+	ginkgo -v  --focus="rollout related e2e-test." ./test/e2e-test
+	@$(OK) tests pass
+
+e2e-multicluster-test:
+	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_multicluster_test.out ./test/e2e-multicluster-test
+	@$(OK) tests pass
+
+compatibility-test: vet lint staticcheck generate-compatibility-testdata
+	# Run compatibility test with old crd
+	COMPATIBILITY_TEST=TRUE go test -race ./pkg/...
+	@$(OK) compatibility-test pass
+
+generate-compatibility-testdata:
+	mkdir -p  ./test/compatibility-test/testdata
+	go run ./test/compatibility-test/convert/main.go ./charts/vela-core/crds ./test/compatibility-test/testdata
+
+compatibility-testdata-cleanup:
+	rm -f ./test/compatibility-test/testdata/*
+
+e2e-cleanup:
+	# Clean up
+	rm -rf ~/.vela

 image-cleanup:
-ifneq (, $(shell which docker))
-# Delete Docker images
-
+# Delete Docker image
 ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
 	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif

-ifneq ($(shell docker images -q $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)),)
-	docker rmi -f $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)
-endif
-
-endif
-
+end-e2e-core:
+	sh ./hack/e2e/end_e2e_core.sh

+end-e2e:
+	sh ./hack/e2e/end_e2e.sh

 # load docker image to the kind cluster
 kind-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
 	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }

-kind-load-runtime-cluster:
-	/bin/sh hack/e2e/build_runtime_rollout.sh
-	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
-	rm -rf runtime/rollout/e2e/tmp
-	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
 	go test ./pkg/... -coverprofile cover.out
@@ -105,6 +221,24 @@ manager: fmt vet lint manifests
 vela-runtime-rollout-manager: fmt vet lint manifests
 	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go

+# Run against the configured Kubernetes cluster in ~/.kube/config
+core-run: fmt vet manifests
+	go run ./cmd/core/main.go
+
+# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
+core-debug-run: fmt vet manifests
+	go run ./cmd/core/main.go --log-debug=true
+
+# Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
+core-install: manifests
+	kubectl apply -f hack/namespace.yaml
+	kubectl apply -f charts/vela-core/crds/
+	@$(OK) install succeed
+
+# Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
+core-uninstall: manifests
+	kubectl delete -f charts/vela-core/crds/
+
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
@@ -114,18 +248,83 @@ manifests: installcue kustomize
 	go run ./hack/crd/dispatch/dispatch.go config/crd/base charts/vela-core/crds charts/oam-runtime/crds runtime/ charts/vela-minimal/crds
 	rm -f config/crd/base/*
 	./vela-templates/gen_definitions.sh
+	go run ./vela-templates/gen_addons.go

-
+GOLANGCILINT_VERSION ?= v1.38.0
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 HOSTARCH := $(shell uname -m)
 ifeq ($(HOSTARCH),x86_64)
 HOSTARCH := amd64
 endif

+golangci:
+ifeq (, $(shell which golangci-lint))
+	@{ \
+	set -e ;\
+	echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCILINT_VERSION) ;\
+	echo 'Install succeed' ;\
+	}
+GOLANGCILINT=$(GOBIN)/golangci-lint
+else
+GOLANGCILINT=$(shell which golangci-lint)
+endif
+
+.PHONY: staticchecktool
+staticchecktool:
+ifeq (, $(shell which staticcheck))
+	@{ \
+	set -e ;\
+	echo 'installing honnef.co/go/tools/cmd/staticcheck ' ;\
+	GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck ;\
+	}
+STATICCHECK=$(GOBIN)/staticcheck
+else
+STATICCHECK=$(shell which staticcheck)
+endif
+
+.PHONY: goimports
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	}
+GOIMPORTS=$(GOBIN)/goimports
+else
+GOIMPORTS=$(shell which goimports)
+endif
+
+.PHONY: installcue
+installcue:
+ifeq (, $(shell which cue))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u cuelang.org/go/cmd/cue ;\
+	}
+CUE=$(GOBIN)/cue
+else
+CUE=$(shell which cue)
+endif
+
+KUSTOMIZE_VERSION ?= 3.8.2
+
+.PHONY: kustomize
+kustomize:
+ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
+	@{ \
+	set -e ;\
+	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
+	curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(GOBIN);\
+	echo 'Install succeed' ;\
+	}
+KUSTOMIZE=$(GOBIN)/kustomize
+else
+KUSTOMIZE=$(shell which kustomize)
+endif

 check-license-header:
 	./hack/licence/header-check.sh

 def-install:
 	./hack/utils/installdefinition.sh
-
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-<div style="text-align: center">
-  <p align="center">
-    <img src="https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png">
-    <br><br>
-    <i>Make shipping applications more enjoyable.</i>
-  </p>
-</div>
-
 ![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
 ![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
@@ -15,23 +7,22 @@
 [![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/oam-dev/kubevela)](https://www.tickgit.com/browse?repo=github.com/oam-dev/kubevela)
 [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Foam_dev)](https://twitter.com/oam_dev)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kubevela)](https://artifacthub.io/packages/search?repo=kubevela)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4602/badge)](https://bestpractices.coreinfrastructure.org/projects/4602)

-## Introduction
+![logo](https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png)

-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.
+*Make shipping applications more enjoyable.*

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

-## Highlights
+KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.

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

- *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.
+**Application Centric** - KubeVela introduces [Open Application Model (OAM)](https://oam.dev/) as the consistent yet higher level API to capture 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.

- *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.
+**Programmable Workflow** - KubeVela leverages [CUE](https://cuelang.org/) to implement its model layer. This allows you to declare application deployment workflow as a DAG, with all steps and application's needs glued together in programmable approach. No restrictions, natively extensible.

- *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.
+**Runtime Agnostic** - KubeVela works as an application delivery control plane that is fully runtime agnostic. It can deploy and manage any application components including containers, cloud functions, databases, or even EC2 instances across hybrid environments, following the workflow you defined.

 ## Getting Started

--- a/apis/core.oam.dev/common/types.go
+++ b/apis/core.oam.dev/common/types.go
@@ -18,18 +18,15 @@ package common

 import (
 	"encoding/json"
-	"errors"
-
-	"github.com/oam-dev/terraform-controller/api/v1beta1"
-	"sigs.k8s.io/controller-runtime/pkg/client"

 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

+	types "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
+
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/oam"
 )

 // Kube defines the encapsulation in raw Kubernetes resource format
@@ -120,7 +117,8 @@ type Terraform struct {
 	// Path is the sub-directory of remote git repository. It's valid when remote is set
 	Path string `json:"path,omitempty"`

-	v1beta1.BaseConfigurationSpec `json:",inline"`
+	// ProviderReference specifies the reference to Provider
+	ProviderReference *types.Reference `json:"providerRef,omitempty"`
 }

 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -169,7 +167,7 @@ type Status struct {
 	HealthPolicy string `json:"healthPolicy,omitempty"`
 }

-// ApplicationPhase is a label for the condition of an application at the current time
+// ApplicationPhase is a label for the condition of a application at the current time
 type ApplicationPhase string

 const (
@@ -193,28 +191,20 @@ const (
 	ApplicationRunning ApplicationPhase = "running"
 	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
 	ApplicationUnhealthy ApplicationPhase = "unhealthy"
-	// ApplicationDeleting means application is being deleted
-	ApplicationDeleting ApplicationPhase = "deleting"
 )

 // WorkflowState is a string that mark the workflow state
 type WorkflowState string

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

 // ApplicationComponentStatus record the health status of App component
@@ -263,10 +253,6 @@ type WorkflowStepStatus struct {
 	// A brief CamelCase message indicating details about why the workflowStep is in this state.
 	Reason   string          `json:"reason,omitempty"`
 	SubSteps *SubStepsStatus `json:"subSteps,omitempty"`
-	// FirstExecuteTime is the first time this step execution.
-	FirstExecuteTime metav1.Time `json:"firstExecuteTime,omitempty"`
-	// LastExecuteTime is the last time this step execution.
-	LastExecuteTime metav1.Time `json:"lastExecuteTime,omitempty"`
 }

 // WorkflowSubStepStatus record the status of a workflow step
@@ -291,6 +277,8 @@ type AppStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`

+	Rollout AppRolloutStatus `json:"rollout,omitempty"`
+
 	Phase ApplicationPhase `json:"status,omitempty"`

 	// Components record the related Components created by Application Controller
@@ -299,7 +287,6 @@ type AppStatus struct {
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`

-	// Deprecated
 	// ResourceTracker record the status of the ResourceTracker
 	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`

@@ -312,33 +299,18 @@ type AppStatus struct {

 	// AppliedResources record the resources that the  workflow step apply.
 	AppliedResources []ClusterObjectReference `json:"appliedResources,omitempty"`
-
-	// PolicyStatus records the status of policy
-	PolicyStatus []PolicyStatus `json:"policy,omitempty"`
-}
-
-// PolicyStatus records the status of policy
-type PolicyStatus struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Status *runtime.RawExtension `json:"status,omitempty"`
 }

 // WorkflowStatus record the status of workflow
 type WorkflowStatus struct {
 	AppRevision string       `json:"appRevision,omitempty"`
 	Mode        WorkflowMode `json:"mode"`
-	Message     string       `json:"message,omitempty"`

 	Suspend    bool `json:"suspend"`
 	Terminated bool `json:"terminated"`
-	Finished   bool `json:"finished"`

 	ContextBackend *corev1.ObjectReference `json:"contextBackend,omitempty"`
 	Steps          []WorkflowStepStatus    `json:"steps,omitempty"`
-
-	StartTime metav1.Time `json:"startTime,omitempty"`
 }

 // SubStepsStatus record the status of workflow steps.
@@ -354,7 +326,7 @@ type WorkflowStepPhase string
 const (
 	// WorkflowStepPhaseSucceeded will make the controller run the next step.
 	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
-	// WorkflowStepPhaseFailed will report error in `message`.
+	// WorkflowStepPhaseFailed will make the controller stop the workflow and report error in `message`.
 	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
 	// WorkflowStepPhaseStopped will make the controller stop the workflow.
 	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
@@ -484,48 +456,6 @@ const (
 	WorkflowResourceCreator ResourceCreatorRole = "workflow"
 )

-// OAMObjectReference defines the object reference for an oam resource
-type OAMObjectReference struct {
-	Component string `json:"component,omitempty"`
-	Trait     string `json:"trait,omitempty"`
-	Env       string `json:"env,omitempty"`
-}
-
-// Equal check if two references are equal
-func (in OAMObjectReference) Equal(r OAMObjectReference) bool {
-	return in.Component == r.Component && in.Trait == r.Trait && in.Env == r.Env
-}
-
-// AddLabelsToObject add labels to object if properties are not empty
-func (in OAMObjectReference) AddLabelsToObject(obj client.Object) {
-	labels := obj.GetLabels()
-	if labels == nil {
-		labels = map[string]string{}
-	}
-	if in.Component != "" {
-		labels[oam.LabelAppComponent] = in.Component
-	}
-	if in.Trait != "" {
-		labels[oam.TraitTypeLabel] = in.Trait
-	}
-	if in.Env != "" {
-		labels[oam.LabelAppEnv] = in.Env
-	}
-	obj.SetLabels(labels)
-}
-
-// NewOAMObjectReferenceFromObject create OAMObjectReference from object
-func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
-	if labels := obj.GetLabels(); labels != nil {
-		return OAMObjectReference{
-			Component: labels[oam.LabelAppComponent],
-			Trait:     labels[oam.TraitTypeLabel],
-			Env:       labels[oam.LabelAppEnv],
-		}
-	}
-	return OAMObjectReference{}
-}
-
 // ClusterObjectReference defines the object reference with cluster.
 type ClusterObjectReference struct {
 	Cluster                string              `json:"cluster,omitempty"`
@@ -533,11 +463,6 @@ type ClusterObjectReference struct {
 	corev1.ObjectReference `json:",inline"`
 }

-// Equal check if two references are equal
-func (in ClusterObjectReference) Equal(r ClusterObjectReference) bool {
-	return in.APIVersion == r.APIVersion && in.Kind == r.Kind && in.Name == r.Name && in.Namespace == r.Namespace && in.UID == r.UID && in.Creator == r.Creator && in.Cluster == r.Cluster
-}
-
 // RawExtensionPointer is the pointer of raw extension
 type RawExtensionPointer struct {
 	RawExtension *runtime.RawExtension
@@ -563,48 +488,3 @@ func (re RawExtensionPointer) MarshalJSON() ([]byte, error) {
 	// TODO: Check whether ContentType is actually JSON before returning it.
 	return re.RawExtension.Raw, nil
 }
-
-// ApplicationConditionType is a valid value for ApplicationCondition.Type
-type ApplicationConditionType int
-
-const (
-	// ParsedCondition indicates whether the parsing  is successful.
-	ParsedCondition ApplicationConditionType = iota
-	// RevisionCondition indicates whether the generated revision is successful.
-	RevisionCondition
-	// PolicyCondition indicates whether policy processing is successful.
-	PolicyCondition
-	// RenderCondition indicates whether render processing is successful.
-	RenderCondition
-	// WorkflowCondition indicates whether workflow processing is successful.
-	WorkflowCondition
-	// RolloutCondition indicates whether rollout processing is successful.
-	RolloutCondition
-	// ReadyCondition indicates whether whole application processing is successful.
-	ReadyCondition
-)
-
-var conditions = map[ApplicationConditionType]string{
-	ParsedCondition:   "Parsed",
-	RevisionCondition: "Revision",
-	PolicyCondition:   "Policy",
-	RenderCondition:   "Render",
-	WorkflowCondition: "Workflow",
-	RolloutCondition:  "Rollout",
-	ReadyCondition:    "Ready",
-}
-
-// String returns the string corresponding to the condition type.
-func (ct ApplicationConditionType) String() string {
-	return conditions[ct]
-}
-
-// ParseApplicationConditionType parse ApplicationCondition Type.
-func ParseApplicationConditionType(s string) (ApplicationConditionType, error) {
-	for k, v := range conditions {
-		if v == s {
-			return k, nil
-		}
-	}
-	return -1, errors.New("unknown condition type")
-}
--- a/apis/core.oam.dev/common/types_test.go
+++ b/apis/core.oam.dev/common/types_test.go
@@ -1,60 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package common
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-)
-
-func TestOAMObjectReference(t *testing.T) {
-	r := require.New(t)
-	o1 := OAMObjectReference{
-		Component: "component",
-		Trait:     "trait",
-		Env:       "env",
-	}
-	obj := &unstructured.Unstructured{}
-	o2 := NewOAMObjectReferenceFromObject(obj)
-	r.False(o2.Equal(o1))
-	o1.AddLabelsToObject(obj)
-	r.Equal(3, len(obj.GetLabels()))
-	o3 := NewOAMObjectReferenceFromObject(obj)
-	r.True(o1.Equal(o3))
-	o3.Component = "comp"
-	r.False(o3.Equal(o1))
-
-	r.True(o1.Equal(*o1.DeepCopy()))
-	o4 := OAMObjectReference{}
-	o1.DeepCopyInto(&o4)
-	r.True(o4.Equal(o1))
-}
-
-func TestClusterObjectReference(t *testing.T) {
-	r := require.New(t)
-	o1 := ClusterObjectReference{
-		Cluster:         "cluster",
-		ObjectReference: v1.ObjectReference{Kind: "kind"},
-	}
-	o2 := *o1.DeepCopy()
-	r.True(o1.Equal(o2))
-	o2.Cluster = "c"
-	r.False(o2.Equal(o1))
-}
--- a/apis/core.oam.dev/common/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/common/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -22,6 +21,7 @@ limitations under the License.
 package common

 import (
+	crossplane_runtime "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -46,6 +46,7 @@ func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	in.Rollout.DeepCopyInto(&out.Rollout)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1.ObjectReference, len(*in))
@@ -78,13 +79,6 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 		*out = make([]ClusterObjectReference, len(*in))
 		copy(*out, *in)
 	}
-	if in.PolicyStatus != nil {
-		in, out := &in.PolicyStatus, &out.PolicyStatus
-		*out = make([]PolicyStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -403,41 +397,6 @@ func (in *KubeParameter) DeepCopy() *KubeParameter {
 	return out
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OAMObjectReference) DeepCopyInto(out *OAMObjectReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OAMObjectReference.
-func (in *OAMObjectReference) DeepCopy() *OAMObjectReference {
-	if in == nil {
-		return nil
-	}
-	out := new(OAMObjectReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PolicyStatus) DeepCopyInto(out *PolicyStatus) {
-	*out = *in
-	if in.Status != nil {
-		in, out := &in.Status, &out.Status
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyStatus.
-func (in *PolicyStatus) DeepCopy() *PolicyStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(PolicyStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RawComponent) DeepCopyInto(out *RawComponent) {
 	*out = *in
@@ -600,7 +559,11 @@ func (in *SubStepsStatus) DeepCopy() *SubStepsStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Terraform) DeepCopyInto(out *Terraform) {
 	*out = *in
-	in.BaseConfigurationSpec.DeepCopyInto(&out.BaseConfigurationSpec)
+	if in.ProviderReference != nil {
+		in, out := &in.ProviderReference, &out.ProviderReference
+		*out = new(crossplane_runtime.Reference)
+		**out = **in
+	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
@@ -628,7 +591,6 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	in.StartTime.DeepCopyInto(&out.StartTime)
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
@@ -649,8 +611,6 @@ func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
 		*out = new(SubStepsStatus)
 		(*in).DeepCopyInto(*out)
 	}
-	in.FirstExecuteTime.DeepCopyInto(&out.FirstExecuteTime)
-	in.LastExecuteTime.DeepCopyInto(&out.LastExecuteTime)
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.
--- a/apis/core.oam.dev/condition/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/condition/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/core.oam.dev/v1alpha1/applyonce_types.go
+++ b/apis/core.oam.dev/v1alpha1/applyonce_types.go
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-const (
-	// ApplyOncePolicyType refers to the type of configuration drift policy
-	ApplyOncePolicyType = "apply-once"
-)
-
-// ApplyOncePolicySpec defines the spec of preventing configuration drift
-type ApplyOncePolicySpec struct {
-	Enable bool `json:"enable"`
-}
--- a/apis/core.oam.dev/v1alpha1/envbinding_types.go
+++ b/apis/core.oam.dev/v1alpha1/envbinding_types.go
@@ -17,63 +17,48 @@
 package v1alpha1

 import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )

+// ClusterManagementEngine represents a multi-cluster management solution
+type ClusterManagementEngine string
+
 const (
-	// EnvBindingPolicyType refers to the type of EnvBinding
-	EnvBindingPolicyType = "env-binding"
+	// OCMEngine represents Open-Cluster-Management multi-cluster management solution
+	OCMEngine ClusterManagementEngine = "ocm"
+
+	// SingleClusterEngine represents single cluster ClusterManagerEngine
+	SingleClusterEngine ClusterManagementEngine = "single-cluster"
+
+	// ClusterGatewayEngine represents multi-cluster management solution with cluster-gateway
+	ClusterGatewayEngine ClusterManagementEngine = "cluster-gateway"
 )

-// EnvTraitPatch is the patch to trait
-type EnvTraitPatch struct {
-	Type       string                `json:"type"`
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-	Disable    bool                  `json:"disable,omitempty"`
-}
+// EnvBindingPhase is a label for the condition of a EnvBinding at the current time
+type EnvBindingPhase string

-// ToApplicationTrait convert EnvTraitPatch into ApplicationTrait
-func (in *EnvTraitPatch) ToApplicationTrait() *common.ApplicationTrait {
-	out := &common.ApplicationTrait{Type: in.Type}
-	if in.Properties != nil {
-		out.Properties = in.Properties.DeepCopy()
-	}
-	return out
-}
+const (
+	// EnvBindingPrepare means EnvBinding is preparing the pre-work for cluster scheduling
+	EnvBindingPrepare EnvBindingPhase = "preparing"

-// EnvComponentPatch is the patch to component
-type EnvComponentPatch struct {
-	Name             string                `json:"name"`
-	Type             string                `json:"type"`
-	Properties       *runtime.RawExtension `json:"properties,omitempty"`
-	Traits           []EnvTraitPatch       `json:"traits,omitempty"`
-	ExternalRevision string                `json:"externalRevision,omitempty"`
-}
+	// EnvBindingRendering means EnvBinding is rendering the apps in different envs
+	EnvBindingRendering EnvBindingPhase = "rendering"

-// ToApplicationComponent convert EnvComponentPatch into ApplicationComponent
-func (in *EnvComponentPatch) ToApplicationComponent() *common.ApplicationComponent {
-	out := &common.ApplicationComponent{
-		Name: in.Name,
-		Type: in.Type,
-	}
-	if in.Properties != nil {
-		out.Properties = in.Properties.DeepCopy()
-	}
-	if in.Traits != nil {
-		for _, trait := range in.Traits {
-			if !trait.Disable {
-				out.Traits = append(out.Traits, *trait.ToApplicationTrait())
-			}
-		}
-	}
-	return out
-}
+	// EnvBindingScheduling means EnvBinding is deciding which cluster the apps is scheduled to.
+	EnvBindingScheduling EnvBindingPhase = "scheduling"
+
+	// EnvBindingFinished means EnvBinding finished env binding
+	EnvBindingFinished EnvBindingPhase = "finished"
+)

 // EnvPatch specify the parameter configuration for different environments
 type EnvPatch struct {
-	Components []EnvComponentPatch `json:"components,omitempty"`
+	Components []common.ApplicationComponent `json:"components"`
 }

 // NamespaceSelector defines the rules to select a Namespace resource.
@@ -101,34 +86,90 @@ type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
 	Selector  *EnvSelector `json:"selector,omitempty"`
-	Patch     EnvPatch     `json:"patch,omitempty"`
+	Patch     EnvPatch     `json:"patch"`
 }

-// EnvBindingSpec defines a list of envs
+// AppTemplate represents a application to be configured.
+type AppTemplate struct {
+	// +kubebuilder:validation:EmbeddedResource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	runtime.RawExtension `json:",inline"`
+}
+
+// ClusterDecision recorded the mapping of environment and cluster
+type ClusterDecision struct {
+	Env       string `json:"env"`
+	Cluster   string `json:"cluster,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
+}
+
+// A ConfigMapReference is a reference to a configMap in an arbitrary namespace.
+type ConfigMapReference struct {
+	// Name of the secret.
+	Name string `json:"name"`
+
+	// Namespace of the secret.
+	Namespace string `json:"namespace,omitempty"`
+}
+
+// A EnvBindingSpec defines the desired state of a EnvBinding.
 type EnvBindingSpec struct {
+	Engine ClusterManagementEngine `json:"engine,omitempty"`
+
+	// AppTemplate indicates the application template.
+	AppTemplate AppTemplate `json:"appTemplate"`
+
 	Envs []EnvConfig `json:"envs"`
+
+	// OutputResourcesTo specifies the namespace and name of a ConfigMap
+	// which store the resources rendered after differentiated configuration
+	// +optional
+	OutputResourcesTo *ConfigMapReference `json:"outputResourcesTo,omitempty"`
 }

-// PlacementDecision describes the placement of one application instance
-type PlacementDecision struct {
-	Cluster   string `json:"cluster"`
-	Namespace string `json:"namespace"`
-}
-
-// EnvStatus records the status of one env
-type EnvStatus struct {
-	Env        string              `json:"env"`
-	Placements []PlacementDecision `json:"placements"`
-}
-
-// ClusterConnection records the connection with clusters and the last active app revision when they are active (still be used)
-type ClusterConnection struct {
-	ClusterName        string `json:"clusterName"`
-	LastActiveRevision string `json:"lastActiveRevision"`
-}
-
-// EnvBindingStatus records the status of all env
+// A EnvBindingStatus is the status of EnvBinding
 type EnvBindingStatus struct {
-	Envs               []EnvStatus         `json:"envs"`
-	ClusterConnections []ClusterConnection `json:"clusterConnections"`
+	// ConditionedStatus reflects the observed status of a resource
+	condition.ConditionedStatus `json:",inline"`
+
+	Phase EnvBindingPhase `json:"phase,omitempty"`
+
+	ClusterDecisions []ClusterDecision `json:"clusterDecisions,omitempty"`
+
+	// ResourceTracker record the status of the ResourceTracker
+	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
+}
+
+// EnvBinding is the Schema for the EnvBinding API
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=envbind
+// +kubebuilder:printcolumn:name="ENGINE",type=string,JSONPath=`.spec.engine`
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+type EnvBinding struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   EnvBindingSpec   `json:"spec,omitempty"`
+	Status EnvBindingStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// EnvBindingList contains a list of EnvBinding.
+type EnvBindingList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []EnvBinding `json:"items"`
+}
+
+// SetConditions set condition for EnvBinding
+func (e *EnvBinding) SetConditions(c ...condition.Condition) {
+	e.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from EnvBinding
+func (e *EnvBinding) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return e.Status.GetCondition(conditionType)
 }
--- a/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
+++ b/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
@@ -1,81 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-const (
-	// GarbageCollectPolicyType refers to the type of garbage-collect
-	GarbageCollectPolicyType = "garbage-collect"
-)
-
-// GarbageCollectPolicySpec defines the spec of configuration drift
-type GarbageCollectPolicySpec struct {
-	// KeepLegacyResource if is set, outdated versioned resourcetracker will not be recycled automatically
-	// outdated resources will be kept until resourcetracker be deleted manually
-	KeepLegacyResource bool `json:"keepLegacyResource,omitempty"`
-
-	// Rules defines 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 `json:"rules,omitempty"`
-}
-
-// GarbageCollectPolicyRule defines a single garbage-collect policy rule
-type GarbageCollectPolicyRule struct {
-	Selector GarbageCollectPolicyRuleSelector `json:"selector"`
-	Strategy GarbageCollectStrategy           `json:"strategy"`
-}
-
-// GarbageCollectPolicyRuleSelector select the targets of the rule
-type GarbageCollectPolicyRuleSelector struct {
-	TraitTypes []string `json:"traitTypes"`
-}
-
-// GarbageCollectStrategy the strategy for target resource to recycle
-type GarbageCollectStrategy string
-
-const (
-	// GarbageCollectStrategyNever do not recycle target resource, leave it
-	GarbageCollectStrategyNever GarbageCollectStrategy = "never"
-	// GarbageCollectStrategyOnAppDelete do not recycle target resource until application is deleted
-	// this means the resource will be kept even it is not used in the latest version
-	GarbageCollectStrategyOnAppDelete GarbageCollectStrategy = "onAppDelete"
-	// GarbageCollectStrategyOnAppUpdate recycle target resource when it is not inUse
-	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
-)
-
-// FindStrategy find gc strategy for target resource
-func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
-	for _, rule := range in.Rules {
-		var traitType string
-		if manifest.GetLabels() != nil {
-			traitType = manifest.GetLabels()[oam.TraitTypeLabel]
-		}
-		if traitType != "" {
-			for _, _traitType := range rule.Selector.TraitTypes {
-				if _traitType == traitType {
-					return &rule.Strategy
-				}
-			}
-		}
-	}
-	return nil
-}
--- a/apis/core.oam.dev/v1alpha1/garbagecollect_types_test.go
+++ b/apis/core.oam.dev/v1alpha1/garbagecollect_types_test.go
@@ -1,83 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-func TestGarbageCollectPolicySpec_FindStrategy(t *testing.T) {
-	testCases := map[string]struct {
-		rules          []GarbageCollectPolicyRule
-		input          *unstructured.Unstructured
-		notFound       bool
-		expectStrategy GarbageCollectStrategy
-	}{
-		"trait rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"trait rule mismatch": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input:    &unstructured.Unstructured{Object: map[string]interface{}{}},
-			notFound: true,
-		},
-		"trait rule multiple match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyOnAppDelete,
-			}, {
-				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyOnAppDelete,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			spec := GarbageCollectPolicySpec{Rules: tc.rules}
-			strategy := spec.FindStrategy(tc.input)
-			if tc.notFound {
-				r.Nil(strategy)
-			} else {
-				r.Equal(tc.expectStrategy, *strategy)
-			}
-		})
-	}
-}
--- a/apis/core.oam.dev/v1alpha1/register.go
+++ b/apis/core.oam.dev/v1alpha1/register.go
@@ -17,6 +17,8 @@
 package v1alpha1

 import (
+	"reflect"
+
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
@@ -35,5 +37,14 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )

+// EnvBinding type metadata.
+var (
+	EnvBindingKind            = reflect.TypeOf(EnvBinding{}).Name()
+	EnvBindingGroupKind       = schema.GroupKind{Group: Group, Kind: EnvBindingKind}.String()
+	EnvBindingKindAPIVersion  = EnvBindingKind + "." + SchemeGroupVersion.String()
+	EnvBindingKindVersionKind = SchemeGroupVersion.WithKind(EnvBindingKind)
+)
+
 func init() {
+	SchemeBuilder.Register(&EnvBinding{}, &EnvBindingList{})
 }
--- a/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -22,44 +21,121 @@ limitations under the License.
 package v1alpha1

 import (
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )

 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplyOncePolicySpec) DeepCopyInto(out *ApplyOncePolicySpec) {
+func (in *AppTemplate) DeepCopyInto(out *AppTemplate) {
 	*out = *in
+	in.RawExtension.DeepCopyInto(&out.RawExtension)
 }

-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOncePolicySpec.
-func (in *ApplyOncePolicySpec) DeepCopy() *ApplyOncePolicySpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppTemplate.
+func (in *AppTemplate) DeepCopy() *AppTemplate {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplyOncePolicySpec)
+	out := new(AppTemplate)
 	in.DeepCopyInto(out)
 	return out
 }

 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterConnection) DeepCopyInto(out *ClusterConnection) {
+func (in *ClusterDecision) DeepCopyInto(out *ClusterDecision) {
 	*out = *in
 }

-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterConnection.
-func (in *ClusterConnection) DeepCopy() *ClusterConnection {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterDecision.
+func (in *ClusterDecision) DeepCopy() *ClusterDecision {
 	if in == nil {
 		return nil
 	}
-	out := new(ClusterConnection)
+	out := new(ClusterDecision)
 	in.DeepCopyInto(out)
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ConfigMapReference) DeepCopyInto(out *ConfigMapReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigMapReference.
+func (in *ConfigMapReference) DeepCopy() *ConfigMapReference {
+	if in == nil {
+		return nil
+	}
+	out := new(ConfigMapReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvBinding) DeepCopyInto(out *EnvBinding) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBinding.
+func (in *EnvBinding) DeepCopy() *EnvBinding {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvBinding)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *EnvBinding) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvBindingList) DeepCopyInto(out *EnvBindingList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]EnvBinding, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingList.
+func (in *EnvBindingList) DeepCopy() *EnvBindingList {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvBindingList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *EnvBindingList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvBindingSpec) DeepCopyInto(out *EnvBindingSpec) {
 	*out = *in
+	in.AppTemplate.DeepCopyInto(&out.AppTemplate)
 	if in.Envs != nil {
 		in, out := &in.Envs, &out.Envs
 		*out = make([]EnvConfig, len(*in))
@@ -67,6 +143,11 @@ func (in *EnvBindingSpec) DeepCopyInto(out *EnvBindingSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.OutputResourcesTo != nil {
+		in, out := &in.OutputResourcesTo, &out.OutputResourcesTo
+		*out = new(ConfigMapReference)
+		**out = **in
+	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingSpec.
@@ -82,18 +163,17 @@ func (in *EnvBindingSpec) DeepCopy() *EnvBindingSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvBindingStatus) DeepCopyInto(out *EnvBindingStatus) {
 	*out = *in
-	if in.Envs != nil {
-		in, out := &in.Envs, &out.Envs
-		*out = make([]EnvStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ClusterConnections != nil {
-		in, out := &in.ClusterConnections, &out.ClusterConnections
-		*out = make([]ClusterConnection, len(*in))
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.ClusterDecisions != nil {
+		in, out := &in.ClusterDecisions, &out.ClusterDecisions
+		*out = make([]ClusterDecision, len(*in))
 		copy(*out, *in)
 	}
+	if in.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingStatus.
@@ -106,33 +186,6 @@ func (in *EnvBindingStatus) DeepCopy() *EnvBindingStatus {
 	return out
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvComponentPatch) DeepCopyInto(out *EnvComponentPatch) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]EnvTraitPatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvComponentPatch.
-func (in *EnvComponentPatch) DeepCopy() *EnvComponentPatch {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvComponentPatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvConfig) DeepCopyInto(out *EnvConfig) {
 	*out = *in
@@ -160,7 +213,7 @@ func (in *EnvPatch) DeepCopyInto(out *EnvPatch) {
 	*out = *in
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]EnvComponentPatch, len(*in))
+		*out = make([]common.ApplicationComponent, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -222,104 +275,6 @@ func (in *EnvSelector) DeepCopy() *EnvSelector {
 	return out
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvStatus) DeepCopyInto(out *EnvStatus) {
-	*out = *in
-	if in.Placements != nil {
-		in, out := &in.Placements, &out.Placements
-		*out = make([]PlacementDecision, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvStatus.
-func (in *EnvStatus) DeepCopy() *EnvStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvTraitPatch) DeepCopyInto(out *EnvTraitPatch) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvTraitPatch.
-func (in *EnvTraitPatch) DeepCopy() *EnvTraitPatch {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvTraitPatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GarbageCollectPolicyRule) DeepCopyInto(out *GarbageCollectPolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRule.
-func (in *GarbageCollectPolicyRule) DeepCopy() *GarbageCollectPolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(GarbageCollectPolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GarbageCollectPolicyRuleSelector) DeepCopyInto(out *GarbageCollectPolicyRuleSelector) {
-	*out = *in
-	if in.TraitTypes != nil {
-		in, out := &in.TraitTypes, &out.TraitTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRuleSelector.
-func (in *GarbageCollectPolicyRuleSelector) DeepCopy() *GarbageCollectPolicyRuleSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(GarbageCollectPolicyRuleSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GarbageCollectPolicySpec) DeepCopyInto(out *GarbageCollectPolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]GarbageCollectPolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicySpec.
-func (in *GarbageCollectPolicySpec) DeepCopy() *GarbageCollectPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(GarbageCollectPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NamespaceSelector) DeepCopyInto(out *NamespaceSelector) {
 	*out = *in
@@ -341,18 +296,3 @@ func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PlacementDecision) DeepCopyInto(out *PlacementDecision) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementDecision.
-func (in *PlacementDecision) DeepCopy() *PlacementDecision {
-	if in == nil {
-		return nil
-	}
-	out := new(PlacementDecision)
-	in.DeepCopyInto(out)
-	return out
-}
--- a/apis/core.oam.dev/v1alpha2/approllout_types.go
+++ b/apis/core.oam.dev/v1alpha2/approllout_types.go
@@ -0,0 +1,86 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+)
+
+// AppRolloutSpec defines how to describe an upgrade between different apps
+type AppRolloutSpec struct {
+	// TargetAppRevisionName contains the name of the applicationRevision that we need to upgrade to.
+	TargetAppRevisionName string `json:"targetAppRevisionName"`
+
+	// SourceAppRevisionName contains the name of the applicationRevision that we need to upgrade from.
+	// it can be empty only when the rolling is only a scale event
+	SourceAppRevisionName string `json:"sourceAppRevisionName,omitempty"`
+
+	// The list of component to upgrade in the application.
+	// We only support single component application so far
+	// TODO: (RZ) Support multiple components in an application
+	// +optional
+	ComponentList []string `json:"componentList,omitempty"`
+
+	// RolloutPlan is the details on how to rollout the resources
+	RolloutPlan v1alpha1.RolloutPlan `json:"rolloutPlan"`
+
+	// RevertOnDelete revert the rollout when the rollout CR is deleted
+	// It will remove the target app from the kubernetes if it's set to true
+	// +optional
+	RevertOnDelete *bool `json:"revertOnDelete,omitempty"`
+}
+
+// AppRolloutStatus defines the observed state of AppRollout
+type AppRolloutStatus struct {
+	v1alpha1.RolloutStatus `json:",inline"`
+
+	// LastUpgradedTargetAppRevision contains the name of the app that we upgraded to
+	// We will restart the rollout if this is not the same as the spec
+	LastUpgradedTargetAppRevision string `json:"lastTargetAppRevision"`
+
+	// LastSourceAppRevision contains the name of the app that we need to upgrade from.
+	// We will restart the rollout if this is not the same as the spec
+	LastSourceAppRevision string `json:"LastSourceAppRevision,omitempty"`
+}
+
+// AppRollout is the Schema for the AppRollout API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=approllout
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutStatus.rolloutTargetSize`
+// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.rolloutStatus.upgradedReplicas`
+// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.rolloutStatus.upgradedReadyReplicas`
+// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.rolloutStatus.batchRollingState`
+// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rolloutStatus.rollingState`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+type AppRollout struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AppRolloutSpec   `json:"spec,omitempty"`
+	Status AppRolloutStatus `json:"status,omitempty"`
+}
+
+// AppRolloutList contains a list of AppRollout
+// +kubebuilder:object:root=true
+type AppRolloutList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AppRollout `json:"items"`
+}
--- a/apis/core.oam.dev/v1alpha2/conversion.go
+++ b/apis/core.oam.dev/v1alpha2/conversion.go
@@ -64,6 +64,8 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 			Scopes:     scopes,
 		})
 	}
+	// 3.2) convert Spec.RolloutPlan
+	v1b1.Spec.RolloutPlan = v1a2.Spec.RolloutPlan.DeepCopy()

 	// 4) convert Status common.AppStatus
 	v1b1.Status = *v1a2.Status.DeepCopy()
@@ -129,6 +131,8 @@ func (app *Application) ConvertFrom(src conversion.Hub) error {
 				Scopes:       scopes,
 			})
 		}
+		// 3.2) convert Spec.RolloutPlan
+		app.Spec.RolloutPlan = sourceApp.Spec.RolloutPlan.DeepCopy()

 		// 4) convert Status common.AppStatus
 		app.Status = *sourceApp.Status.DeepCopy()
--- a/apis/core.oam.dev/v1alpha2/conversion_test.go
+++ b/apis/core.oam.dev/v1alpha2/conversion_test.go
@@ -1,117 +0,0 @@
-/*
- Copyright 2021 The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	"fmt"
-	"testing"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-)
-
-var app = Application{
-	Spec: ApplicationSpec{
-		Components: []ApplicationComponent{{
-			Name:         "test-component",
-			WorkloadType: "worker",
-			Traits:       []ApplicationTrait{},
-			Scopes:       map[string]string{},
-		}},
-	},
-}
-
-type errType struct {
-}
-
-func (*errType) Hub() {}
-
-func (*errType) DeepCopyObject() runtime.Object {
-	return nil
-}
-
-func (*errType) GetObjectKind() schema.ObjectKind {
-	return nil
-}
-
-func TestApplicationV1alpha2ToV1beta1(t *testing.T) {
-	r := require.New(t)
-	expected := &v1beta1.Application{}
-	ApplicationV1alpha2ToV1beta1(&app, expected)
-
-	r.Equal(expected, &v1beta1.Application{
-		Spec: v1beta1.ApplicationSpec{
-			Components: []common.ApplicationComponent{{
-				Name:       "test-component",
-				Type:       "worker",
-				Properties: &runtime.RawExtension{},
-				Traits:     []common.ApplicationTrait{},
-				Scopes:     map[string]string{},
-			}},
-		},
-	})
-}
-
-func TestConvertTo(t *testing.T) {
-	r := require.New(t)
-	expected := &v1beta1.Application{}
-	err := app.ConvertTo(expected)
-	r.NoError(err)
-	r.Equal(expected, &v1beta1.Application{
-		Spec: v1beta1.ApplicationSpec{
-			Components: []common.ApplicationComponent{{
-				Name:       "test-component",
-				Type:       "worker",
-				Properties: &runtime.RawExtension{},
-				Traits:     []common.ApplicationTrait{},
-				Scopes:     map[string]string{},
-			}},
-		},
-	})
-
-	errCase := &errType{}
-	err = app.ConvertTo(errCase)
-	r.Equal(err, fmt.Errorf("unsupported convertTo object *v1alpha2.errType"))
-}
-
-func TestConvertFrom(t *testing.T) {
-	r := require.New(t)
-	to := &Application{}
-	from := &v1beta1.Application{
-		Spec: v1beta1.ApplicationSpec{
-			Components: []common.ApplicationComponent{{
-				Name:       "test-component",
-				Type:       "worker",
-				Properties: &runtime.RawExtension{},
-				Traits:     []common.ApplicationTrait{},
-				Scopes:     map[string]string{},
-			}},
-		},
-	}
-	err := to.ConvertFrom(from)
-	r.NoError(err)
-	r.Equal(to.Spec, app.Spec)
-
-	errCase := &errType{}
-	err = app.ConvertFrom(errCase)
-	r.Equal(err, fmt.Errorf("unsupported ConvertFrom object *v1alpha2.errType"))
-}
--- a/apis/core.oam.dev/v1alpha2/core_workload_types.go
+++ b/apis/core.oam.dev/v1alpha2/core_workload_types.go
@@ -19,8 +19,14 @@ limitations under the License.
 package v1alpha2

 import (
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
 )

 // An OperatingSystem required by a containerised workload.
@@ -353,3 +359,53 @@ type Container struct {
 	// +optional
 	ImagePullSecret *string `json:"imagePullSecret,omitempty"`
 }
+
+// A ContainerizedWorkloadSpec defines the desired state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadSpec struct {
+	// OperatingSystem required by this workload.
+	// +kubebuilder:validation:Enum=linux;windows
+	// +optional
+	OperatingSystem *OperatingSystem `json:"osType,omitempty"`
+
+	// CPUArchitecture required by this workload.
+	// +kubebuilder:validation:Enum=i386;amd64;arm;arm64
+	// +optional
+	CPUArchitecture *CPUArchitecture `json:"arch,omitempty"`
+
+	// Containers of which this workload consists.
+	Containers []Container `json:"containers"`
+}
+
+// A ContainerizedWorkloadStatus represents the observed state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadStatus struct {
+	condition.ConditionedStatus `json:",inline"`
+
+	// Resources managed by this containerised workload.
+	Resources []corev1.ObjectReference `json:"resources,omitempty"`
+}
+
+var _ oam.Workload = &ContainerizedWorkload{}
+
+// +kubebuilder:object:root=true
+
+// A ContainerizedWorkload is a workload that runs OCI containers.
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type ContainerizedWorkload struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ContainerizedWorkloadSpec   `json:"spec,omitempty"`
+	Status ContainerizedWorkloadStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ContainerizedWorkloadList contains a list of ContainerizedWorkload.
+type ContainerizedWorkloadList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ContainerizedWorkload `json:"items"`
+}
--- a/apis/core.oam.dev/v1alpha2/methods.go
+++ b/apis/core.oam.dev/v1alpha2/methods.go
@@ -64,6 +64,16 @@ func (cm *Component) SetConditions(c ...condition.Condition) {
 	cm.Status.SetConditions(c...)
 }

+// GetCondition of this ContainerizedWorkload.
+func (wl *ContainerizedWorkload) GetCondition(ct condition.ConditionType) condition.Condition {
+	return wl.Status.GetCondition(ct)
+}
+
+// SetConditions of this ContainerizedWorkload.
+func (wl *ContainerizedWorkload) SetConditions(c ...condition.Condition) {
+	wl.Status.SetConditions(c...)
+}
+
 // GetCondition of this HealthScope.
 func (hs *HealthScope) GetCondition(ct condition.ConditionType) condition.Condition {
 	return hs.Status.GetCondition(ct)
--- a/apis/core.oam.dev/v1alpha2/register.go
+++ b/apis/core.oam.dev/v1alpha2/register.go
@@ -85,6 +85,14 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )

+// ContainerizedWorkload type metadata.
+var (
+	ContainerizedWorkloadKind             = reflect.TypeOf(ContainerizedWorkload{}).Name()
+	ContainerizedWorkloadGroupKind        = schema.GroupKind{Group: Group, Kind: ContainerizedWorkloadKind}.String()
+	ContainerizedWorkloadKindAPIVersion   = ContainerizedWorkloadKind + "." + SchemeGroupVersion.String()
+	ContainerizedWorkloadGroupVersionKind = SchemeGroupVersion.WithKind(ContainerizedWorkloadKind)
+)
+
 // ManualScalerTrait type metadata.
 var (
 	ManualScalerTraitKind             = reflect.TypeOf(ManualScalerTrait{}).Name()
@@ -109,6 +117,14 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )

+// AppRollout type metadata.
+var (
+	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
+	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
+	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
+)
+
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -124,8 +140,10 @@ func init() {
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Component{}, &ComponentList{})
 	SchemeBuilder.Register(&ApplicationConfiguration{}, &ApplicationConfigurationList{})
+	SchemeBuilder.Register(&ContainerizedWorkload{}, &ContainerizedWorkloadList{})
 	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
+	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
 }
--- a/apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -77,6 +76,107 @@ func (in *AppReference) DeepCopy() *AppReference {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRollout) DeepCopyInto(out *AppRollout) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
+func (in *AppRollout) DeepCopy() *AppRollout {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRollout)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRollout) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]AppRollout, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
+func (in *AppRolloutList) DeepCopy() *AppRolloutList {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRolloutList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
+	*out = *in
+	if in.ComponentList != nil {
+		in, out := &in.ComponentList, &out.ComponentList
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
+	if in.RevertOnDelete != nil {
+		in, out := &in.RevertOnDelete, &out.RevertOnDelete
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
+func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
+	*out = *in
+	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
+func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
@@ -1113,6 +1213,118 @@ func (in *ContainerResources) DeepCopy() *ContainerResources {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkload) DeepCopyInto(out *ContainerizedWorkload) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkload.
+func (in *ContainerizedWorkload) DeepCopy() *ContainerizedWorkload {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkload)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkload) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadList) DeepCopyInto(out *ContainerizedWorkloadList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ContainerizedWorkload, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadList.
+func (in *ContainerizedWorkloadList) DeepCopy() *ContainerizedWorkloadList {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkloadList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadSpec) DeepCopyInto(out *ContainerizedWorkloadSpec) {
+	*out = *in
+	if in.OperatingSystem != nil {
+		in, out := &in.OperatingSystem, &out.OperatingSystem
+		*out = new(OperatingSystem)
+		**out = **in
+	}
+	if in.CPUArchitecture != nil {
+		in, out := &in.CPUArchitecture, &out.CPUArchitecture
+		*out = new(CPUArchitecture)
+		**out = **in
+	}
+	if in.Containers != nil {
+		in, out := &in.Containers, &out.Containers
+		*out = make([]Container, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadSpec.
+func (in *ContainerizedWorkloadSpec) DeepCopy() *ContainerizedWorkloadSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadStatus) DeepCopyInto(out *ContainerizedWorkloadStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Resources != nil {
+		in, out := &in.Resources, &out.Resources
+		*out = make([]v1.ObjectReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadStatus.
+func (in *ContainerizedWorkloadStatus) DeepCopy() *ContainerizedWorkloadStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataInput) DeepCopyInto(out *DataInput) {
 	*out = *in
--- a/apis/core.oam.dev/v1beta1/appdeployment_types.go
+++ b/apis/core.oam.dev/v1beta1/appdeployment_types.go
@@ -0,0 +1,176 @@
+/*
+ Copyright 2021. The KubeVela Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+)
+
+// AppDeploymentPhase defines the phase that the AppDeployment is undergoing.
+type AppDeploymentPhase string
+
+const (
+	// PhaseRolling is the phase when the AppDeployment is rolling live instances from old revisions to new ones.
+	PhaseRolling AppDeploymentPhase = "Rolling"
+
+	// PhaseCompleted is the phase when the AppDeployment is done with reconciliation.
+	PhaseCompleted AppDeploymentPhase = "Completed"
+
+	// PhaseFailed is the phase when the AppDeployment has failed in reconciliation due to unexpected conditions.
+	PhaseFailed AppDeploymentPhase = "Failed"
+)
+
+// HTTPMatchRequest specifies a set of criterion to be met in order for the
+// rule to be applied to the HTTP request. For example, the following
+// restricts the rule to match only requests where the URL path
+// starts with /ratings/v2/ and the request contains a custom `end-user` header
+// with value `jason`.
+type HTTPMatchRequest struct {
+	// URI defines how to match with an URI.
+	URI *URIMatch `json:"uri,omitempty"`
+}
+
+// URIMatch defines the rules to match with an URI.
+type URIMatch struct {
+	Prefix string `json:"prefix,omitempty"`
+}
+
+// HTTPRule defines the rules to match and split http traffic across revisions.
+type HTTPRule struct {
+
+	// Match defines the conditions to be satisfied for the rule to be
+	// activated. All conditions inside a single match block have AND
+	// semantics, while the list of match blocks have OR semantics. The rule
+	// is matched if any one of the match blocks succeed.
+	Match []*HTTPMatchRequest `json:"match,omitempty"`
+
+	// WeightedTargets defines the revision targets to select and route traffic to.
+	WeightedTargets []WeightedTarget `json:"weightedTargets,omitempty"`
+}
+
+// WeightedTarget defines the revision target to select and route traffic to.
+type WeightedTarget struct {
+
+	// RevisionName is the name of the app revision.
+	RevisionName string `json:"revisionName,omitempty"`
+
+	// ComponentName is the name of the component.
+	// Note that it is the original component name in the Application. No need to append revision.
+	ComponentName string `json:"componentName,omitempty"`
+
+	// Port is the port to route traffic towards.
+	Port int `json:"port,omitempty"`
+
+	// Weight defines the proportion of traffic to be forwarded to the service
+	// version. (0-100). Sum of weights across destinations SHOULD BE == 100.
+	// If there is only one destination in a rule, the weight value is assumed to
+	// be 100.
+	Weight int `json:"weight,omitempty"`
+}
+
+// Traffic defines the traffic rules to apply across revisions.
+type Traffic struct {
+	// Hosts are the destination hosts to which traffic is being sent. Could
+	// be a DNS name with wildcard prefix or an IP address.
+	Hosts []string `json:"hosts,omitempty"`
+
+	// Gateways specifies the names of gateways that should apply these rules.
+	// Gateways in other namespaces may be referred to by
+	// `<gateway namespace>/<gateway name>`; specifying a gateway with no
+	// namespace qualifier is the same as specifying the AppDeployment's namespace.
+	Gateways []string `json:"gateways,omitempty"`
+
+	// HTTP defines the rules to match and split http traffoc across revisions.
+	HTTP []HTTPRule `json:"http,omitempty"`
+}
+
+// AppRevision specifies an AppRevision resource to and the rules to apply to it.
+type AppRevision struct {
+	// RevisionName is the name of the AppRevision.
+	RevisionName string `json:"revisionName,omitempty"`
+
+	// Placement defines the cluster placement rules for an app revision.
+	Placement []common.ClusterPlacement `json:"placement,omitempty"`
+}
+
+// ClusterPlacementStatus shows the placement results of a cluster.
+type ClusterPlacementStatus struct {
+	// ClusterName indicates the name of the cluster to deploy apps to.
+	// If empty, it indicates the host cluster per se.
+	ClusterName string `json:"clusterName,omitempty"`
+
+	// Replicas indicates the replica number of an app revision to deploy to a cluster.
+	Replicas int `json:"replicas,omitempty"`
+}
+
+// PlacementStatus shows the cluster placement results of an app revision.
+type PlacementStatus struct {
+	// RevisionName is the name of the AppRevision.
+	RevisionName string `json:"revisionName,omitempty"`
+
+	// Clusters shows cluster placement results.
+	Clusters []ClusterPlacementStatus `json:"clusters,omitempty"`
+}
+
+// AppDeploymentSpec defines how to describe an upgrade between different apps
+type AppDeploymentSpec struct {
+
+	// Traffic defines the traffic rules to apply across revisions.
+	Traffic *Traffic `json:"traffic,omitempty"`
+
+	// AppRevision specifies  AppRevision resources to and the rules to apply to them.
+	AppRevisions []AppRevision `json:"appRevisions,omitempty"`
+}
+
+// AppDeploymentStatus defines the observed state of AppDeployment
+type AppDeploymentStatus struct {
+	// Conditions represents the latest available observations of a CloneSet's current state.
+	condition.ConditionedStatus `json:",inline"`
+
+	// Phase shows the phase that the AppDeployment is undergoing.
+	// If Phase is Rolling, no update should be made to the spec.
+	Phase AppDeploymentPhase `json:"phase,omitempty"`
+
+	// Placement shows the cluster placement results of the app revisions.
+	Placement []PlacementStatus `json:"placement,omitempty"`
+}
+
+// AppDeployment is the Schema for the AppDeployment API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=appdeploy
+// +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type AppDeployment struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AppDeploymentSpec   `json:"spec,omitempty"`
+	Status AppDeploymentStatus `json:"status,omitempty"`
+}
+
+// AppDeploymentList contains a list of AppDeployment
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type AppDeploymentList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AppDeployment `json:"items"`
+}
--- a/apis/core.oam.dev/v1beta1/application_types.go
+++ b/apis/core.oam.dev/v1beta1/application_types.go
@@ -17,14 +17,12 @@
 package v1beta1

 import (
-	"encoding/json"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )

 const (
@@ -88,6 +86,11 @@ type ApplicationSpec struct {
 	Workflow *Workflow `json:"workflow,omitempty"`

 	// TODO(wonderflow): we should have application level scopes supported here
+
+	// RolloutPlan is the details on how to rollout the resources
+	// The controller simply replace the old resources with the new one if there is no rollout plan involved
+	// +optional
+	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
 }

 // +kubebuilder:object:root=true
@@ -141,36 +144,3 @@ func (app *Application) GetComponent(workloadType string) *common.ApplicationCom
 	}
 	return nil
 }
-
-// Unstructured convert application to unstructured.Unstructured.
-func (app *Application) Unstructured() (*unstructured.Unstructured, error) {
-	var obj = &unstructured.Unstructured{}
-	app.SetGroupVersionKind(ApplicationKindVersionKind)
-	bt, err := json.Marshal(app)
-	if err != nil {
-		return nil, err
-	}
-	if err := obj.UnmarshalJSON(bt); err != nil {
-		return nil, err
-	}
-
-	if app.Status.Services == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "services"); err != nil {
-			return nil, err
-		}
-	}
-
-	if app.Status.AppliedResources == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "appliedResources"); err != nil {
-			return nil, err
-		}
-	}
-
-	if wfStatus := app.Status.Workflow; wfStatus != nil && wfStatus.Steps == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "workflow", "steps"); err != nil {
-			return nil, err
-		}
-	}
-
-	return obj, nil
-}
--- a/apis/core.oam.dev/v1beta1/approllout_types.go
+++ b/apis/core.oam.dev/v1beta1/approllout_types.go
@@ -0,0 +1,81 @@
+/*
+ Copyright 2021. The KubeVela Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+)
+
+// AppRolloutSpec defines how to describe an upgrade between different apps
+type AppRolloutSpec struct {
+	// TargetAppRevisionName contains the name of the applicationConfiguration that we need to upgrade to.
+	// Here we use an applicationConfiguration as a revision of an application, thus the name alone is suffice
+	TargetAppRevisionName string `json:"targetAppRevisionName"`
+
+	// SourceAppRevisionName contains the name of the applicationConfiguration that we need to upgrade from.
+	// it can be empty only when it's the first time to deploy the application
+	SourceAppRevisionName string `json:"sourceAppRevisionName,omitempty"`
+
+	// The list of component to upgrade in the application.
+	// We only support single component application so far
+	// TODO: (RZ) Support multiple components in an application
+	// +optional
+	ComponentList []string `json:"componentList,omitempty"`
+
+	// RolloutPlan is the details on how to rollout the resources
+	RolloutPlan v1alpha1.RolloutPlan `json:"rolloutPlan"`
+
+	// RevertOnDelete revert the failed rollout when the rollout CR is deleted
+	// It will revert the change back to the source version at once (not in batches)
+	// Default is false
+	// +optional
+	RevertOnDelete bool `json:"revertOnDelete,omitempty"`
+}
+
+// AppRollout is the Schema for the AppRollout API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=approllout
+// +kubebuilder:subresource:status
+// +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutTargetSize`
+// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.upgradedReplicas`
+// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.upgradedReadyReplicas`
+// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState`
+// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type AppRollout struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AppRolloutSpec          `json:"spec,omitempty"`
+	Status common.AppRolloutStatus `json:"status,omitempty"`
+}
+
+// AppRolloutList contains a list of AppRollout
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type AppRolloutList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AppRollout `json:"items"`
+}
--- a/apis/core.oam.dev/v1beta1/cluster_types.go
+++ b/apis/core.oam.dev/v1beta1/cluster_types.go
@@ -0,0 +1,64 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// ClusterSpec defines the desired state of Cluster
+type ClusterSpec struct {
+	// KubeconfigSecretRef specifies the reference to the secret
+	// that contains the kubeconfig in field `config`.
+	KubeconfigSecretRef LocalSecretReference `json:"kubeconfigSecretRef,omitempty"`
+}
+
+// LocalSecretReference is a reference to a secret within the enclosing
+// namespace.
+type LocalSecretReference struct {
+	// Name of a secret within the enclosing namespace.
+	Name string `json:"name"`
+}
+
+// ClusterStatus defines the observed state of Cluster
+type ClusterStatus struct {
+}
+
+// +kubebuilder:object:root=true
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Cluster is the Schema for the clusters API
+type Cluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClusterSpec   `json:"spec,omitempty"`
+	Status ClusterStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ClusterList contains a list of Cluster
+type ClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Cluster `json:"items"`
+}
--- a/apis/core.oam.dev/v1beta1/core_types.go
+++ b/apis/core.oam.dev/v1beta1/core_types.go
@@ -17,6 +17,7 @@
 package v1beta1

 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

@@ -256,3 +257,32 @@ type ScopeDefinitionList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ScopeDefinition `json:"items"`
 }
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// An ResourceTracker represents a tracker for track cross namespace resources
+// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
+type ResourceTracker struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Status ResourceTrackerStatus `json:"status,omitempty"`
+}
+
+// ResourceTrackerStatus define the status of resourceTracker
+type ResourceTrackerStatus struct {
+	TrackedResources []corev1.ObjectReference `json:"trackedResources,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ResourceTrackerList contains a list of ResourceTracker
+type ResourceTrackerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ResourceTracker `json:"items"`
+}
--- a/apis/core.oam.dev/v1beta1/initializer_type.go
+++ b/apis/core.oam.dev/v1beta1/initializer_type.go
@@ -0,0 +1,100 @@
+/*
+ Copyright 2021. The KubeVela Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+)
+
+// InitializerPhase is a label for the condition of a initializer at the current time
+type InitializerPhase string
+
+const (
+	// InitializerCheckingDependsOn means the initializer is checking the status of dependent Initializer
+	InitializerCheckingDependsOn InitializerPhase = "checkingDependsOn"
+	// InitializerInitializing means the initializer is initializing
+	InitializerInitializing InitializerPhase = "initializing"
+	// InitializerSuccess means the initializer successfully initialized the environment
+	InitializerSuccess InitializerPhase = "success"
+)
+
+// DependsOn refer to an object which Initializer depends on
+type DependsOn struct {
+	Ref corev1.ObjectReference `json:"ref"`
+}
+
+// A InitializerSpec defines the desired state of a Initializer.
+type InitializerSpec struct {
+	// AppTemplate indicates the application template to render and deploy an system application.
+	AppTemplate Application `json:"appTemplate"`
+
+	// DependsOn indicates the other initializers that this depends on.
+	// It will not apply its components until all dependencies exist.
+	DependsOn []DependsOn `json:"dependsOn,omitempty"`
+}
+
+// InitializerStatus is the status of Initializer
+type InitializerStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	condition.ConditionedStatus `json:",inline"`
+
+	Phase InitializerPhase `json:"status,omitempty"`
+
+	// The generation observed by the Initializer controller.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration"`
+}
+
+// +kubebuilder:object:root=true
+
+// Initializer is the Schema for the Initializer API
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=init
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Initializer struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   InitializerSpec   `json:"spec,omitempty"`
+	Status InitializerStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// InitializerList contains a list of Initializer.
+type InitializerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Initializer `json:"items"`
+}
+
+// SetConditions set condition for Initializer
+func (i *Initializer) SetConditions(c ...condition.Condition) {
+	i.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from Initializer
+func (i *Initializer) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return i.Status.GetCondition(conditionType)
+}
--- a/apis/core.oam.dev/v1beta1/register.go
+++ b/apis/core.oam.dev/v1beta1/register.go
@@ -96,6 +96,14 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )

+// AppRollout type metadata.
+var (
+	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
+	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
+	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
+)
+
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -120,6 +128,30 @@ var (
 	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
 )

+// AppDeployment type metadata.
+var (
+	AppDeploymentKind            = reflect.TypeOf(AppDeployment{}).Name()
+	AppDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: AppDeploymentKind}.String()
+	AppDeploymentKindAPIVersion  = AppDeploymentKind + "." + SchemeGroupVersion.String()
+	AppDeploymentKindVersionKind = SchemeGroupVersion.WithKind(AppDeploymentKind)
+)
+
+// Cluster type metadata.
+var (
+	ClusterKind            = reflect.TypeOf(Cluster{}).Name()
+	ClusterGroupKind       = schema.GroupKind{Group: Group, Kind: ClusterKind}.String()
+	ClusterKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	ClusterKindVersionKind = SchemeGroupVersion.WithKind(ClusterKind)
+)
+
+// Initializer type metadata.
+var (
+	InitializerKind            = reflect.TypeOf(Initializer{}).Name()
+	InitializerGroupKind       = schema.GroupKind{Group: Group, Kind: InitializerKind}.String()
+	InitializerKindAPIVersion  = InitializerKind + "." + SchemeGroupVersion.String()
+	InitializerKindVersionKind = SchemeGroupVersion.WithKind(InitializerKind)
+)
+
 func init() {
 	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
@@ -129,8 +161,12 @@ func init() {
 	SchemeBuilder.Register(&DefinitionRevision{}, &DefinitionRevisionList{})
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
+	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
+	SchemeBuilder.Register(&AppDeployment{}, &AppDeploymentList{})
+	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
+	SchemeBuilder.Register(&Initializer{}, &InitializerList{})
 }

 // Resource takes an unqualified resource and returns a Group qualified GroupResource
--- a/apis/core.oam.dev/v1beta1/resourcetracker_types.go
+++ b/apis/core.oam.dev/v1beta1/resourcetracker_types.go
@@ -1,278 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"encoding/json"
-	"reflect"
-	"strings"
-
-	errors2 "github.com/pkg/errors"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/interfaces"
-	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/errors"
-)
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.type`
-// +kubebuilder:printcolumn:name="APP",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/name']`
-// +kubebuilder:printcolumn:name="APP-NS",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/namespace']`
-// +kubebuilder:printcolumn:name="APP-GEN",type=number,JSONPath=`.spec.applicationGeneration`
-// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=rt
-type ResourceTracker struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ResourceTrackerSpec   `json:"spec,omitempty"`
-	Status ResourceTrackerStatus `json:"status,omitempty"`
-}
-
-// ResourceTrackerType defines the type of resourceTracker
-type ResourceTrackerType string
-
-const (
-	// ResourceTrackerTypeRoot means resources in this resourceTracker will only be recycled when application is deleted
-	ResourceTrackerTypeRoot = ResourceTrackerType("root")
-	// ResourceTrackerTypeVersioned means resources in this resourceTracker will be recycled when this version is unused and this resource is not managed by latest RT
-	ResourceTrackerTypeVersioned = ResourceTrackerType("versioned")
-	// ResourceTrackerTypeComponentRevision stores all component revisions used
-	ResourceTrackerTypeComponentRevision = ResourceTrackerType("component-revision")
-)
-
-// ResourceTrackerSpec define the spec of resourceTracker
-type ResourceTrackerSpec struct {
-	Type                  ResourceTrackerType `json:"type,omitempty"`
-	ApplicationGeneration int64               `json:"applicationGeneration"`
-	ManagedResources      []ManagedResource   `json:"managedResources,omitempty"`
-}
-
-// ManagedResource define the resource to be managed by ResourceTracker
-type ManagedResource struct {
-	common.ClusterObjectReference `json:",inline"`
-	common.OAMObjectReference     `json:",inline"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Data *runtime.RawExtension `json:"raw,omitempty"`
-	// Deleted marks the resource to be deleted
-	Deleted bool `json:"deleted,omitempty"`
-}
-
-// Equal check if two managed resource equals
-func (in ManagedResource) Equal(r ManagedResource) bool {
-	if !in.ClusterObjectReference.Equal(r.ClusterObjectReference) {
-		return false
-	}
-	if !in.OAMObjectReference.Equal(r.OAMObjectReference) {
-		return false
-	}
-	return reflect.DeepEqual(in.Data, r.Data)
-}
-
-// DisplayName readable name for locating resource
-func (in ManagedResource) DisplayName() string {
-	s := in.Kind + " " + in.Name
-	if in.Namespace != "" || in.Cluster != "" {
-		s += " ("
-		if in.Cluster != "" {
-			s += "Cluster: " + in.Cluster
-			if in.Namespace != "" {
-				s += ", "
-			}
-		}
-		if in.Namespace != "" {
-			s += "Namespace: " + in.Namespace
-		}
-		s += ")"
-	}
-	return s
-}
-
-// NamespacedName namespacedName
-func (in ManagedResource) NamespacedName() types.NamespacedName {
-	return types.NamespacedName{Namespace: in.Namespace, Name: in.Name}
-}
-
-// ResourceKey computes the key for managed resource, resources with the same key points to the same resource
-func (in ManagedResource) ResourceKey() string {
-	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
-	return strings.Join([]string{gv, kind, in.Cluster, in.Namespace, in.Name}, "/")
-}
-
-// ComponentKey computes the key for the component which managed resource belongs to
-func (in ManagedResource) ComponentKey() string {
-	return strings.Join([]string{in.Env, in.Component}, "/")
-}
-
-// UnmarshalTo unmarshal ManagedResource into target object
-func (in ManagedResource) UnmarshalTo(obj interface{}) error {
-	if in.Data == nil || in.Data.Raw == nil {
-		return errors.ManagedResourceHasNoDataError{}
-	}
-	return json.Unmarshal(in.Data.Raw, obj)
-}
-
-// ToUnstructured converts managed resource into unstructured
-func (in ManagedResource) ToUnstructured() *unstructured.Unstructured {
-	obj := &unstructured.Unstructured{}
-	obj.SetGroupVersionKind(in.GroupVersionKind())
-	obj.SetName(in.Name)
-	if in.Namespace != "" {
-		obj.SetNamespace(in.Namespace)
-	}
-	oam.SetCluster(obj, in.Cluster)
-	return obj
-}
-
-// ToUnstructuredWithData converts managed resource into unstructured and unmarshal data
-func (in ManagedResource) ToUnstructuredWithData() (*unstructured.Unstructured, error) {
-	obj := in.ToUnstructured()
-	if err := in.UnmarshalTo(obj); err != nil {
-		if errors2.Is(err, errors.ManagedResourceHasNoDataError{}) {
-			return nil, err
-		}
-	}
-	return obj, nil
-}
-
-// ResourceTrackerStatus define the status of resourceTracker
-// For backward-compatibility
-type ResourceTrackerStatus struct {
-	// Deprecated
-	TrackedResources []common.ClusterObjectReference `json:"trackedResources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ResourceTrackerList contains a list of ResourceTracker
-type ResourceTrackerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ResourceTracker `json:"items"`
-}
-
-func (in *ResourceTracker) findMangedResourceIndex(mr ManagedResource) int {
-	for i, _mr := range in.Spec.ManagedResources {
-		if mr.ClusterObjectReference.Equal(_mr.ClusterObjectReference) {
-			return i
-		}
-	}
-	return -1
-}
-
-// AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) (updated bool) {
-	gvk := rsc.GetObjectKind().GroupVersionKind()
-	mr := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
-				APIVersion: gvk.GroupVersion().String(),
-				Kind:       gvk.Kind,
-				Name:       rsc.GetName(),
-				Namespace:  rsc.GetNamespace(),
-			},
-			Cluster: oam.GetCluster(rsc),
-		},
-		OAMObjectReference: common.NewOAMObjectReferenceFromObject(rsc),
-		Deleted:            false,
-	}
-	if !metaOnly {
-		mr.Data = &runtime.RawExtension{Object: rsc}
-	}
-	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
-		if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
-			return false
-		}
-		in.Spec.ManagedResources[idx] = mr
-	} else {
-		in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
-	}
-	return true
-}
-
-// DeleteManagedResource if remove flag is on, it will remove the object from recorded resources.
-// otherwise, it will mark the object as deleted instead of removing it
-// workflow   stage: resources are marked as deleted (and execute the deletion action)
-// state-keep stage: resources marked as deleted and successfully deleted will be removed from resourcetracker
-func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool) (updated bool) {
-	gvk := rsc.GetObjectKind().GroupVersionKind()
-	mr := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
-				APIVersion: gvk.GroupVersion().String(),
-				Kind:       gvk.Kind,
-				Name:       rsc.GetName(),
-				Namespace:  rsc.GetNamespace(),
-			},
-			Cluster: oam.GetCluster(rsc),
-		},
-		Deleted: true,
-	}
-	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
-		if remove {
-			in.Spec.ManagedResources = append(in.Spec.ManagedResources[:idx], in.Spec.ManagedResources[idx+1:]...)
-		} else {
-			if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
-				return false
-			}
-			in.Spec.ManagedResources[idx] = mr
-		}
-	} else {
-		if !remove {
-			in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
-		}
-	}
-	return true
-}
-
-// addClusterObjectReference
-// Deprecated
-func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectReference) bool {
-	for _, _rsc := range in.Status.TrackedResources {
-		if _rsc.Equal(ref) {
-			return true
-		}
-	}
-	in.Status.TrackedResources = append(in.Status.TrackedResources, ref)
-	return false
-}
-
-// AddTrackedResource add new object reference into tracked resources, return if already exists
-// Deprecated
-func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
-	return in.addClusterObjectReference(common.ClusterObjectReference{
-		ObjectReference: v1.ObjectReference{
-			APIVersion: rsc.GetAPIVersion(),
-			Kind:       rsc.GetKind(),
-			Name:       rsc.GetName(),
-			Namespace:  rsc.GetNamespace(),
-			UID:        rsc.GetUID(),
-		},
-	})
-}
--- a/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go
+++ b/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go
@@ -1,184 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	v12 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/pointer"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/errors"
-)
-
-func TestManagedResource_DeepCopyEqual(t *testing.T) {
-	r := require.New(t)
-	mr := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-		OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-		Data:                   &runtime.RawExtension{Raw: []byte("data")},
-	}
-	r.True(mr.Equal(*mr.DeepCopy()))
-}
-
-func TestManagedResource_Equal(t *testing.T) {
-	testCases := map[string]struct {
-		input1 ManagedResource
-		input2 ManagedResource
-		equal  bool
-	}{
-		"equal": {
-			input1: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-				Data:                   &runtime.RawExtension{Raw: []byte("data")},
-			},
-			input2: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-				Data:                   &runtime.RawExtension{Raw: []byte("data")},
-			},
-			equal: true,
-		},
-		"ClusterObjectReference not equal": {
-			input1: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-			},
-			input2: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "c"},
-			},
-			equal: false,
-		},
-		"OAMObjectReference not equal": {
-			input1: ManagedResource{
-				OAMObjectReference: common.OAMObjectReference{Component: "component"},
-			},
-			input2: ManagedResource{
-				OAMObjectReference: common.OAMObjectReference{Component: "c"},
-			},
-			equal: false,
-		},
-		"Data content not equal": {
-			input1: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("data")},
-			},
-			input2: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("d")},
-			},
-			equal: false,
-		},
-		"one data empty, one data not empty": {
-			input1: ManagedResource{Data: nil},
-			input2: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("d")},
-			},
-			equal: false,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			r.Equal(tc.equal, tc.input1.Equal(tc.input2))
-			r.Equal(tc.equal, tc.input2.Equal(tc.input1))
-		})
-	}
-}
-
-func TestManagedResourceKeys(t *testing.T) {
-	r := require.New(t)
-	input := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			Cluster: "cluster",
-			ObjectReference: v1.ObjectReference{
-				Namespace:  "namespace",
-				Name:       "name",
-				APIVersion: v12.SchemeGroupVersion.String(),
-				Kind:       "Deployment",
-			},
-		},
-		OAMObjectReference: common.OAMObjectReference{
-			Env:       "env",
-			Component: "component",
-			Trait:     "trait",
-		},
-	}
-	r.Equal("namespace/name", input.NamespacedName().String())
-	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
-	deploy1.Spec.Replicas = pointer.Int32(5)
-	bs, err := json.Marshal(deploy1)
-	r.NoError(err)
-	r.ErrorIs(input.UnmarshalTo(&deploy2), errors.ManagedResourceHasNoDataError{})
-	_, err = input.ToUnstructuredWithData()
-	r.ErrorIs(err, errors.ManagedResourceHasNoDataError{})
-	input.Data = &runtime.RawExtension{Raw: bs}
-	r.NoError(input.UnmarshalTo(&deploy2))
-	r.Equal(deploy1, deploy2)
-	obj := input.ToUnstructured()
-	r.Equal("Deployment", obj.GetKind())
-	r.Equal("apps/v1", obj.GetAPIVersion())
-	r.Equal("name", obj.GetName())
-	r.Equal("namespace", obj.GetNamespace())
-	r.Equal("cluster", oam.GetCluster(obj))
-	obj, err = input.ToUnstructuredWithData()
-	r.NoError(err)
-	val, correct, err := unstructured.NestedInt64(obj.Object, "spec", "replicas")
-	r.NoError(err)
-	r.True(correct)
-	r.Equal(int64(5), val)
-}
-
-func TestResourceTracker_ManagedResource(t *testing.T) {
-	r := require.New(t)
-	input := &ResourceTracker{}
-	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true)
-	r.Equal(1, len(input.Spec.ManagedResources))
-	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false)
-	r.Equal(2, len(input.Spec.ManagedResources))
-	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false)
-	r.Equal(3, len(input.Spec.ManagedResources))
-	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false)
-	r.Equal(3, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&cm2, false)
-	r.Equal(3, len(input.Spec.ManagedResources))
-	r.True(input.Spec.ManagedResources[1].Deleted)
-	input.DeleteManagedResource(&cm2, true)
-	r.Equal(2, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&deploy1, true)
-	r.Equal(1, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&pod3, true)
-	r.Equal(0, len(input.Spec.ManagedResources))
-	secret4 := v1.Secret{ObjectMeta: v13.ObjectMeta{Name: "secret4"}}
-	input.DeleteManagedResource(&secret4, true)
-	r.Equal(0, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&secret4, false)
-	r.Equal(1, len(input.Spec.ManagedResources))
-}
--- a/apis/core.oam.dev/v1beta1/workflow_step_definition.go
+++ b/apis/core.oam.dev/v1beta1/workflow_step_definition.go
@@ -38,8 +38,7 @@ type WorkflowStepDefinitionSpec struct {
 type WorkflowStepDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
 	condition.ConditionedStatus `json:",inline"`
-	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
-	ConfigMapRef string `json:"configMapRef,omitempty"`
+
 	// LatestRevision of the component definition
 	// +optional
 	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
--- a/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -22,12 +21,123 @@ limitations under the License.
 package v1beta1

 import (
+	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppDeployment) DeepCopyInto(out *AppDeployment) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeployment.
+func (in *AppDeployment) DeepCopy() *AppDeployment {
+	if in == nil {
+		return nil
+	}
+	out := new(AppDeployment)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppDeployment) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppDeploymentList) DeepCopyInto(out *AppDeploymentList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]AppDeployment, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentList.
+func (in *AppDeploymentList) DeepCopy() *AppDeploymentList {
+	if in == nil {
+		return nil
+	}
+	out := new(AppDeploymentList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppDeploymentList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppDeploymentSpec) DeepCopyInto(out *AppDeploymentSpec) {
+	*out = *in
+	if in.Traffic != nil {
+		in, out := &in.Traffic, &out.Traffic
+		*out = new(Traffic)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.AppRevisions != nil {
+		in, out := &in.AppRevisions, &out.AppRevisions
+		*out = make([]AppRevision, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentSpec.
+func (in *AppDeploymentSpec) DeepCopy() *AppDeploymentSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(AppDeploymentSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppDeploymentStatus) DeepCopyInto(out *AppDeploymentStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Placement != nil {
+		in, out := &in.Placement, &out.Placement
+		*out = make([]PlacementStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentStatus.
+func (in *AppDeploymentStatus) DeepCopy() *AppDeploymentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(AppDeploymentStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppPolicy) DeepCopyInto(out *AppPolicy) {
 	*out = *in
@@ -48,6 +158,108 @@ func (in *AppPolicy) DeepCopy() *AppPolicy {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRevision) DeepCopyInto(out *AppRevision) {
+	*out = *in
+	if in.Placement != nil {
+		in, out := &in.Placement, &out.Placement
+		*out = make([]common.ClusterPlacement, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevision.
+func (in *AppRevision) DeepCopy() *AppRevision {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRevision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRollout) DeepCopyInto(out *AppRollout) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
+func (in *AppRollout) DeepCopy() *AppRollout {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRollout)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRollout) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]AppRollout, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
+func (in *AppRolloutList) DeepCopy() *AppRolloutList {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRolloutList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
+	*out = *in
+	if in.ComponentList != nil {
+		in, out := &in.ComponentList, &out.ComponentList
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
+func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Application) DeepCopyInto(out *Application) {
 	*out = *in
@@ -261,6 +473,11 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 		*out = new(Workflow)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.RolloutPlan != nil {
+		in, out := &in.RolloutPlan, &out.RolloutPlan
+		*out = new(v1alpha1.RolloutPlan)
+		(*in).DeepCopyInto(*out)
+	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.
@@ -273,6 +490,111 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Cluster) DeepCopyInto(out *Cluster) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	out.Status = in.Status
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
+func (in *Cluster) DeepCopy() *Cluster {
+	if in == nil {
+		return nil
+	}
+	out := new(Cluster)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Cluster) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterList) DeepCopyInto(out *ClusterList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Cluster, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList.
+func (in *ClusterList) DeepCopy() *ClusterList {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ClusterList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterPlacementStatus) DeepCopyInto(out *ClusterPlacementStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacementStatus.
+func (in *ClusterPlacementStatus) DeepCopy() *ClusterPlacementStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterPlacementStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
+	*out = *in
+	out.KubeconfigSecretRef = in.KubeconfigSecretRef
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
+func (in *ClusterSpec) DeepCopy() *ClusterSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStatus.
+func (in *ClusterStatus) DeepCopy() *ClusterStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentDefinition) DeepCopyInto(out *ComponentDefinition) {
 	*out = *in
@@ -469,23 +791,199 @@ func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
 }

 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ManagedResource) DeepCopyInto(out *ManagedResource) {
+func (in *DependsOn) DeepCopyInto(out *DependsOn) {
 	*out = *in
-	out.ClusterObjectReference = in.ClusterObjectReference
-	out.OAMObjectReference = in.OAMObjectReference
-	if in.Data != nil {
-		in, out := &in.Data, &out.Data
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
+	out.Ref = in.Ref
 }

-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManagedResource.
-func (in *ManagedResource) DeepCopy() *ManagedResource {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DependsOn.
+func (in *DependsOn) DeepCopy() *DependsOn {
 	if in == nil {
 		return nil
 	}
-	out := new(ManagedResource)
+	out := new(DependsOn)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HTTPMatchRequest) DeepCopyInto(out *HTTPMatchRequest) {
+	*out = *in
+	if in.URI != nil {
+		in, out := &in.URI, &out.URI
+		*out = new(URIMatch)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPMatchRequest.
+func (in *HTTPMatchRequest) DeepCopy() *HTTPMatchRequest {
+	if in == nil {
+		return nil
+	}
+	out := new(HTTPMatchRequest)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HTTPRule) DeepCopyInto(out *HTTPRule) {
+	*out = *in
+	if in.Match != nil {
+		in, out := &in.Match, &out.Match
+		*out = make([]*HTTPMatchRequest, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(HTTPMatchRequest)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+	if in.WeightedTargets != nil {
+		in, out := &in.WeightedTargets, &out.WeightedTargets
+		*out = make([]WeightedTarget, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPRule.
+func (in *HTTPRule) DeepCopy() *HTTPRule {
+	if in == nil {
+		return nil
+	}
+	out := new(HTTPRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Initializer) DeepCopyInto(out *Initializer) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Initializer.
+func (in *Initializer) DeepCopy() *Initializer {
+	if in == nil {
+		return nil
+	}
+	out := new(Initializer)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Initializer) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InitializerList) DeepCopyInto(out *InitializerList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Initializer, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerList.
+func (in *InitializerList) DeepCopy() *InitializerList {
+	if in == nil {
+		return nil
+	}
+	out := new(InitializerList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *InitializerList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InitializerSpec) DeepCopyInto(out *InitializerSpec) {
+	*out = *in
+	in.AppTemplate.DeepCopyInto(&out.AppTemplate)
+	if in.DependsOn != nil {
+		in, out := &in.DependsOn, &out.DependsOn
+		*out = make([]DependsOn, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerSpec.
+func (in *InitializerSpec) DeepCopy() *InitializerSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(InitializerSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InitializerStatus) DeepCopyInto(out *InitializerStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerStatus.
+func (in *InitializerStatus) DeepCopy() *InitializerStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(InitializerStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *LocalSecretReference) DeepCopyInto(out *LocalSecretReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalSecretReference.
+func (in *LocalSecretReference) DeepCopy() *LocalSecretReference {
+	if in == nil {
+		return nil
+	}
+	out := new(LocalSecretReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PlacementStatus) DeepCopyInto(out *PlacementStatus) {
+	*out = *in
+	if in.Clusters != nil {
+		in, out := &in.Clusters, &out.Clusters
+		*out = make([]ClusterPlacementStatus, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementStatus.
+func (in *PlacementStatus) DeepCopy() *PlacementStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PlacementStatus)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -596,7 +1094,6 @@ func (in *ResourceTracker) DeepCopyInto(out *ResourceTracker) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }

@@ -650,34 +1147,12 @@ func (in *ResourceTrackerList) DeepCopyObject() runtime.Object {
 	return nil
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourceTrackerSpec) DeepCopyInto(out *ResourceTrackerSpec) {
-	*out = *in
-	if in.ManagedResources != nil {
-		in, out := &in.ManagedResources, &out.ManagedResources
-		*out = make([]ManagedResource, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerSpec.
-func (in *ResourceTrackerSpec) DeepCopy() *ResourceTrackerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ResourceTrackerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
 	*out = *in
 	if in.TrackedResources != nil {
 		in, out := &in.TrackedResources, &out.TrackedResources
-		*out = make([]common.ClusterObjectReference, len(*in))
+		*out = make([]corev1.ObjectReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -771,6 +1246,38 @@ func (in *ScopeDefinitionSpec) DeepCopy() *ScopeDefinitionSpec {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Traffic) DeepCopyInto(out *Traffic) {
+	*out = *in
+	if in.Hosts != nil {
+		in, out := &in.Hosts, &out.Hosts
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Gateways != nil {
+		in, out := &in.Gateways, &out.Gateways
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.HTTP != nil {
+		in, out := &in.HTTP, &out.HTTP
+		*out = make([]HTTPRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Traffic.
+func (in *Traffic) DeepCopy() *Traffic {
+	if in == nil {
+		return nil
+	}
+	out := new(Traffic)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	*out = *in
@@ -892,6 +1399,36 @@ func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *URIMatch) DeepCopyInto(out *URIMatch) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new URIMatch.
+func (in *URIMatch) DeepCopy() *URIMatch {
+	if in == nil {
+		return nil
+	}
+	out := new(URIMatch)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WeightedTarget) DeepCopyInto(out *WeightedTarget) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WeightedTarget.
+func (in *WeightedTarget) DeepCopy() *WeightedTarget {
+	if in == nil {
+		return nil
+	}
+	out := new(WeightedTarget)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Workflow) DeepCopyInto(out *Workflow) {
 	*out = *in
--- a/apis/generate.go
+++ b/apis/generate.go
@@ -1,4 +1,3 @@
-//go:build generate
 // +build generate

 /*
--- a/apis/interfaces/resourcetracker.go
+++ b/apis/interfaces/resourcetracker.go
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package interfaces
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-// ObjectOwner is the interface for get and set ownerReference
-type ObjectOwner interface {
-	GetOwnerReferences() []metav1.OwnerReference
-	SetOwnerReferences([]metav1.OwnerReference)
-}
-
-// TrackableResource is the interface for resources to be tracked by resourcetracker
-type TrackableResource interface {
-	client.Object
-	metav1.Type
-	ObjectOwner
-}
--- a/apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/types/capability.go
+++ b/apis/types/capability.go
@@ -19,11 +19,12 @@ package types
 import (
 	"encoding/json"

-	"cuelang.org/go/cue"
-	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+
+	"cuelang.org/go/cue"
+	"github.com/spf13/pflag"
 )

 // Source record the source of Capability
@@ -78,8 +79,6 @@ const CapabilityConfigMapNamePrefix = "schema-"
 const (
 	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
 	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
-	// UISchema is the key to store ui custom schema
-	UISchema string = "ui-schema"
 )

 // CapabilityCategory defines the category of a capability
@@ -179,8 +178,6 @@ type Capability struct {

 	// Terraform
 	TerraformConfiguration string `json:"terraformConfiguration,omitempty"`
-	ConfigurationType      string `json:"configurationType,omitempty"`
-	Path                   string `json:"path,omitempty"`

 	// KubeTemplate
 	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`
--- a/apis/types/event.go
+++ b/apis/types/event.go
@@ -18,14 +18,13 @@ package types

 // reason for Application
 const (
-	ReasonParsed          = "Parsed"
-	ReasonRendered        = "Rendered"
-	ReasonPolicyGenerated = "PolicyGenerated"
-	ReasonRevisoned       = "Revisioned"
-	ReasonApplied         = "Applied"
-	ReasonHealthCheck     = "HealthChecked"
-	ReasonDeployed        = "Deployed"
-	ReasonRollout         = "Rollout"
+	ReasonParsed      = "Parsed"
+	ReasonRendered    = "Rendered"
+	ReasonRevisoned   = "Revisioned"
+	ReasonApplied     = "Applied"
+	ReasonHealthCheck = "HealthChecked"
+	ReasonDeployed    = "Deployed"
+	ReasonRollout     = "Rollout"

 	ReasonFailedParse       = "FailedParse"
 	ReasonFailedRender      = "FailedRender"
@@ -33,7 +32,6 @@ const (
 	ReasonFailedWorkflow    = "FailedWorkflow"
 	ReasonFailedApply       = "FailedApply"
 	ReasonFailedHealthCheck = "FailedHealthCheck"
-	ReasonFailedStateKeep   = "FailedStateKeep"
 	ReasonFailedGC          = "FailedGC"
 	ReasonFailedRollout     = "FailedRollout"
 )
@@ -42,7 +40,6 @@ const (
 const (
 	MessageParsed           = "Parsed successfully"
 	MessageRendered         = "Rendered successfully"
-	MessagePolicyGenerated  = "Policy generated successfully"
 	MessageRevisioned       = "Revisioned successfully"
 	MessageApplied          = "Applied successfully"
 	MessageWorkflowFinished = "Workflow finished"
--- a/apis/types/types.go
+++ b/apis/types/types.go
@@ -19,6 +19,8 @@ package types
 import "github.com/oam-dev/kubevela/pkg/oam"

 const (
+	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
+	DefaultKubeVelaNS = "vela-system"
 	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
 	DefaultKubeVelaReleaseName = "kubevela"
 	// DefaultKubeVelaChartName defines the default chart name of KubeVela, this variable MUST align to the chart name of this repo
@@ -31,34 +33,11 @@ const (
 	DefaultAppNamespace = "default"
 	// AutoDetectWorkloadDefinition defines the default workload type for ComponentDefinition which doesn't specify a workload
 	AutoDetectWorkloadDefinition = "autodetects.core.oam.dev"
-	// KubeVelaControllerDeployment defines the KubeVela controller's deployment name
-	KubeVelaControllerDeployment = "kubevela-vela-core"
 )

-// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
-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"
-	// AnnoDefinitionAppliedWorkloads is the annotation which describe what is the workloads used for in a TraitDefinition Object
-	AnnoDefinitionAppliedWorkloads = "definition.oam.dev/appliedWorkloads"
-	// LabelDefinition is the label for definition
-	LabelDefinition = "definition.oam.dev"
-	// LabelDefinitionName is the label for definition name
-	LabelDefinitionName = "definition.oam.dev/name"
-	// LabelDefinitionDeprecated is the label which describe whether the capability is deprecated
-	LabelDefinitionDeprecated = "custom.definition.oam.dev/deprecated"
-	// LabelDefinitionHidden is the label which describe whether the capability is hidden by UI
-	LabelDefinitionHidden = "custom.definition.oam.dev/ui-hidden"
-	// LabelNodeRoleGateway gateway role of node
-	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
-	// LabelNodeRoleWorker worker role of node
-	LabelNodeRoleWorker = "node-role.kubernetes.io/worker"
-	// AnnoIngressControllerHTTPSPort define ingress controller listen port for https
-	AnnoIngressControllerHTTPSPort = "ingress.controller/https-port"
-	// AnnoIngressControllerHTTPPort define ingress controller listen port for http
-	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
+	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
+	AnnDescription = "definition.oam.dev/description"
 )

 const (
@@ -75,31 +54,23 @@ type Config map[string]string
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
-	Current   string `json:"current"`
+
+	Current string `json:"current,omitempty"`
 }

 const (
 	// TagCommandType used for tag cli category
 	TagCommandType = "commandType"
-
-	// TagCommandOrder defines the order
-	TagCommandOrder = "commandOrder"
-
 	// TypeStart defines one category
 	TypeStart = "Getting Started"
-
 	// TypeApp defines one category
 	TypeApp = "Managing Applications"
-
-	// TypeCD defines workflow Management operations
-	TypeCD = "Continuous Delivery"
-
-	// TypeExtension defines one category
-	TypeExtension = "Managing Extension"
-
+	// TypeCap defines one category
+	TypeCap = "Managing Capabilities"
 	// TypeSystem defines one category
-	TypeSystem = "Others"
-
+	TypeSystem = "System"
+	// TypeDefinition defines one category
+	TypeDefinition = "Managing Definitions"
 	// TypePlugin defines one category used in Kubectl Plugin
 	TypePlugin = "Plugin Command"
 )
--- a/charts/oam-runtime/crds/core.oam.dev_containerizedworkloads.yaml
+++ b/charts/oam-runtime/crds/core.oam.dev_containerizedworkloads.yaml
@@ -0,0 +1,593 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: containerizedworkloads.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ContainerizedWorkload
+    listKind: ContainerizedWorkloadList
+    plural: containerizedworkloads
+    singular: containerizedworkload
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: A ContainerizedWorkload is a workload that runs OCI containers.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: A ContainerizedWorkloadSpec defines the desired state of
+              a ContainerizedWorkload.
+            properties:
+              arch:
+                description: CPUArchitecture required by this workload.
+                enum:
+                - i386
+                - amd64
+                - arm
+                - arm64
+                type: string
+              containers:
+                description: Containers of which this workload consists.
+                items:
+                  description: A Container represents an Open Containers Initiative
+                    (OCI) container.
+                  properties:
+                    args:
+                      description: Arguments to be passed to the command run by this
+                        container.
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command to be run by this container.
+                      items:
+                        type: string
+                      type: array
+                    config:
+                      description: ConfigFiles that should be written within this
+                        container.
+                      items:
+                        description: A ContainerConfigFile specifies a configuration
+                          file that should be written within a container.
+                        properties:
+                          fromSecret:
+                            description: FromSecret is a secret key reference which
+                              can be used to assign a value to be written to the configuration
+                              file at the given path in the container.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                description: The name of the secret.
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                          path:
+                            description: Path within the container at which the configuration
+                              file should be written.
+                            type: string
+                          value:
+                            description: Value that should be written to the configuration
+                              file.
+                            type: string
+                        required:
+                        - path
+                        type: object
+                      type: array
+                    env:
+                      description: Environment variables that should be set within
+                        this container.
+                      items:
+                        description: A ContainerEnvVar specifies an environment variable
+                          that should be set within a container.
+                        properties:
+                          fromSecret:
+                            description: FromSecret is a secret key reference which
+                              can be used to assign a value to the environment variable.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                description: The name of the secret.
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                          name:
+                            description: Name of the environment variable. Must be
+                              composed of valid Unicode letter and number characters,
+                              as well as _ and -.
+                            pattern: ^[-_a-zA-Z0-9]+$
+                            type: string
+                          value:
+                            description: Value of the environment variable.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    image:
+                      description: Image this container should run. Must be a path-like
+                        or URI-like representation of an OCI image. May be prefixed
+                        with a registry address and should be suffixed with a tag.
+                      type: string
+                    imagePullSecret:
+                      description: ImagePullSecret specifies the name of a Secret
+                        from which the credentials required to pull this container's
+                        image can be loaded.
+                      type: string
+                    livenessProbe:
+                      description: A LivenessProbe assesses whether this container
+                        is alive. Containers that fail liveness probes will be restarted.
+                      properties:
+                        exec:
+                          description: Exec probes a container's health by executing
+                            a command.
+                          properties:
+                            command:
+                              description: Command to be run by this probe.
+                              items:
+                                type: string
+                              type: array
+                          required:
+                          - command
+                          type: object
+                        failureThreshold:
+                          description: FailureThreshold specifies how many consecutive
+                            probes must fail in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        httpGet:
+                          description: HTTPGet probes a container's health by sending
+                            an HTTP GET request.
+                          properties:
+                            httpHeaders:
+                              description: HTTPHeaders to send with the GET request.
+                              items:
+                                description: A HTTPHeader to be passed when probing
+                                  a container.
+                                properties:
+                                  name:
+                                    description: Name of this HTTP header. Must be
+                                      unique per probe.
+                                    type: string
+                                  value:
+                                    description: Value of this HTTP header.
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                            path:
+                              description: Path to probe, e.g. '/healthz'.
+                              type: string
+                            port:
+                              description: Port to probe.
+                              format: int32
+                              type: integer
+                          required:
+                          - path
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: InitialDelaySeconds after a container starts
+                            before the first probe.
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: PeriodSeconds between probes.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: SuccessThreshold specifies how many consecutive
+                            probes must success in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocketProbe probes a container's health
+                            by connecting to a TCP socket.
+                          properties:
+                            port:
+                              description: Port this probe should connect to.
+                              format: int32
+                              type: integer
+                          required:
+                          - port
+                          type: object
+                        timeoutSeconds:
+                          description: TimeoutSeconds after which the probe times
+                            out.
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: Name of this container. Must be unique within its
+                        workload.
+                      type: string
+                    ports:
+                      description: Ports exposed by this container.
+                      items:
+                        description: A ContainerPort specifies a port that is exposed
+                          by a container.
+                        properties:
+                          containerPort:
+                            description: Port number. Must be unique within its container.
+                            format: int32
+                            type: integer
+                          name:
+                            description: Name of this port. Must be unique within
+                              its container. Must be lowercase alphabetical characters.
+                            pattern: ^[a-z]+$
+                            type: string
+                          protocol:
+                            description: Protocol used by the server listening on
+                              this port.
+                            enum:
+                            - TCP
+                            - UDP
+                            type: string
+                        required:
+                        - containerPort
+                        - name
+                        type: object
+                      type: array
+                    readinessProbe:
+                      description: A ReadinessProbe assesses whether this container
+                        is ready to serve requests. Containers that fail readiness
+                        probes will be withdrawn from service.
+                      properties:
+                        exec:
+                          description: Exec probes a container's health by executing
+                            a command.
+                          properties:
+                            command:
+                              description: Command to be run by this probe.
+                              items:
+                                type: string
+                              type: array
+                          required:
+                          - command
+                          type: object
+                        failureThreshold:
+                          description: FailureThreshold specifies how many consecutive
+                            probes must fail in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        httpGet:
+                          description: HTTPGet probes a container's health by sending
+                            an HTTP GET request.
+                          properties:
+                            httpHeaders:
+                              description: HTTPHeaders to send with the GET request.
+                              items:
+                                description: A HTTPHeader to be passed when probing
+                                  a container.
+                                properties:
+                                  name:
+                                    description: Name of this HTTP header. Must be
+                                      unique per probe.
+                                    type: string
+                                  value:
+                                    description: Value of this HTTP header.
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                            path:
+                              description: Path to probe, e.g. '/healthz'.
+                              type: string
+                            port:
+                              description: Port to probe.
+                              format: int32
+                              type: integer
+                          required:
+                          - path
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: InitialDelaySeconds after a container starts
+                            before the first probe.
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: PeriodSeconds between probes.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: SuccessThreshold specifies how many consecutive
+                            probes must success in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocketProbe probes a container's health
+                            by connecting to a TCP socket.
+                          properties:
+                            port:
+                              description: Port this probe should connect to.
+                              format: int32
+                              type: integer
+                          required:
+                          - port
+                          type: object
+                        timeoutSeconds:
+                          description: TimeoutSeconds after which the probe times
+                            out.
+                          format: int32
+                          type: integer
+                      type: object
+                    resources:
+                      description: Resources required by this container
+                      properties:
+                        cpu:
+                          description: CPU required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required CPU count. 1.0 represents one
+                                CPU core.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        extended:
+                          description: Extended resources required by this container.
+                          items:
+                            description: ExtendedResource required by a container.
+                            properties:
+                              name:
+                                description: Name of the external resource. Resource
+                                  names are specified in kind.group/version format,
+                                  e.g. motionsensor.ext.example.com/v1.
+                                type: string
+                              required:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                description: Required extended resource(s), e.g. 8
+                                  or "very-cool-widget"
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - name
+                            - required
+                            type: object
+                          type: array
+                        gpu:
+                          description: GPU required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required GPU count.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        memory:
+                          description: Memory required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required memory.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        volumes:
+                          description: Volumes required by this container.
+                          items:
+                            description: VolumeResource required by a container.
+                            properties:
+                              accessMode:
+                                description: AccessMode of this volume; RO (read only)
+                                  or RW (read and write).
+                                enum:
+                                - RO
+                                - RW
+                                type: string
+                              disk:
+                                description: Disk requirements of this volume.
+                                properties:
+                                  ephemeral:
+                                    description: Ephemeral specifies whether an external
+                                      disk needs to be mounted.
+                                    type: boolean
+                                  required:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Required disk space.
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - required
+                                type: object
+                              mountPath:
+                                description: MountPath at which this volume will be
+                                  mounted within its container.
+                                type: string
+                              name:
+                                description: Name of this volume. Must be unique within
+                                  its container.
+                                type: string
+                              sharingPolicy:
+                                description: SharingPolicy of this volume; Exclusive
+                                  or Shared.
+                                enum:
+                                - Exclusive
+                                - Shared
+                                type: string
+                            required:
+                            - mountPath
+                            - name
+                            type: object
+                          type: array
+                      required:
+                      - cpu
+                      - memory
+                      type: object
+                  required:
+                  - image
+                  - name
+                  type: object
+                type: array
+              osType:
+                description: OperatingSystem required by this workload.
+                enum:
+                - linux
+                - windows
+                type: string
+            required:
+            - containers
+            type: object
+          status:
+            description: A ContainerizedWorkloadStatus represents the observed state
+              of a ContainerizedWorkload.
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              resources:
+                description: Resources managed by this containerised workload.
+                items:
+                  description: 'ObjectReference contains enough information to let
+                    you inspect or modify the referred object. --- New uses of this
+                    type are discouraged because of difficulty describing its usage
+                    when embedded in APIs.  1. Ignored fields.  It includes many fields
+                    which are not generally honored.  For instance, ResourceVersion
+                    and FieldPath are both very rarely valid in actual usage.  2.
+                    Invalid usage help.  It is impossible to add specific help for
+                    individual usage.  In most embedded usages, there are particular     restrictions
+                    like, "must refer only to types A and B" or "UID not honored"
+                    or "name must be restricted".     Those cannot be well described
+                    when embedded.  3. Inconsistent validation.  Because the usages
+                    are different, the validation rules are different by usage, which
+                    makes it hard for users to predict what will happen.  4. The fields
+                    are both imprecise and overly precise.  Kind is not a precise
+                    mapping to a URL. This can produce ambiguity     during interpretation
+                    and require a REST mapping.  In most cases, the dependency is
+                    on the group,resource tuple     and the version of the actual
+                    struct is irrelevant.  5. We cannot easily change it.  Because
+                    this type is embedded in many locations, updates to this type     will
+                    affect numerous schemas.  Don''t make new APIs embed an underspecified
+                    API type they do not control. Instead of using this type, create
+                    a locally provided and used type that is well-focused on your
+                    reference. For example, ServiceReferences for admission registration:
+                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    .'
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of
+                        an entire object, this string should contain a valid JSON/Go
+                        field access statement, such as desiredState.manifest.containers[2].
+                        For example, if the object reference is to a container within
+                        a pod, this would take on a value like: "spec.containers{name}"
+                        (where "name" refers to the name of the container that triggered
+                        the event) or if no container name is specified "spec.containers[2]"
+                        (container with index 2 in this pod). This syntax is chosen
+                        only to have some well-defined way of referencing a part of
+                        an object. TODO: this design is not final and this field is
+                        subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference
+                        is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
--- a/charts/oam-runtime/crds/core.oam.dev_traitdefinitions.yaml
+++ b/charts/oam-runtime/crds/core.oam.dev_traitdefinitions.yaml
@@ -188,11 +188,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -206,15 +201,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -224,22 +215,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -497,11 +472,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -515,15 +485,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -533,22 +499,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/oam-runtime/crds/core.oam.dev_workloaddefinitions.yaml
+++ b/charts/oam-runtime/crds/core.oam.dev_workloaddefinitions.yaml
@@ -193,11 +193,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -211,15 +206,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -229,22 +220,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -483,11 +458,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -501,15 +471,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -519,22 +485,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - patch
--- a/charts/oam-runtime/templates/definitions/containerizedworkloads.yaml
+++ b/charts/oam-runtime/templates/definitions/containerizedworkloads.yaml
@@ -0,0 +1,13 @@
+apiVersion: core.oam.dev/v1beta1
+kind: WorkloadDefinition
+metadata:
+  name: containerizedworkloads.core.oam.dev
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  definitionRef:
+    name: containerizedworkloads.core.oam.dev
+  childResourceKinds:
+    - apiVersion: apps/v1
+      kind: Deployment
+    - apiVersion: v1
+      kind: Service
--- a/charts/oam-runtime/templates/oam-runtime-controller.yaml
+++ b/charts/oam-runtime/templates/oam-runtime-controller.yaml
@@ -126,8 +126,7 @@ spec:
            {{ end }}
            - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
            - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-            - "--concurrent-reconciles={{ .Values.concurrentReconciles }}"
-          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/oam-runtime/templates/test/test-application.yaml
+++ b/charts/oam-runtime/templates/test/test-application.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: {{ include "oam-runtime.fullname" . }}-test-connection
+  name: "{{ include "oam-runtime.fullname" . }}-test-connection"
  labels:
  {{- include "oam-runtime.labels" . | nindent 4 }}
  annotations:
@@ -9,7 +9,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "oam-runtime.fullname" . }}:{{ .Values.healthCheck.port }}']
  restartPolicy: Never
--- a/charts/oam-runtime/values.yaml
+++ b/charts/oam-runtime/values.yaml
@@ -7,8 +7,6 @@ replicaCount: 1
 applyOnceOnly: "off"

 disableCaps: "all"
-
-imageRegistry: ""
 image:
  repository: oamdev/vela-core
  tag: latest
@@ -100,9 +98,4 @@ concurrentReconciles: 4
 dependCheckWait: 30s

 # OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.2"
-
-test:
-  app:
-    repository: oamdev/busybox
-    tag: v1
+OAMSpecVer: "v0.2"
--- a/charts/vela-core/Chart.yaml
+++ b/charts/vela-core/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 appVersion: 0.1.0

 home: https://kubevela.io
-icon: https://kubevela.io/img/logo.svg
+icon: https://kubevela.io/img/logo.jpg
--- a/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
+++ b/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
@@ -0,0 +1,246 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: appdeployments.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: AppDeployment
+    listKind: AppDeploymentList
+    plural: appdeployments
+    shortNames:
+    - appdeploy
+    singular: appdeployment
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: AppDeployment is the Schema for the AppDeployment API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AppDeploymentSpec defines how to describe an upgrade between
+              different apps
+            properties:
+              appRevisions:
+                description: AppRevision specifies  AppRevision resources to and the
+                  rules to apply to them.
+                items:
+                  description: AppRevision specifies an AppRevision resource to and
+                    the rules to apply to it.
+                  properties:
+                    placement:
+                      description: Placement defines the cluster placement rules for
+                        an app revision.
+                      items:
+                        description: ClusterPlacement defines the cluster placement
+                          rules for an app revision.
+                        properties:
+                          clusterSelector:
+                            description: ClusterSelector selects the cluster to  deploy
+                              apps to. If not specified, it indicates the host cluster
+                              per se.
+                            properties:
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                description: Labels defines the label selector to
+                                  select the cluster.
+                                type: object
+                              name:
+                                description: Name is the name of the cluster.
+                                type: string
+                            type: object
+                          distribution:
+                            description: Distribution defines the replica distribution
+                              of an AppRevision to a cluster.
+                            properties:
+                              replicas:
+                                description: Replicas is the replica number.
+                                type: integer
+                            type: object
+                        type: object
+                      type: array
+                    revisionName:
+                      description: RevisionName is the name of the AppRevision.
+                      type: string
+                  type: object
+                type: array
+              traffic:
+                description: Traffic defines the traffic rules to apply across revisions.
+                properties:
+                  gateways:
+                    description: Gateways specifies the names of gateways that should
+                      apply these rules. Gateways in other namespaces may be referred
+                      to by `<gateway namespace>/<gateway name>`; specifying a gateway
+                      with no namespace qualifier is the same as specifying the AppDeployment's
+                      namespace.
+                    items:
+                      type: string
+                    type: array
+                  hosts:
+                    description: Hosts are the destination hosts to which traffic
+                      is being sent. Could be a DNS name with wildcard prefix or an
+                      IP address.
+                    items:
+                      type: string
+                    type: array
+                  http:
+                    description: HTTP defines the rules to match and split http traffoc
+                      across revisions.
+                    items:
+                      description: HTTPRule defines the rules to match and split http
+                        traffic across revisions.
+                      properties:
+                        match:
+                          description: Match defines the conditions to be satisfied
+                            for the rule to be activated. All conditions inside a
+                            single match block have AND semantics, while the list
+                            of match blocks have OR semantics. The rule is matched
+                            if any one of the match blocks succeed.
+                          items:
+                            description: HTTPMatchRequest specifies a set of criterion
+                              to be met in order for the rule to be applied to the
+                              HTTP request. For example, the following restricts the
+                              rule to match only requests where the URL path starts
+                              with /ratings/v2/ and the request contains a custom
+                              `end-user` header with value `jason`.
+                            properties:
+                              uri:
+                                description: URI defines how to match with an URI.
+                                properties:
+                                  prefix:
+                                    type: string
+                                type: object
+                            type: object
+                          type: array
+                        weightedTargets:
+                          description: WeightedTargets defines the revision targets
+                            to select and route traffic to.
+                          items:
+                            description: WeightedTarget defines the revision target
+                              to select and route traffic to.
+                            properties:
+                              componentName:
+                                description: ComponentName is the name of the component.
+                                  Note that it is the original component name in the
+                                  Application. No need to append revision.
+                                type: string
+                              port:
+                                description: Port is the port to route traffic towards.
+                                type: integer
+                              revisionName:
+                                description: RevisionName is the name of the app revision.
+                                type: string
+                              weight:
+                                description: Weight defines the proportion of traffic
+                                  to be forwarded to the service version. (0-100).
+                                  Sum of weights across destinations SHOULD BE ==
+                                  100. If there is only one destination in a rule,
+                                  the weight value is assumed to be 100.
+                                type: integer
+                            type: object
+                          type: array
+                      type: object
+                    type: array
+                type: object
+            type: object
+          status:
+            description: AppDeploymentStatus defines the observed state of AppDeployment
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              phase:
+                description: Phase shows the phase that the AppDeployment is undergoing.
+                  If Phase is Rolling, no update should be made to the spec.
+                type: string
+              placement:
+                description: Placement shows the cluster placement results of the
+                  app revisions.
+                items:
+                  description: PlacementStatus shows the cluster placement results
+                    of an app revision.
+                  properties:
+                    clusters:
+                      description: Clusters shows cluster placement results.
+                      items:
+                        description: ClusterPlacementStatus shows the placement results
+                          of a cluster.
+                        properties:
+                          clusterName:
+                            description: ClusterName indicates the name of the cluster
+                              to deploy apps to. If empty, it indicates the host cluster
+                              per se.
+                            type: string
+                          replicas:
+                            description: Replicas indicates the replica number of
+                              an app revision to deploy to a cluster.
+                            type: integer
+                        type: object
+                      type: array
+                    revisionName:
+                      description: RevisionName is the name of the AppRevision.
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
--- a/charts/vela-core/crds/core.oam.dev_applications.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applications.yaml
@@ -443,25 +443,8 @@ spec:
                description: The generation observed by the application controller.
                format: int64
                type: integer
-              policy:
-                description: PolicyStatus records the status of policy
-                items:
-                  description: PolicyStatus records the status of policy
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
              resourceTracker:
-                description: Deprecated ResourceTracker record the status of the ResourceTracker
+                description: ResourceTracker record the status of the ResourceTracker
                properties:
                  apiVersion:
                    description: API version of the referent.
@@ -485,6 +468,82 @@ spec:
                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                    type: string
                type: object
+              rollout:
+                description: AppRolloutStatus defines the observed state of AppRollout
+                properties:
+                  LastSourceAppRevision:
+                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                    type: string
+                  batchRollingState:
+                    description: BatchRollingState only meaningful when the Status is rolling
+                    type: string
+                  conditions:
+                    description: Conditions of the resource.
+                    items:
+                      description: A Condition that may apply to a resource.
+                      properties:
+                        lastTransitionTime:
+                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                          format: date-time
+                          type: string
+                        message:
+                          description: A Message containing details about this condition's last transition from one status to another, if any.
+                          type: string
+                        reason:
+                          description: A Reason for this condition's last transition from one status to another.
+                          type: string
+                        status:
+                          description: Status of this condition; is it currently True, False, or Unknown?
+                          type: string
+                        type:
+                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                          type: string
+                      required:
+                      - lastTransitionTime
+                      - reason
+                      - status
+                      - type
+                      type: object
+                    type: array
+                  currentBatch:
+                    description: The current batch the rollout is working on/blocked it starts from 0
+                    format: int32
+                    type: integer
+                  lastAppliedPodTemplateIdentifier:
+                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                    type: string
+                  lastTargetAppRevision:
+                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                    type: string
+                  rollingState:
+                    description: RollingState is the Rollout State
+                    type: string
+                  rolloutOriginalSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  rolloutTargetSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  targetGeneration:
+                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                    type: string
+                  upgradedReadyReplicas:
+                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                    format: int32
+                    type: integer
+                  upgradedReplicas:
+                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                    format: int32
+                    type: integer
+                required:
+                - currentBatch
+                - lastTargetAppRevision
+                - rollingState
+                - upgradedReadyReplicas
+                - upgradedReplicas
+                type: object
              services:
                description: Services record the status of the application services
                items:
@@ -557,7 +616,7 @@ spec:
                  type: object
                type: array
              status:
-                description: ApplicationPhase is a label for the condition of an application at the current time
+                description: ApplicationPhase is a label for the condition of a application at the current time
                type: string
              workflow:
                description: Workflow record the status of workflow
@@ -589,30 +648,15 @@ spec:
                        description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                        type: string
                    type: object
-                  finished:
-                    type: boolean
-                  message:
-                    type: string
                  mode:
                    description: WorkflowMode describes the mode of workflow
                    type: string
-                  startTime:
-                    format: date-time
-                    type: string
                  steps:
                    items:
                      description: WorkflowStepStatus record the status of a workflow step
                      properties:
-                        firstExecuteTime:
-                          description: FirstExecuteTime is the first time this step execution.
-                          format: date-time
-                          type: string
                        id:
                          type: string
-                        lastExecuteTime:
-                          description: LastExecuteTime is the last time this step execution.
-                          format: date-time
-                          type: string
                        message:
                          description: A human readable message indicating details about why the workflowStep is in this state.
                          type: string
@@ -667,7 +711,6 @@ spec:
                  terminated:
                    type: boolean
                required:
-                - finished
                - mode
                - suspend
                - terminated
@@ -800,6 +843,234 @@ spec:
                  - type
                  type: object
                type: array
+              rolloutPlan:
+                description: RolloutPlan is the details on how to rollout the resources The controller simply replace the old resources with the new one if there is no rollout plan involved
+                properties:
+                  batchPartition:
+                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
+                    format: int32
+                    type: integer
+                  canaryMetric:
+                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
+                    items:
+                      description: CanaryMetric holds the reference to metrics used for canary analysis
+                      properties:
+                        interval:
+                          description: Interval represents the windows size
+                          type: string
+                        metricsRange:
+                          description: Range value accepted for this metric
+                          properties:
+                            max:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Maximum value
+                              x-kubernetes-int-or-string: true
+                            min:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Minimum value
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        name:
+                          description: Name of the metric
+                          type: string
+                        templateRef:
+                          description: TemplateRef references a metric template object
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  numBatches:
+                    description: The number of batches, default = 1
+                    format: int32
+                    type: integer
+                  paused:
+                    description: Paused the rollout, default is false
+                    type: boolean
+                  rolloutBatches:
+                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
+                    items:
+                      description: RolloutBatch is used to describe how the each batch rollout should be
+                      properties:
+                        batchRolloutWebhooks:
+                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
+                          items:
+                            description: RolloutWebhook holds the reference to external checks used for canary analysis
+                            properties:
+                              expectedStatus:
+                                description: ExpectedStatus contains all the expected http status code that we will accept as success
+                                items:
+                                  type: integer
+                                type: array
+                              metadata:
+                                additionalProperties:
+                                  type: string
+                                description: Metadata (key-value pairs) for this webhook
+                                type: object
+                              method:
+                                description: Method the HTTP call method, default is POST
+                                type: string
+                              name:
+                                description: Name of this webhook
+                                type: string
+                              type:
+                                description: Type of this webhook
+                                type: string
+                              url:
+                                description: URL address of this webhook
+                                type: string
+                            required:
+                            - name
+                            - type
+                            - url
+                            type: object
+                          type: array
+                        canaryMetric:
+                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
+                          items:
+                            description: CanaryMetric holds the reference to metrics used for canary analysis
+                            properties:
+                              interval:
+                                description: Interval represents the windows size
+                                type: string
+                              metricsRange:
+                                description: Range value accepted for this metric
+                                properties:
+                                  max:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Maximum value
+                                    x-kubernetes-int-or-string: true
+                                  min:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Minimum value
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              name:
+                                description: Name of the metric
+                                type: string
+                              templateRef:
+                                description: TemplateRef references a metric template object
+                                properties:
+                                  apiVersion:
+                                    description: API version of the referent.
+                                    type: string
+                                  fieldPath:
+                                    description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                                    type: string
+                                  kind:
+                                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                    type: string
+                                  namespace:
+                                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                                    type: string
+                                  resourceVersion:
+                                    description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                                    type: string
+                                  uid:
+                                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                                    type: string
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        instanceInterval:
+                          description: The wait time, in seconds, between instances upgrades, default = 0
+                          format: int32
+                          type: integer
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
+                          x-kubernetes-int-or-string: true
+                        podList:
+                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
+                          items:
+                            type: string
+                          type: array
+                        replicas:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    type: array
+                  rolloutStrategy:
+                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
+                    type: string
+                  rolloutWebhooks:
+                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
+                    items:
+                      description: RolloutWebhook holds the reference to external checks used for canary analysis
+                      properties:
+                        expectedStatus:
+                          description: ExpectedStatus contains all the expected http status code that we will accept as success
+                          items:
+                            type: integer
+                          type: array
+                        metadata:
+                          additionalProperties:
+                            type: string
+                          description: Metadata (key-value pairs) for this webhook
+                          type: object
+                        method:
+                          description: Method the HTTP call method, default is POST
+                          type: string
+                        name:
+                          description: Name of this webhook
+                          type: string
+                        type:
+                          description: Type of this webhook
+                          type: string
+                        url:
+                          description: URL address of this webhook
+                          type: string
+                      required:
+                      - name
+                      - type
+                      - url
+                      type: object
+                    type: array
+                  targetSize:
+                    description: The size of the target resource. The default is the same as the size of the source resource.
+                    format: int32
+                    type: integer
+                type: object
              workflow:
                description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
                properties:
@@ -965,25 +1236,8 @@ spec:
                description: The generation observed by the application controller.
                format: int64
                type: integer
-              policy:
-                description: PolicyStatus records the status of policy
-                items:
-                  description: PolicyStatus records the status of policy
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
              resourceTracker:
-                description: Deprecated ResourceTracker record the status of the ResourceTracker
+                description: ResourceTracker record the status of the ResourceTracker
                properties:
                  apiVersion:
                    description: API version of the referent.
@@ -1007,6 +1261,82 @@ spec:
                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                    type: string
                type: object
+              rollout:
+                description: AppRolloutStatus defines the observed state of AppRollout
+                properties:
+                  LastSourceAppRevision:
+                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                    type: string
+                  batchRollingState:
+                    description: BatchRollingState only meaningful when the Status is rolling
+                    type: string
+                  conditions:
+                    description: Conditions of the resource.
+                    items:
+                      description: A Condition that may apply to a resource.
+                      properties:
+                        lastTransitionTime:
+                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                          format: date-time
+                          type: string
+                        message:
+                          description: A Message containing details about this condition's last transition from one status to another, if any.
+                          type: string
+                        reason:
+                          description: A Reason for this condition's last transition from one status to another.
+                          type: string
+                        status:
+                          description: Status of this condition; is it currently True, False, or Unknown?
+                          type: string
+                        type:
+                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                          type: string
+                      required:
+                      - lastTransitionTime
+                      - reason
+                      - status
+                      - type
+                      type: object
+                    type: array
+                  currentBatch:
+                    description: The current batch the rollout is working on/blocked it starts from 0
+                    format: int32
+                    type: integer
+                  lastAppliedPodTemplateIdentifier:
+                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                    type: string
+                  lastTargetAppRevision:
+                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                    type: string
+                  rollingState:
+                    description: RollingState is the Rollout State
+                    type: string
+                  rolloutOriginalSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  rolloutTargetSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  targetGeneration:
+                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                    type: string
+                  upgradedReadyReplicas:
+                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                    format: int32
+                    type: integer
+                  upgradedReplicas:
+                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                    format: int32
+                    type: integer
+                required:
+                - currentBatch
+                - lastTargetAppRevision
+                - rollingState
+                - upgradedReadyReplicas
+                - upgradedReplicas
+                type: object
              services:
                description: Services record the status of the application services
                items:
@@ -1079,7 +1409,7 @@ spec:
                  type: object
                type: array
              status:
-                description: ApplicationPhase is a label for the condition of an application at the current time
+                description: ApplicationPhase is a label for the condition of a application at the current time
                type: string
              workflow:
                description: Workflow record the status of workflow
@@ -1111,30 +1441,15 @@ spec:
                        description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                        type: string
                    type: object
-                  finished:
-                    type: boolean
-                  message:
-                    type: string
                  mode:
                    description: WorkflowMode describes the mode of workflow
                    type: string
-                  startTime:
-                    format: date-time
-                    type: string
                  steps:
                    items:
                      description: WorkflowStepStatus record the status of a workflow step
                      properties:
-                        firstExecuteTime:
-                          description: FirstExecuteTime is the first time this step execution.
-                          format: date-time
-                          type: string
                        id:
                          type: string
-                        lastExecuteTime:
-                          description: LastExecuteTime is the last time this step execution.
-                          format: date-time
-                          type: string
                        message:
                          description: A human readable message indicating details about why the workflowStep is in this state.
                          type: string
@@ -1189,7 +1504,6 @@ spec:
                  terminated:
                    type: boolean
                required:
-                - finished
                - mode
                - suspend
                - terminated
--- a/charts/vela-core/crds/core.oam.dev_approllouts.yaml
+++ b/charts/vela-core/crds/core.oam.dev_approllouts.yaml
@@ -0,0 +1,954 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: approllouts.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: AppRollout
+    listKind: AppRolloutList
+    plural: approllouts
+    shortNames:
+    - approllout
+    singular: approllout
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.rolloutStatus.rolloutTargetSize
+      name: TARGET
+      type: string
+    - jsonPath: .status.rolloutStatus.upgradedReplicas
+      name: UPGRADED
+      type: string
+    - jsonPath: .status.rolloutStatus.upgradedReadyReplicas
+      name: READY
+      type: string
+    - jsonPath: .status.rolloutStatus.batchRollingState
+      name: BATCH-STATE
+      type: string
+    - jsonPath: .status.rolloutStatus.rollingState
+      name: ROLLING-STATE
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: AppRollout is the Schema for the AppRollout API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AppRolloutSpec defines how to describe an upgrade between
+              different apps
+            properties:
+              componentList:
+                description: 'The list of component to upgrade in the application.
+                  We only support single component application so far TODO: (RZ) Support
+                  multiple components in an application'
+                items:
+                  type: string
+                type: array
+              revertOnDelete:
+                description: RevertOnDelete revert the rollout when the rollout CR
+                  is deleted It will remove the target app from the kubernetes if
+                  it's set to true
+                type: boolean
+              rolloutPlan:
+                description: RolloutPlan is the details on how to rollout the resources
+                properties:
+                  batchPartition:
+                    description: All pods in the batches up to the batchPartition
+                      (included) will have the target resource specification while
+                      the rest still have the source resource This is designed for
+                      the operators to manually rollout Default is the the number
+                      of batches which will rollout all the batches
+                    format: int32
+                    type: integer
+                  canaryMetric:
+                    description: CanaryMetric provides a way for the rollout process
+                      to automatically check certain metrics before complete the process
+                    items:
+                      description: CanaryMetric holds the reference to metrics used
+                        for canary analysis
+                      properties:
+                        interval:
+                          description: Interval represents the windows size
+                          type: string
+                        metricsRange:
+                          description: Range value accepted for this metric
+                          properties:
+                            max:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Maximum value
+                              x-kubernetes-int-or-string: true
+                            min:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Minimum value
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        name:
+                          description: Name of the metric
+                          type: string
+                        templateRef:
+                          description: TemplateRef references a metric template object
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  numBatches:
+                    description: The number of batches, default = 1
+                    format: int32
+                    type: integer
+                  paused:
+                    description: Paused the rollout, default is false
+                    type: boolean
+                  rolloutBatches:
+                    description: The exact distribution among batches. its size has
+                      to be exactly the same as the NumBatches (if set) The total
+                      number cannot exceed the targetSize or the size of the source
+                      resource We will IGNORE the last batch's replica field if it's
+                      a percentage since round errors can lead to inaccurate sum We
+                      highly recommend to leave the last batch's replica field empty
+                    items:
+                      description: RolloutBatch is used to describe how the each batch
+                        rollout should be
+                      properties:
+                        batchRolloutWebhooks:
+                          description: RolloutWebhooks provides a way for the batch
+                            rollout to interact with an external process
+                          items:
+                            description: RolloutWebhook holds the reference to external
+                              checks used for canary analysis
+                            properties:
+                              expectedStatus:
+                                description: ExpectedStatus contains all the expected
+                                  http status code that we will accept as success
+                                items:
+                                  type: integer
+                                type: array
+                              metadata:
+                                additionalProperties:
+                                  type: string
+                                description: Metadata (key-value pairs) for this webhook
+                                type: object
+                              method:
+                                description: Method the HTTP call method, default
+                                  is POST
+                                type: string
+                              name:
+                                description: Name of this webhook
+                                type: string
+                              type:
+                                description: Type of this webhook
+                                type: string
+                              url:
+                                description: URL address of this webhook
+                                type: string
+                            required:
+                            - name
+                            - type
+                            - url
+                            type: object
+                          type: array
+                        canaryMetric:
+                          description: CanaryMetric provides a way for the batch rollout
+                            process to automatically check certain metrics before
+                            moving to the next batch
+                          items:
+                            description: CanaryMetric holds the reference to metrics
+                              used for canary analysis
+                            properties:
+                              interval:
+                                description: Interval represents the windows size
+                                type: string
+                              metricsRange:
+                                description: Range value accepted for this metric
+                                properties:
+                                  max:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Maximum value
+                                    x-kubernetes-int-or-string: true
+                                  min:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Minimum value
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              name:
+                                description: Name of the metric
+                                type: string
+                              templateRef:
+                                description: TemplateRef references a metric template
+                                  object
+                                properties:
+                                  apiVersion:
+                                    description: API version of the referent.
+                                    type: string
+                                  fieldPath:
+                                    description: 'If referring to a piece of an object
+                                      instead of an entire object, this string should
+                                      contain a valid JSON/Go field access statement,
+                                      such as desiredState.manifest.containers[2].
+                                      For example, if the object reference is to a
+                                      container within a pod, this would take on a
+                                      value like: "spec.containers{name}" (where "name"
+                                      refers to the name of the container that triggered
+                                      the event) or if no container name is specified
+                                      "spec.containers[2]" (container with index 2
+                                      in this pod). This syntax is chosen only to
+                                      have some well-defined way of referencing a
+                                      part of an object. TODO: this design is not
+                                      final and this field is subject to change in
+                                      the future.'
+                                    type: string
+                                  kind:
+                                    description: 'Kind of the referent. More info:
+                                      https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                    type: string
+                                  namespace:
+                                    description: 'Namespace of the referent. More
+                                      info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                                    type: string
+                                  resourceVersion:
+                                    description: 'Specific resourceVersion to which
+                                      this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                                    type: string
+                                  uid:
+                                    description: 'UID of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                                    type: string
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        instanceInterval:
+                          description: The wait time, in seconds, between instances
+                            upgrades, default = 0
+                          format: int32
+                          type: integer
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: MaxUnavailable is the max allowed number of
+                            pods that is unavailable during the upgrade. We will mark
+                            the batch as ready as long as there are less or equal
+                            number of pods unavailable than this number. default =
+                            0
+                          x-kubernetes-int-or-string: true
+                        podList:
+                          description: The list of Pods to get upgraded it is mutually
+                            exclusive with the Replicas field
+                          items:
+                            type: string
+                          type: array
+                        replicas:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: 'Replicas is the number of pods to upgrade
+                            in this batch it can be an absolute number (ex: 5) or
+                            a percentage of total pods we will ignore the percentage
+                            of the last batch to just fill the gap it is mutually
+                            exclusive with the PodList field'
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    type: array
+                  rolloutStrategy:
+                    description: RolloutStrategy defines strategies for the rollout
+                      plan The default is IncreaseFirstRolloutStrategyType
+                    type: string
+                  rolloutWebhooks:
+                    description: RolloutWebhooks provide a way for the rollout to
+                      interact with an external process
+                    items:
+                      description: RolloutWebhook holds the reference to external
+                        checks used for canary analysis
+                      properties:
+                        expectedStatus:
+                          description: ExpectedStatus contains all the expected http
+                            status code that we will accept as success
+                          items:
+                            type: integer
+                          type: array
+                        metadata:
+                          additionalProperties:
+                            type: string
+                          description: Metadata (key-value pairs) for this webhook
+                          type: object
+                        method:
+                          description: Method the HTTP call method, default is POST
+                          type: string
+                        name:
+                          description: Name of this webhook
+                          type: string
+                        type:
+                          description: Type of this webhook
+                          type: string
+                        url:
+                          description: URL address of this webhook
+                          type: string
+                      required:
+                      - name
+                      - type
+                      - url
+                      type: object
+                    type: array
+                  targetSize:
+                    description: The size of the target resource. The default is the
+                      same as the size of the source resource.
+                    format: int32
+                    type: integer
+                type: object
+              sourceAppRevisionName:
+                description: SourceAppRevisionName contains the name of the applicationRevision
+                  that we need to upgrade from. it can be empty only when the rolling
+                  is only a scale event
+                type: string
+              targetAppRevisionName:
+                description: TargetAppRevisionName contains the name of the applicationRevision
+                  that we need to upgrade to.
+                type: string
+            required:
+            - rolloutPlan
+            - targetAppRevisionName
+            type: object
+          status:
+            description: AppRolloutStatus defines the observed state of AppRollout
+            properties:
+              LastSourceAppRevision:
+                description: LastSourceAppRevision contains the name of the app that
+                  we need to upgrade from. We will restart the rollout if this is
+                  not the same as the spec
+                type: string
+              batchRollingState:
+                description: BatchRollingState only meaningful when the Status is
+                  rolling
+                type: string
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              currentBatch:
+                description: The current batch the rollout is working on/blocked it
+                  starts from 0
+                format: int32
+                type: integer
+              lastAppliedPodTemplateIdentifier:
+                description: lastAppliedPodTemplateIdentifier is a string that uniquely
+                  represent the last pod template each workload type could use different
+                  ways to identify that so we cannot compare between resources We
+                  update this field only after a successful rollout
+                type: string
+              lastTargetAppRevision:
+                description: LastUpgradedTargetAppRevision contains the name of the
+                  app that we upgraded to We will restart the rollout if this is not
+                  the same as the spec
+                type: string
+              rollingState:
+                description: RollingState is the Rollout State
+                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources.
+                  This is determined once the initial spec verification and does not
+                  change until the rollout is restarted
+                format: int32
+                type: integer
+              rolloutTargetSize:
+                description: RolloutTargetSize is the size of the target resources.
+                  This is determined once the initial spec verification and does not
+                  change until the rollout is restarted
+                format: int32
+                type: integer
+              targetGeneration:
+                description: NewPodTemplateIdentifier is a string that uniquely represent
+                  the new pod template each workload type could use different ways
+                  to identify that so we cannot compare between resources
+                type: string
+              upgradedReadyReplicas:
+                description: UpgradedReadyReplicas is the number of Pods upgraded
+                  by the rollout controller that have a Ready Condition.
+                format: int32
+                type: integer
+              upgradedReplicas:
+                description: UpgradedReplicas is the number of Pods upgraded by the
+                  rollout controller
+                format: int32
+                type: integer
+            required:
+            - currentBatch
+            - lastTargetAppRevision
+            - rollingState
+            - upgradedReadyReplicas
+            - upgradedReplicas
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.rolloutTargetSize
+      name: TARGET
+      type: string
+    - jsonPath: .status.upgradedReplicas
+      name: UPGRADED
+      type: string
+    - jsonPath: .status.upgradedReadyReplicas
+      name: READY
+      type: string
+    - jsonPath: .status.batchRollingState
+      name: BATCH-STATE
+      type: string
+    - jsonPath: .status.rollingState
+      name: ROLLING-STATE
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: AppRollout is the Schema for the AppRollout API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AppRolloutSpec defines how to describe an upgrade between
+              different apps
+            properties:
+              componentList:
+                description: 'The list of component to upgrade in the application.
+                  We only support single component application so far TODO: (RZ) Support
+                  multiple components in an application'
+                items:
+                  type: string
+                type: array
+              revertOnDelete:
+                description: RevertOnDelete revert the failed rollout when the rollout
+                  CR is deleted It will revert the change back to the source version
+                  at once (not in batches) Default is false
+                type: boolean
+              rolloutPlan:
+                description: RolloutPlan is the details on how to rollout the resources
+                properties:
+                  batchPartition:
+                    description: All pods in the batches up to the batchPartition
+                      (included) will have the target resource specification while
+                      the rest still have the source resource This is designed for
+                      the operators to manually rollout Default is the the number
+                      of batches which will rollout all the batches
+                    format: int32
+                    type: integer
+                  canaryMetric:
+                    description: CanaryMetric provides a way for the rollout process
+                      to automatically check certain metrics before complete the process
+                    items:
+                      description: CanaryMetric holds the reference to metrics used
+                        for canary analysis
+                      properties:
+                        interval:
+                          description: Interval represents the windows size
+                          type: string
+                        metricsRange:
+                          description: Range value accepted for this metric
+                          properties:
+                            max:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Maximum value
+                              x-kubernetes-int-or-string: true
+                            min:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Minimum value
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        name:
+                          description: Name of the metric
+                          type: string
+                        templateRef:
+                          description: TemplateRef references a metric template object
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  numBatches:
+                    description: The number of batches, default = 1
+                    format: int32
+                    type: integer
+                  paused:
+                    description: Paused the rollout, default is false
+                    type: boolean
+                  rolloutBatches:
+                    description: The exact distribution among batches. its size has
+                      to be exactly the same as the NumBatches (if set) The total
+                      number cannot exceed the targetSize or the size of the source
+                      resource We will IGNORE the last batch's replica field if it's
+                      a percentage since round errors can lead to inaccurate sum We
+                      highly recommend to leave the last batch's replica field empty
+                    items:
+                      description: RolloutBatch is used to describe how the each batch
+                        rollout should be
+                      properties:
+                        batchRolloutWebhooks:
+                          description: RolloutWebhooks provides a way for the batch
+                            rollout to interact with an external process
+                          items:
+                            description: RolloutWebhook holds the reference to external
+                              checks used for canary analysis
+                            properties:
+                              expectedStatus:
+                                description: ExpectedStatus contains all the expected
+                                  http status code that we will accept as success
+                                items:
+                                  type: integer
+                                type: array
+                              metadata:
+                                additionalProperties:
+                                  type: string
+                                description: Metadata (key-value pairs) for this webhook
+                                type: object
+                              method:
+                                description: Method the HTTP call method, default
+                                  is POST
+                                type: string
+                              name:
+                                description: Name of this webhook
+                                type: string
+                              type:
+                                description: Type of this webhook
+                                type: string
+                              url:
+                                description: URL address of this webhook
+                                type: string
+                            required:
+                            - name
+                            - type
+                            - url
+                            type: object
+                          type: array
+                        canaryMetric:
+                          description: CanaryMetric provides a way for the batch rollout
+                            process to automatically check certain metrics before
+                            moving to the next batch
+                          items:
+                            description: CanaryMetric holds the reference to metrics
+                              used for canary analysis
+                            properties:
+                              interval:
+                                description: Interval represents the windows size
+                                type: string
+                              metricsRange:
+                                description: Range value accepted for this metric
+                                properties:
+                                  max:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Maximum value
+                                    x-kubernetes-int-or-string: true
+                                  min:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Minimum value
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              name:
+                                description: Name of the metric
+                                type: string
+                              templateRef:
+                                description: TemplateRef references a metric template
+                                  object
+                                properties:
+                                  apiVersion:
+                                    description: API version of the referent.
+                                    type: string
+                                  fieldPath:
+                                    description: 'If referring to a piece of an object
+                                      instead of an entire object, this string should
+                                      contain a valid JSON/Go field access statement,
+                                      such as desiredState.manifest.containers[2].
+                                      For example, if the object reference is to a
+                                      container within a pod, this would take on a
+                                      value like: "spec.containers{name}" (where "name"
+                                      refers to the name of the container that triggered
+                                      the event) or if no container name is specified
+                                      "spec.containers[2]" (container with index 2
+                                      in this pod). This syntax is chosen only to
+                                      have some well-defined way of referencing a
+                                      part of an object. TODO: this design is not
+                                      final and this field is subject to change in
+                                      the future.'
+                                    type: string
+                                  kind:
+                                    description: 'Kind of the referent. More info:
+                                      https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                    type: string
+                                  namespace:
+                                    description: 'Namespace of the referent. More
+                                      info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                                    type: string
+                                  resourceVersion:
+                                    description: 'Specific resourceVersion to which
+                                      this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                                    type: string
+                                  uid:
+                                    description: 'UID of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                                    type: string
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        instanceInterval:
+                          description: The wait time, in seconds, between instances
+                            upgrades, default = 0
+                          format: int32
+                          type: integer
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: MaxUnavailable is the max allowed number of
+                            pods that is unavailable during the upgrade. We will mark
+                            the batch as ready as long as there are less or equal
+                            number of pods unavailable than this number. default =
+                            0
+                          x-kubernetes-int-or-string: true
+                        podList:
+                          description: The list of Pods to get upgraded it is mutually
+                            exclusive with the Replicas field
+                          items:
+                            type: string
+                          type: array
+                        replicas:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: 'Replicas is the number of pods to upgrade
+                            in this batch it can be an absolute number (ex: 5) or
+                            a percentage of total pods we will ignore the percentage
+                            of the last batch to just fill the gap it is mutually
+                            exclusive with the PodList field'
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    type: array
+                  rolloutStrategy:
+                    description: RolloutStrategy defines strategies for the rollout
+                      plan The default is IncreaseFirstRolloutStrategyType
+                    type: string
+                  rolloutWebhooks:
+                    description: RolloutWebhooks provide a way for the rollout to
+                      interact with an external process
+                    items:
+                      description: RolloutWebhook holds the reference to external
+                        checks used for canary analysis
+                      properties:
+                        expectedStatus:
+                          description: ExpectedStatus contains all the expected http
+                            status code that we will accept as success
+                          items:
+                            type: integer
+                          type: array
+                        metadata:
+                          additionalProperties:
+                            type: string
+                          description: Metadata (key-value pairs) for this webhook
+                          type: object
+                        method:
+                          description: Method the HTTP call method, default is POST
+                          type: string
+                        name:
+                          description: Name of this webhook
+                          type: string
+                        type:
+                          description: Type of this webhook
+                          type: string
+                        url:
+                          description: URL address of this webhook
+                          type: string
+                      required:
+                      - name
+                      - type
+                      - url
+                      type: object
+                    type: array
+                  targetSize:
+                    description: The size of the target resource. The default is the
+                      same as the size of the source resource.
+                    format: int32
+                    type: integer
+                type: object
+              sourceAppRevisionName:
+                description: SourceAppRevisionName contains the name of the applicationConfiguration
+                  that we need to upgrade from. it can be empty only when it's the
+                  first time to deploy the application
+                type: string
+              targetAppRevisionName:
+                description: TargetAppRevisionName contains the name of the applicationConfiguration
+                  that we need to upgrade to. Here we use an applicationConfiguration
+                  as a revision of an application, thus the name alone is suffice
+                type: string
+            required:
+            - rolloutPlan
+            - targetAppRevisionName
+            type: object
+          status:
+            description: AppRolloutStatus defines the observed state of AppRollout
+            properties:
+              LastSourceAppRevision:
+                description: LastSourceAppRevision contains the name of the app that
+                  we need to upgrade from. We will restart the rollout if this is
+                  not the same as the spec
+                type: string
+              batchRollingState:
+                description: BatchRollingState only meaningful when the Status is
+                  rolling
+                type: string
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              currentBatch:
+                description: The current batch the rollout is working on/blocked it
+                  starts from 0
+                format: int32
+                type: integer
+              lastAppliedPodTemplateIdentifier:
+                description: lastAppliedPodTemplateIdentifier is a string that uniquely
+                  represent the last pod template each workload type could use different
+                  ways to identify that so we cannot compare between resources We
+                  update this field only after a successful rollout
+                type: string
+              lastTargetAppRevision:
+                description: LastUpgradedTargetAppRevision contains the name of the
+                  app that we upgraded to We will restart the rollout if this is not
+                  the same as the spec
+                type: string
+              rollingState:
+                description: RollingState is the Rollout State
+                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources.
+                  This is determined once the initial spec verification and does not
+                  change until the rollout is restarted
+                format: int32
+                type: integer
+              rolloutTargetSize:
+                description: RolloutTargetSize is the size of the target resources.
+                  This is determined once the initial spec verification and does not
+                  change until the rollout is restarted
+                format: int32
+                type: integer
+              targetGeneration:
+                description: NewPodTemplateIdentifier is a string that uniquely represent
+                  the new pod template each workload type could use different ways
+                  to identify that so we cannot compare between resources
+                type: string
+              upgradedReadyReplicas:
+                description: UpgradedReadyReplicas is the number of Pods upgraded
+                  by the rollout controller that have a Ready Condition.
+                format: int32
+                type: integer
+              upgradedReplicas:
+                description: UpgradedReplicas is the number of Pods upgraded by the
+                  rollout controller
+                format: int32
+                type: integer
+            required:
+            - currentBatch
+            - lastTargetAppRevision
+            - rollingState
+            - upgradedReadyReplicas
+            - upgradedReplicas
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_clusters.yaml
+++ b/charts/vela-core/crds/core.oam.dev_clusters.yaml
@@ -0,0 +1,60 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: clusters.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    kind: Cluster
+    listKind: ClusterList
+    plural: clusters
+    singular: cluster
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: Cluster is the Schema for the clusters API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ClusterSpec defines the desired state of Cluster
+            properties:
+              kubeconfigSecretRef:
+                description: KubeconfigSecretRef specifies the reference to the secret
+                  that contains the kubeconfig in field `config`.
+                properties:
+                  name:
+                    description: Name of a secret within the enclosing namespace.
+                    type: string
+                required:
+                - name
+                type: object
+            type: object
+          status:
+            description: ClusterStatus defines the observed state of Cluster
+            type: object
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
@@ -179,11 +179,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -197,15 +192,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -215,22 +206,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -492,11 +467,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -510,15 +480,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -528,22 +494,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/vela-core/crds/core.oam.dev_containerizedworkloads.yaml
+++ b/charts/vela-core/crds/core.oam.dev_containerizedworkloads.yaml
@@ -0,0 +1,593 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: containerizedworkloads.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ContainerizedWorkload
+    listKind: ContainerizedWorkloadList
+    plural: containerizedworkloads
+    singular: containerizedworkload
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: A ContainerizedWorkload is a workload that runs OCI containers.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: A ContainerizedWorkloadSpec defines the desired state of
+              a ContainerizedWorkload.
+            properties:
+              arch:
+                description: CPUArchitecture required by this workload.
+                enum:
+                - i386
+                - amd64
+                - arm
+                - arm64
+                type: string
+              containers:
+                description: Containers of which this workload consists.
+                items:
+                  description: A Container represents an Open Containers Initiative
+                    (OCI) container.
+                  properties:
+                    args:
+                      description: Arguments to be passed to the command run by this
+                        container.
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command to be run by this container.
+                      items:
+                        type: string
+                      type: array
+                    config:
+                      description: ConfigFiles that should be written within this
+                        container.
+                      items:
+                        description: A ContainerConfigFile specifies a configuration
+                          file that should be written within a container.
+                        properties:
+                          fromSecret:
+                            description: FromSecret is a secret key reference which
+                              can be used to assign a value to be written to the configuration
+                              file at the given path in the container.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                description: The name of the secret.
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                          path:
+                            description: Path within the container at which the configuration
+                              file should be written.
+                            type: string
+                          value:
+                            description: Value that should be written to the configuration
+                              file.
+                            type: string
+                        required:
+                        - path
+                        type: object
+                      type: array
+                    env:
+                      description: Environment variables that should be set within
+                        this container.
+                      items:
+                        description: A ContainerEnvVar specifies an environment variable
+                          that should be set within a container.
+                        properties:
+                          fromSecret:
+                            description: FromSecret is a secret key reference which
+                              can be used to assign a value to the environment variable.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                description: The name of the secret.
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                          name:
+                            description: Name of the environment variable. Must be
+                              composed of valid Unicode letter and number characters,
+                              as well as _ and -.
+                            pattern: ^[-_a-zA-Z0-9]+$
+                            type: string
+                          value:
+                            description: Value of the environment variable.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    image:
+                      description: Image this container should run. Must be a path-like
+                        or URI-like representation of an OCI image. May be prefixed
+                        with a registry address and should be suffixed with a tag.
+                      type: string
+                    imagePullSecret:
+                      description: ImagePullSecret specifies the name of a Secret
+                        from which the credentials required to pull this container's
+                        image can be loaded.
+                      type: string
+                    livenessProbe:
+                      description: A LivenessProbe assesses whether this container
+                        is alive. Containers that fail liveness probes will be restarted.
+                      properties:
+                        exec:
+                          description: Exec probes a container's health by executing
+                            a command.
+                          properties:
+                            command:
+                              description: Command to be run by this probe.
+                              items:
+                                type: string
+                              type: array
+                          required:
+                          - command
+                          type: object
+                        failureThreshold:
+                          description: FailureThreshold specifies how many consecutive
+                            probes must fail in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        httpGet:
+                          description: HTTPGet probes a container's health by sending
+                            an HTTP GET request.
+                          properties:
+                            httpHeaders:
+                              description: HTTPHeaders to send with the GET request.
+                              items:
+                                description: A HTTPHeader to be passed when probing
+                                  a container.
+                                properties:
+                                  name:
+                                    description: Name of this HTTP header. Must be
+                                      unique per probe.
+                                    type: string
+                                  value:
+                                    description: Value of this HTTP header.
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                            path:
+                              description: Path to probe, e.g. '/healthz'.
+                              type: string
+                            port:
+                              description: Port to probe.
+                              format: int32
+                              type: integer
+                          required:
+                          - path
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: InitialDelaySeconds after a container starts
+                            before the first probe.
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: PeriodSeconds between probes.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: SuccessThreshold specifies how many consecutive
+                            probes must success in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocketProbe probes a container's health
+                            by connecting to a TCP socket.
+                          properties:
+                            port:
+                              description: Port this probe should connect to.
+                              format: int32
+                              type: integer
+                          required:
+                          - port
+                          type: object
+                        timeoutSeconds:
+                          description: TimeoutSeconds after which the probe times
+                            out.
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: Name of this container. Must be unique within its
+                        workload.
+                      type: string
+                    ports:
+                      description: Ports exposed by this container.
+                      items:
+                        description: A ContainerPort specifies a port that is exposed
+                          by a container.
+                        properties:
+                          containerPort:
+                            description: Port number. Must be unique within its container.
+                            format: int32
+                            type: integer
+                          name:
+                            description: Name of this port. Must be unique within
+                              its container. Must be lowercase alphabetical characters.
+                            pattern: ^[a-z]+$
+                            type: string
+                          protocol:
+                            description: Protocol used by the server listening on
+                              this port.
+                            enum:
+                            - TCP
+                            - UDP
+                            type: string
+                        required:
+                        - containerPort
+                        - name
+                        type: object
+                      type: array
+                    readinessProbe:
+                      description: A ReadinessProbe assesses whether this container
+                        is ready to serve requests. Containers that fail readiness
+                        probes will be withdrawn from service.
+                      properties:
+                        exec:
+                          description: Exec probes a container's health by executing
+                            a command.
+                          properties:
+                            command:
+                              description: Command to be run by this probe.
+                              items:
+                                type: string
+                              type: array
+                          required:
+                          - command
+                          type: object
+                        failureThreshold:
+                          description: FailureThreshold specifies how many consecutive
+                            probes must fail in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        httpGet:
+                          description: HTTPGet probes a container's health by sending
+                            an HTTP GET request.
+                          properties:
+                            httpHeaders:
+                              description: HTTPHeaders to send with the GET request.
+                              items:
+                                description: A HTTPHeader to be passed when probing
+                                  a container.
+                                properties:
+                                  name:
+                                    description: Name of this HTTP header. Must be
+                                      unique per probe.
+                                    type: string
+                                  value:
+                                    description: Value of this HTTP header.
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                            path:
+                              description: Path to probe, e.g. '/healthz'.
+                              type: string
+                            port:
+                              description: Port to probe.
+                              format: int32
+                              type: integer
+                          required:
+                          - path
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: InitialDelaySeconds after a container starts
+                            before the first probe.
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: PeriodSeconds between probes.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: SuccessThreshold specifies how many consecutive
+                            probes must success in order for the container to be considered
+                            healthy.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocketProbe probes a container's health
+                            by connecting to a TCP socket.
+                          properties:
+                            port:
+                              description: Port this probe should connect to.
+                              format: int32
+                              type: integer
+                          required:
+                          - port
+                          type: object
+                        timeoutSeconds:
+                          description: TimeoutSeconds after which the probe times
+                            out.
+                          format: int32
+                          type: integer
+                      type: object
+                    resources:
+                      description: Resources required by this container
+                      properties:
+                        cpu:
+                          description: CPU required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required CPU count. 1.0 represents one
+                                CPU core.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        extended:
+                          description: Extended resources required by this container.
+                          items:
+                            description: ExtendedResource required by a container.
+                            properties:
+                              name:
+                                description: Name of the external resource. Resource
+                                  names are specified in kind.group/version format,
+                                  e.g. motionsensor.ext.example.com/v1.
+                                type: string
+                              required:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                description: Required extended resource(s), e.g. 8
+                                  or "very-cool-widget"
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - name
+                            - required
+                            type: object
+                          type: array
+                        gpu:
+                          description: GPU required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required GPU count.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        memory:
+                          description: Memory required by this container.
+                          properties:
+                            required:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Required memory.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - required
+                          type: object
+                        volumes:
+                          description: Volumes required by this container.
+                          items:
+                            description: VolumeResource required by a container.
+                            properties:
+                              accessMode:
+                                description: AccessMode of this volume; RO (read only)
+                                  or RW (read and write).
+                                enum:
+                                - RO
+                                - RW
+                                type: string
+                              disk:
+                                description: Disk requirements of this volume.
+                                properties:
+                                  ephemeral:
+                                    description: Ephemeral specifies whether an external
+                                      disk needs to be mounted.
+                                    type: boolean
+                                  required:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Required disk space.
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - required
+                                type: object
+                              mountPath:
+                                description: MountPath at which this volume will be
+                                  mounted within its container.
+                                type: string
+                              name:
+                                description: Name of this volume. Must be unique within
+                                  its container.
+                                type: string
+                              sharingPolicy:
+                                description: SharingPolicy of this volume; Exclusive
+                                  or Shared.
+                                enum:
+                                - Exclusive
+                                - Shared
+                                type: string
+                            required:
+                            - mountPath
+                            - name
+                            type: object
+                          type: array
+                      required:
+                      - cpu
+                      - memory
+                      type: object
+                  required:
+                  - image
+                  - name
+                  type: object
+                type: array
+              osType:
+                description: OperatingSystem required by this workload.
+                enum:
+                - linux
+                - windows
+                type: string
+            required:
+            - containers
+            type: object
+          status:
+            description: A ContainerizedWorkloadStatus represents the observed state
+              of a ContainerizedWorkload.
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              resources:
+                description: Resources managed by this containerised workload.
+                items:
+                  description: 'ObjectReference contains enough information to let
+                    you inspect or modify the referred object. --- New uses of this
+                    type are discouraged because of difficulty describing its usage
+                    when embedded in APIs.  1. Ignored fields.  It includes many fields
+                    which are not generally honored.  For instance, ResourceVersion
+                    and FieldPath are both very rarely valid in actual usage.  2.
+                    Invalid usage help.  It is impossible to add specific help for
+                    individual usage.  In most embedded usages, there are particular     restrictions
+                    like, "must refer only to types A and B" or "UID not honored"
+                    or "name must be restricted".     Those cannot be well described
+                    when embedded.  3. Inconsistent validation.  Because the usages
+                    are different, the validation rules are different by usage, which
+                    makes it hard for users to predict what will happen.  4. The fields
+                    are both imprecise and overly precise.  Kind is not a precise
+                    mapping to a URL. This can produce ambiguity     during interpretation
+                    and require a REST mapping.  In most cases, the dependency is
+                    on the group,resource tuple     and the version of the actual
+                    struct is irrelevant.  5. We cannot easily change it.  Because
+                    this type is embedded in many locations, updates to this type     will
+                    affect numerous schemas.  Don''t make new APIs embed an underspecified
+                    API type they do not control. Instead of using this type, create
+                    a locally provided and used type that is well-focused on your
+                    reference. For example, ServiceReferences for admission registration:
+                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    .'
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of
+                        an entire object, this string should contain a valid JSON/Go
+                        field access statement, such as desiredState.manifest.containers[2].
+                        For example, if the object reference is to a container within
+                        a pod, this would take on a value like: "spec.containers{name}"
+                        (where "name" refers to the name of the container that triggered
+                        the event) or if no container name is specified "spec.containers[2]"
+                        (container with index 2 in this pod). This syntax is chosen
+                        only to have some well-defined way of referencing a part of
+                        an object. TODO: this design is not final and this field is
+                        subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference
+                        is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml
@@ -222,12 +222,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              deleteResource:
-                                default: true
-                                description: DeleteResource will determine whether
-                                  provisioned cloud resources will be deleted when
-                                  CR is deleted
-                                type: boolean
                              path:
                                description: Path is the sub-directory of remote git
                                  repository. It's valid when remote is set
@@ -241,16 +235,11 @@ spec:
                                    type: string
                                  namespace:
                                    default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                    type: string
                                required:
                                - name
                                type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -260,23 +249,6 @@ spec:
                                - json
                                - remote
                                type: string
-                              writeConnectionSecretToRef:
-                                description: WriteConnectionSecretToReference specifies
-                                  the namespace and name of a Secret to which any
-                                  connection details for this managed resource should
-                                  be written. Connection details frequently include
-                                  the endpoint, username, and password required to
-                                  connect to the managed resource.
-                                properties:
-                                  name:
-                                    description: Name of the secret.
-                                    type: string
-                                  namespace:
-                                    description: Namespace of the secret.
-                                    type: string
-                                required:
-                                - name
-                                type: object
                            required:
                            - configuration
                            type: object
@@ -538,12 +510,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              deleteResource:
-                                default: true
-                                description: DeleteResource will determine whether
-                                  provisioned cloud resources will be deleted when
-                                  CR is deleted
-                                type: boolean
                              path:
                                description: Path is the sub-directory of remote git
                                  repository. It's valid when remote is set
@@ -557,16 +523,11 @@ spec:
                                    type: string
                                  namespace:
                                    default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                    type: string
                                required:
                                - name
                                type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -576,23 +537,6 @@ spec:
                                - json
                                - remote
                                type: string
-                              writeConnectionSecretToRef:
-                                description: WriteConnectionSecretToReference specifies
-                                  the namespace and name of a Secret to which any
-                                  connection details for this managed resource should
-                                  be written. Connection details frequently include
-                                  the endpoint, username, and password required to
-                                  connect to the managed resource.
-                                properties:
-                                  name:
-                                    description: Name of the secret.
-                                    type: string
-                                  namespace:
-                                    description: Namespace of the secret.
-                                    type: string
-                                required:
-                                - name
-                                type: object
                            required:
                            - configuration
                            type: object
@@ -847,12 +791,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              deleteResource:
-                                default: true
-                                description: DeleteResource will determine whether
-                                  provisioned cloud resources will be deleted when
-                                  CR is deleted
-                                type: boolean
                              path:
                                description: Path is the sub-directory of remote git
                                  repository. It's valid when remote is set
@@ -866,16 +804,11 @@ spec:
                                    type: string
                                  namespace:
                                    default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                    type: string
                                required:
                                - name
                                type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -885,23 +818,6 @@ spec:
                                - json
                                - remote
                                type: string
-                              writeConnectionSecretToRef:
-                                description: WriteConnectionSecretToReference specifies
-                                  the namespace and name of a Secret to which any
-                                  connection details for this managed resource should
-                                  be written. Connection details frequently include
-                                  the endpoint, username, and password required to
-                                  connect to the managed resource.
-                                properties:
-                                  name:
-                                    description: Name of the secret.
-                                    type: string
-                                  namespace:
-                                    description: Namespace of the secret.
-                                    type: string
-                                required:
-                                - name
-                                type: object
                            required:
                            - configuration
                            type: object
@@ -1137,12 +1053,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              deleteResource:
-                                default: true
-                                description: DeleteResource will determine whether
-                                  provisioned cloud resources will be deleted when
-                                  CR is deleted
-                                type: boolean
                              path:
                                description: Path is the sub-directory of remote git
                                  repository. It's valid when remote is set
@@ -1156,16 +1066,11 @@ spec:
                                    type: string
                                  namespace:
                                    default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                    type: string
                                required:
                                - name
                                type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -1175,23 +1080,6 @@ spec:
                                - json
                                - remote
                                type: string
-                              writeConnectionSecretToRef:
-                                description: WriteConnectionSecretToReference specifies
-                                  the namespace and name of a Secret to which any
-                                  connection details for this managed resource should
-                                  be written. Connection details frequently include
-                                  the endpoint, username, and password required to
-                                  connect to the managed resource.
-                                properties:
-                                  name:
-                                    description: Name of the secret.
-                                    type: string
-                                  namespace:
-                                    description: Namespace of the secret.
-                                    type: string
-                                required:
-                                - name
-                                type: object
                            required:
                            - configuration
                            type: object
@@ -1235,10 +1123,6 @@ spec:
                          - type
                          type: object
                        type: array
-                      configMapRef:
-                        description: ConfigMapRef refer to a ConfigMap which contains
-                          OpenAPI V3 JSON schema of Component parameters.
-                        type: string
                      latestRevision:
                        description: LatestRevision of the component definition
                        properties:
--- a/charts/vela-core/crds/core.oam.dev_initializers.yaml
+++ b/charts/vela-core/crds/core.oam.dev_initializers.yaml
--- a/charts/vela-core/crds/core.oam.dev_policydefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_policydefinitions.yaml
@@ -151,11 +151,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -169,15 +164,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -187,22 +178,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
+++ b/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
@@ -15,24 +15,11 @@ spec:
    listKind: ResourceTrackerList
    plural: resourcetrackers
    shortNames:
-    - rt
+    - tracker
    singular: resourcetracker
  scope: Cluster
  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.type
-      name: TYPE
-      type: string
-    - jsonPath: .metadata.labels['app\.oam\.dev\/name']
-      name: APP
-      type: string
-    - jsonPath: .metadata.labels['app\.oam\.dev\/namespace']
-      name: APP-NS
-      type: string
-    - jsonPath: .spec.applicationGeneration
-      name: APP-GEN
-      type: number
-    name: v1beta1
+  - name: v1beta1
    schema:
      openAPIV3Schema:
        description: An ResourceTracker represents a tracker for track cross namespace
@@ -50,92 +37,40 @@ spec:
            type: string
          metadata:
            type: object
-          spec:
-            description: ResourceTrackerSpec define the spec of resourceTracker
-            properties:
-              applicationGeneration:
-                format: int64
-                type: integer
-              managedResources:
-                items:
-                  description: ManagedResource define the resource to be managed by
-                    ResourceTracker
-                  properties:
-                    apiVersion:
-                      description: API version of the referent.
-                      type: string
-                    cluster:
-                      type: string
-                    component:
-                      type: string
-                    creator:
-                      description: ResourceCreatorRole defines the resource creator.
-                      type: string
-                    deleted:
-                      description: Deleted marks the resource to be deleted
-                      type: boolean
-                    env:
-                      type: string
-                    fieldPath:
-                      description: 'If referring to a piece of an object instead of
-                        an entire object, this string should contain a valid JSON/Go
-                        field access statement, such as desiredState.manifest.containers[2].
-                        For example, if the object reference is to a container within
-                        a pod, this would take on a value like: "spec.containers{name}"
-                        (where "name" refers to the name of the container that triggered
-                        the event) or if no container name is specified "spec.containers[2]"
-                        (container with index 2 in this pod). This syntax is chosen
-                        only to have some well-defined way of referencing a part of
-                        an object. TODO: this design is not final and this field is
-                        subject to change in the future.'
-                      type: string
-                    kind:
-                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                      type: string
-                    name:
-                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                      type: string
-                    namespace:
-                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                      type: string
-                    raw:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    resourceVersion:
-                      description: 'Specific resourceVersion to which this reference
-                        is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                      type: string
-                    trait:
-                      type: string
-                    uid:
-                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                      type: string
-                  type: object
-                type: array
-              type:
-                description: ResourceTrackerType defines the type of resourceTracker
-                type: string
-            required:
-            - applicationGeneration
-            type: object
          status:
            description: ResourceTrackerStatus define the status of resourceTracker
-              For backward-compatibility
            properties:
              trackedResources:
-                description: Deprecated
                items:
-                  description: ClusterObjectReference defines the object reference
-                    with cluster.
+                  description: 'ObjectReference contains enough information to let
+                    you inspect or modify the referred object. --- New uses of this
+                    type are discouraged because of difficulty describing its usage
+                    when embedded in APIs.  1. Ignored fields.  It includes many fields
+                    which are not generally honored.  For instance, ResourceVersion
+                    and FieldPath are both very rarely valid in actual usage.  2.
+                    Invalid usage help.  It is impossible to add specific help for
+                    individual usage.  In most embedded usages, there are particular     restrictions
+                    like, "must refer only to types A and B" or "UID not honored"
+                    or "name must be restricted".     Those cannot be well described
+                    when embedded.  3. Inconsistent validation.  Because the usages
+                    are different, the validation rules are different by usage, which
+                    makes it hard for users to predict what will happen.  4. The fields
+                    are both imprecise and overly precise.  Kind is not a precise
+                    mapping to a URL. This can produce ambiguity     during interpretation
+                    and require a REST mapping.  In most cases, the dependency is
+                    on the group,resource tuple     and the version of the actual
+                    struct is irrelevant.  5. We cannot easily change it.  Because
+                    this type is embedded in many locations, updates to this type     will
+                    affect numerous schemas.  Don''t make new APIs embed an underspecified
+                    API type they do not control. Instead of using this type, create
+                    a locally provided and used type that is well-focused on your
+                    reference. For example, ServiceReferences for admission registration:
+                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    .'
                  properties:
                    apiVersion:
                      description: API version of the referent.
                      type: string
-                    cluster:
-                      type: string
-                    creator:
-                      description: ResourceCreatorRole defines the resource creator.
-                      type: string
                    fieldPath:
                      description: 'If referring to a piece of an object instead of
                        an entire object, this string should contain a valid JSON/Go
--- a/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
@@ -188,11 +188,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -206,15 +201,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -224,22 +215,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -497,11 +472,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -515,15 +485,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -533,22 +499,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/vela-core/crds/core.oam.dev_workflowstepdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workflowstepdefinitions.yaml
@@ -148,11 +148,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -166,15 +161,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -184,22 +175,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -241,10 +216,6 @@ spec:
                  - type
                  type: object
                type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
              latestRevision:
                description: LatestRevision of the component definition
                properties:
--- a/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
@@ -193,11 +193,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -211,15 +206,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -229,22 +220,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
@@ -483,11 +458,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
                      path:
                        description: Path is the sub-directory of remote git repository.
                          It's valid when remote is set
@@ -501,15 +471,11 @@ spec:
                            type: string
                          namespace:
                            default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                            type: string
                        required:
                        - name
                        type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -519,22 +485,6 @@ spec:
                        - json
                        - remote
                        type: string
-                      writeConnectionSecretToRef:
-                        description: WriteConnectionSecretToReference specifies the
-                          namespace and name of a Secret to which any connection details
-                          for this managed resource should be written. Connection
-                          details frequently include the endpoint, username, and password
-                          required to connect to the managed resource.
-                        properties:
-                          name:
-                            description: Name of the secret.
-                            type: string
-                          namespace:
-                            description: Namespace of the secret.
-                            type: string
-                        required:
-                        - name
-                        type: object
                    required:
                    - configuration
                    type: object
--- a/charts/vela-core/templates/NOTES.txt
+++ b/charts/vela-core/templates/NOTES.txt
@@ -1,29 +1 @@
-Welcome to use the KubeVela! Enjoy your shipping application journey!
-
-                                   ,
-                                   //,
-                                   ////
-                               ./  /////*
-                             ,///  ///////
-                           ./////  ////////
-                          ///////  /////////
-                         ////////  //////////
-                       ,/////////  ///////////
-                      ,//////////  ///////////.
-                     .///////////  ////////////
-                     ////////////  ////////////.
-                    *////////////  ////////////*
-       #@@@@@@@@@@@*     ..,,***/  /////////////
-        /@@@@@@@@@@@#
-         *@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&
-          .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.
-
-              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-                .&@@@*    *@@@&    ,@@@&.
-
-       _  __       _          __     __     _
-      | |/ /_   _ | |__    ___\ \   / /___ | |  __ _
-      | ' /| | | || '_ \  / _ \\ \ / // _ \| | / _` |
-      | . \| |_| || |_) ||  __/ \ V /|  __/| || (_| |
-      |_|\_\\__,_||_.__/  \___|  \_/  \___||_| \__,_|
-
+Welcome to use the KubeVela! Enjoy your shipping application journey!
--- a/charts/vela-core/templates/_helpers.tpl
+++ b/charts/vela-core/templates/_helpers.tpl
@@ -51,6 +51,11 @@ app.kubernetes.io/name: {{ include "kubevela.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

+{{- define "kubevela-apiserver.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubevela.name" . }}-apiserver
+app.kubernetes.io/instance: {{ .Release.Name }}-apiserver
+{{- end -}}
+
 {{- define "kubevela-cluster-gateway.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "kubevela.name" . }}-cluster-gateway
 app.kubernetes.io/instance: {{ .Release.Name }}-cluster-gateway
--- a/charts/vela-core/templates/addon/fluxcd-def.yaml
+++ b/charts/vela-core/templates/addon/fluxcd-def.yaml
@@ -1,268 +0,0 @@
-{{- if .Values.enableFluxcdAddon -}}
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  labels:
-    addons.oam.dev/name: fluxcd-def
-  name: addon-fluxcd-def
-  namespace: {{ .Release.Namespace }}
-spec:
-  components:
-    - name: fluxc-def-resources
-      properties:
-        objects:
-          - apiVersion: core.oam.dev/v1beta1
-            kind: ComponentDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: helm release is a group of K8s resources
-                  from either git repository or helm repo
-              name: helm
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "output: {\n\tapiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\tmetadata:
-                {\n\t\tname: context.name\n\t}\n\tif parameter.repoType == \"git\"
-                {\n\t\tkind: \"GitRepository\"\n\t\tspec: {\n\t\t\turl: parameter.url\n\t\t\tif
-                parameter.git.branch != _|_ {\n\t\t\t\tref: branch: parameter.git.branch\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
-                parameter.repoType == \"oss\" {\n\t\tkind: \"Bucket\"\n\t\tspec: {\n\t\t\tendpoint:
-                \  parameter.url\n\t\t\tbucketName: parameter.oss.bucketName\n\t\t\tprovider:
-                \  parameter.oss.provider\n\t\t\tif parameter.oss.region != _|_ {\n\t\t\t\tregion:
-                parameter.oss.region\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
-                parameter.repoType == \"helm\" {\n\t\tkind: \"HelmRepository\"\n\t\tspec:
-                {\n\t\t\turl: parameter.url\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n}\n\noutputs:
-                release: {\n\tapiVersion: \"helm.toolkit.fluxcd.io/v2beta1\"\n\tkind:
-                \      \"HelmRelease\"\n\tmetadata: {\n\t\tname: context.name\n\t}\n\tspec:
-                {\n\t\ttimeout: parameter.installTimeout\n\t\tinterval: parameter.interval\n\t\tchart:
-                {\n\t\t\tspec: {\n\t\t\t\tchart:   parameter.chart\n\t\t\t\tversion:
-                parameter.version\n\t\t\t\tsourceRef: {\n\t\t\t\t\tif parameter.repoType
-                == \"git\" {\n\t\t\t\t\t\tkind: \"GitRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
-                parameter.repoType == \"helm\" {\n\t\t\t\t\t\tkind: \"HelmRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
-                parameter.repoType == \"oss\" {\n\t\t\t\t\t\tkind: \"Bucket\"\n\t\t\t\t\t}\n\t\t\t\t\tname:
-                \     context.name\n\t\t\t\t}\n\t\t\t\tinterval: parameter.interval\n\t\t\t}\n\t\t}\n\t\tif
-                parameter.targetNamespace != _|_ {\n\t\t\ttargetNamespace: parameter.targetNamespace\n\t\t}\n\t\tif
-                parameter.releaseName != _|_ {\n\t\t\treleaseName: parameter.releaseName\n\t\t}\n\t\tif
-                parameter.values != _|_ {\n\t\t\tvalues: parameter.values\n\t\t}\n\t}\n}\n\n_secret:
-                {\n\tif parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname:
-                parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs: {\n\tinterval:
-                parameter.pullInterval\n\tif parameter.timeout != _|_ {\n\t\ttimeout:
-                parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType: *\"helm\" |
-                \"git\" | \"oss\"\n\t// +usage=The interval at which to check for
-                repository/bucket and relese updates, default to 5m\n\tpullInterval:
-                *\"5m\" | string\n        // +usage=The  Interval at which to reconcile
-                the Helm release, default to 30s\n        interval: *\"30s\" | string\n\t//
-                +usage=The Git or Helm repository URL, OSS endpoint, accept HTTP/S
-                or SSH address as git url,\n\turl: string\n\t// +usage=The name of
-                the secret containing authentication credentials\n\tsecretRef?: string\n\t//
-                +usage=The timeout for operations like download index/clone repository,
-                optional\n\ttimeout?: string\n\t// +usage=The timeout for operation
-                `helm install`, optional\n\tinstallTimeout: *\"10m\" | string\n\n\tgit?:
-                {\n\t\t// +usage=The Git reference to checkout and monitor for changes,
-                defaults to master branch\n\t\tbranch: string\n\t}\n\toss?: {\n\t\t//
-                +usage=The bucket's name, required if repoType is oss\n\t\tbucketName:
-                string\n\t\t// +usage=\"generic\" for Minio, Amazon S3, Google Cloud
-                Storage, Alibaba Cloud OSS, \"aws\" for retrieve credentials from
-                the EC2 service when credentials not specified, default \"generic\"\n\t\tprovider:
-                *\"generic\" | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
-                string\n\t}\n\n\t// +usage=1.The relative path to helm chart for git/oss
-                source. 2. chart name for helm resource 3. relative path for chart
-                package(e.g. ./charts/podinfo-1.2.3.tgz)\n\tchart: string\n\t// +usage=Chart
-                version\n\tversion: *\"*\" | string\n\t// +usage=The namespace for
-                helm chart, optional\n\ttargetNamespace?: string\n\t// +usage=The
-                release name\n\treleaseName?: string\n\t// +usage=Chart values\n\tvalues?:
-                #nestedmap\n}\n\n#nestedmap: {\n\t...\n}\n"
-              status:
-                customStatus: "repoMessage:    string\nreleaseMessage: string\nif context.output.status
-              == _|_ {\n\trepoMessage:    \"Fetching repository\"\n\treleaseMessage:
-              \"Wating repository ready\"\n}\nif context.output.status != _|_ {\n\trepoStatus:
-              context.output.status\n\tif repoStatus.conditions[0][\"type\"] != \"Ready\"
-              {\n\t\trepoMessage: \"Fetch repository fail\"\n\t}\n\tif repoStatus.conditions[0][\"type\"]
-              == \"Ready\" {\n\t\trepoMessage: \"Fetch repository successfully\"\n\t}\n\n\tif
-              context.outputs.release.status == _|_ {\n\t\treleaseMessage: \"Creating
-              helm release\"\n\t}\n\tif context.outputs.release.status != _|_ {\n\t\tif
-              context.outputs.release.status.conditions[0][\"message\"] == \"Release
-              reconciliation succeeded\" {\n\t\t\treleaseMessage: \"Create helm release
-              successfully\"\n\t\t}\n\t\tif context.outputs.release.status.conditions[0][\"message\"]
-              != \"Release reconciliation succeeded\" {\n\t\t\treleaseBasicMessage:
-              \"Delivery helm release in progress, message: \" + context.outputs.release.status.conditions[0][\"message\"]\n\t\t\tif
-              len(context.outputs.release.status.conditions) == 1 {\n\t\t\t\treleaseMessage:
-              releaseBasicMessage\n\t\t\t}\n\t\t\tif len(context.outputs.release.status.conditions)
-              > 1 {\n\t\t\t\treleaseMessage: releaseBasicMessage + \", \" + context.outputs.release.status.conditions[1][\"message\"]\n\t\t\t}\n\t\t}\n\t}\n\n}\nmessage:
-              repoMessage + \", \" + releaseMessage"
-                healthPolicy: 'isHealth: len(context.outputs.release.status.conditions)
-              != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
-              workload:
-                type: autodetects.core.oam.dev
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of JSON6902 patch to selected target
-              name: kustomize-json-patch
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
-                {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
-                +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
-                [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
-                | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
-                +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
-                source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
-                opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
-                +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
-                \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
-                \         string\n\tname?:               string\n\tannotationSelector?:
-                string\n\tlabelSelector?:      string\n}\n"
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of StrategicMerge or JSON6902 patch
-                  to selected target
-              name: kustomize-patch
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatches: parameter.patches\n\t}\n}\nparameter:
-                {\n\t// +usage=a list of StrategicMerge or JSON6902 patch to selected
-                target\n\tpatches: [...#patchItem]\n}\n\n// +usage=Contains a strategicMerge
-                or JSON6902 patch\n#patchItem: {\n\t// +usage=Inline patch string,
-                in yaml style\n\tpatch: string\n\t// +usage=Specify the target the
-                patch should be applied to\n\ttarget: #selector\n}\n\n// +usage=Selector
-                specifies a set of resources\n#selector: {\n\tgroup?:              string\n\tversion?:
-                \           string\n\tkind?:               string\n\tnamespace?:          string\n\tname?:
-                \              string\n\tannotationSelector?: string\n\tlabelSelector?:
-                \     string\n}\n"
-          - apiVersion: core.oam.dev/v1beta1
-            kind: ComponentDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: kustomize can fetching, building, updating
-                  and applying Kustomize manifests from git repo.
-              name: kustomize
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "output: {\n\tapiVersion: \"kustomize.toolkit.fluxcd.io/v1beta1\"\n\tkind:
-                \      \"Kustomization\"\n\tmetadata: {\n\t\tname: context.name\n
-                \   namespace: context.namespace\n\t}\n\tspec: {\n\t\tinterval: parameter.pullInterval\n\t\tsourceRef:
-                {\n\t\t\tif parameter.repoType == \"git\" {\n\t\t\t\tkind: \"GitRepository\"\n\t\t\t}\n\t\t\tif
-                parameter.repoType == \"oss\" {\n\t\t\t\tkind: \"Bucket\"\n\t\t\t}\n\t\t\tname:
-                \     context.name\n\t\t\tnamespace: context.namespace\n\t\t}\n\t\tpath:
-                \      parameter.path\n\t\tprune:      true\n\t\tvalidation: \"client\"\n\t}\n}\n\noutputs:
-                {\n  repo: {\n\t  apiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\t
-                \ metadata: {\n\t\t  name: context.name\n      namespace: context.namespace\n\t
-                \ }\n\t  if parameter.repoType == \"git\" {\n\t\t  kind: \"GitRepository\"\n\t\t
-                \ spec: {\n\t\t\t  url: parameter.url\n\t\t\t  if parameter.git.branch
-                != _|_ {\n\t\t\t\t  ref: branch: parameter.git.branch\n\t\t\t  }\n
-                \       if parameter.git.provider != _|_ {\n          if parameter.git.provider
-                == \"GitHub\" {\n            gitImplementation: \"go-git\"\n          }\n
-                \         if parameter.git.provider == \"AzureDevOps\" {\n            gitImplementation:
-                \"libgit2\"\n          }\n        }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t
-                \ }\n\t  }\n\t  if parameter.repoType == \"oss\" {\n\t\t  kind: \"Bucket\"\n\t\t
-                \ spec: {\n\t\t\t  endpoint:   parameter.url\n\t\t\t  bucketName:
-                parameter.oss.bucketName\n\t\t\t  provider:   parameter.oss.provider\n\t\t\t
-                \ if parameter.oss.region != _|_ {\n\t\t\t\t  region: parameter.oss.region\n\t\t\t
-                \ }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t  }\n\t  }\n
-                \ }\n\n  if parameter.imageRepository != _|_ {\n    imageRepo: {\n
-                \     apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n      kind:
-                \"ImageRepository\"\n\t    metadata: {\n\t\t    name: context.name\n
-                \       namespace: context.namespace\n\t    }\n      spec: {\n        image:
-                parameter.imageRepository.image\n        interval: parameter.pullInterval\n
-                \       if parameter.imageRepository.secretRef != _|_ {\n          secretRef:
-                name: parameter.imageRepository.secretRef\n        }\n      }\n    }\n\n
-                \   imagePolicy: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
-                \     kind: \"ImagePolicy\"\n\t    metadata: {\n\t\t    name: context.name\n
-                \       namespace: context.namespace\n\t    }\n      spec: {\n        imageRepositoryRef:
-                name: context.name\n        policy: parameter.imageRepository.policy\n
-                \       if parameter.imageRepository.filterTags != _|_ {\n          filterTags:
-                parameter.imageRepository.filterTags\n        }\n      }\n    }\n\n
-                \   imageUpdate: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
-                \     kind: \"ImageUpdateAutomation\"\n\t    metadata: {\n\t\t    name:
-                context.name\n        namespace: context.namespace\n\t    }\n      spec:
-                {\n        interval: parameter.pullInterval\n        sourceRef: {\n
-                \         kind: \"GitRepository\"\n          name: context.name\n
-                \       }\n        git: {\n          checkout: ref: branch: parameter.git.branch\n
-                \         commit: {\n            author: {\n              email: \"kubevelabot@users.noreply.github.com\"\n
-                \             name: \"kubevelabot\"\n            }\n            if
-                parameter.imageRepository.commitMessage != _|_ {\n              messageTemplate:
-                \"Update image automatically.\\n\" + parameter.imageRepository.commitMessage\n
-                \           }\n            if parameter.imageRepository.commitMessage
-                == _|_ {\n              messageTemplate: \"Update image automatically.\"\n
-                \           }\n          }\n          push: branch: parameter.git.branch\n
-                \       }\n        update: {\n          path:\tparameter.path\n          strategy:
-                \"Setters\"\n        }\n      }\n    }\n  }\n}\n\n_secret: {\n\tif
-                parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname: parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs:
-                {\n\tinterval: parameter.pullInterval\n\tif parameter.timeout != _|_
-                {\n\t\ttimeout: parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType:
-                *\"git\" | \"oss\"\n  // +usage=The image repository for automatically
-                update image to git\n  imageRepository?: {\n    // +usage=The image
-                url\n    image: string\n    // +usage=The name of the secret containing
-                authentication credentials\n    secretRef?: string\n    // +usage=Policy
-                gives the particulars of the policy to be followed in selecting the
-                most recent image.\n    policy: {\n      // +usage=Alphabetical set
-                of rules to use for alphabetical ordering of the tags.\n      alphabetical?:
-                {\n        // +usage=Order specifies the sorting order of the tags.\n
-                \       // +usage=Given the letters of the alphabet as tags, ascending
-                order would select Z, and descending order would select A.\n        order?:
-                \"asc\" | \"desc\"\n      }\n      // +usage=Numerical set of rules
-                to use for numerical ordering of the tags.\n      numerical?: {\n
-                \       // +usage=Order specifies the sorting order of the tags.\n
-                \       // +usage=Given the integer values from 0 to 9 as tags, ascending
-                order would select 9, and descending order would select 0.\n        order:
-                \"asc\" | \"desc\"\n      }\n      // +usage=SemVer gives a semantic
-                version range to check against the tags available.\n      semver?:
-                {\n        // +usage=Range gives a semver range for the image tag;
-                the highest version within the range that's a tag yields the latest
-                image.\n        range: string\n      }\n    }\n    // +usage=FilterTags
-                enables filtering for only a subset of tags based on a set of rules.
-                If no rules are provided, all the tags from the repository will be
-                ordered and compared.\n    filterTags?: {\n      // +usage=Extract
-                allows a capture group to be extracted from the specified regular
-                expression pattern, useful before tag evaluation.\n      extract?:
-                string\n      // +usage=Pattern specifies a regular expression pattern
-                used to filter for image tags.\n      pattern?: string\n    }\n    //
-                +usage=The image url\n    commitMessage?: string\n  }\n\t// +usage=The
-                interval at which to check for repository/bucket and release updates,
-                default to 5m\n\tpullInterval: *\"5m\" | string\n\t// +usage=The Git
-                or Helm repository URL, OSS endpoint, accept HTTP/S or SSH address
-                as git url,\n\turl: string\n\t// +usage=The name of the secret containing
-                authentication credentials\n\tsecretRef?: string\n\t// +usage=The
-                timeout for operations like download index/clone repository, optional\n\ttimeout?:
-                string\n\tgit?: {\n\t\t// +usage=The Git reference to checkout and
-                monitor for changes, defaults to master branch\n\t\tbranch: string\n
-                \   // +usage=Determines which git client library to use. Defaults
-                to GitHub, it will pick go-git. AzureDevOps will pick libgit2.\n    provider?:
-                *\"GitHub\" | \"AzureDevOps\"\n\t}\n\toss?: {\n\t\t// +usage=The bucket's
-                name, required if repoType is oss\n\t\tbucketName: string\n\t\t//
-                +usage=\"generic\" for Minio, Amazon S3, Google Cloud Storage, Alibaba
-                Cloud OSS, \"aws\" for retrieve credentials from the EC2 service when
-                credentials not specified, default \"generic\"\n\t\tprovider: *\"generic\"
-                | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
-                string\n\t}\n\t//+usage=Path to the directory containing the kustomization.yaml
-                file, or the set of plain YAMLs a kustomization.yaml should be generated
-                for.\n\tpath: string\n}"
-              workload:
-                type: autodetects.core.oam.dev
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of strategic merge to kustomize
-                  config
-              name: kustomize-strategy-merge
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatchesStrategicMerge: parameter.patchesStrategicMerge\n\t}\n}\n\nparameter:
-                {\n\t// +usage=a list of strategicmerge, defined as inline yaml objects.\n\tpatchesStrategicMerge:
-                [...#nestedmap]\n}\n\n#nestedmap: {\n\t...\n}\n"
-      type: k8s-objects
-
-  {{- end }}
--- a/charts/vela-core/templates/addon/fluxcd.yaml
+++ b/charts/vela-core/templates/addon/fluxcd.yaml
--- a/charts/vela-core/templates/addon_registry.yaml
+++ b/charts/vela-core/templates/addon_registry.yaml
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vela-addon-registry
-  namespace: {{ .Release.Namespace }}
-data:
-  registries: '{
-  "KubeVela":{
-    "name": "KubeVela",
-    "oss": {
-      "end_point": "https://addons.kubevela.net",
-      "bucket": "",
-      "path": ""
-    }
-  }
-}'
--- a/charts/vela-core/templates/addons/fluxcd.yaml
+++ b/charts/vela-core/templates/addons/fluxcd.yaml
--- a/charts/vela-core/templates/addons/istio.yaml
+++ b/charts/vela-core/templates/addons/istio.yaml
@@ -0,0 +1,264 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
+          traffic.
+      name: istio
+      namespace: istio-system
+    spec:
+      components:
+      - name: ns-istio-system
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: istio-system
+        type: raw
+      - name: istio
+        properties:
+          chart: istio
+          repoType: helm
+          url: https://charts.kubevela.net/addons
+          version: 1.11.1
+        type: helm
+      - name: canary-rollout
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: WorkflowStepDefinition
+          metadata:
+            name: canary-rollout
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: |-
+                  import ("vela/op")
+
+                  parameter: {
+                          batchPartition: int
+                          traffic: weightedTargets: [...{
+                                  revision: string
+                                  weight:   int
+                          }]
+                  }
+
+                  comps__: op.#Load
+                  compNames__: [ for name, c in comps__.value {name}]
+                  comp__: compNames__[0]
+
+                  apply: op.#ApplyComponent & {
+                          value: comps__.value[comp__]
+                          patch: {
+                                  traits: "rollout": {
+                                         spec: rolloutPlan: batchPartition: parameter.batchPartition
+                                  }
+
+                                  traits: "virtualService": {
+                                          spec:
+                                             // +patchStrategy=retainKeys
+                                             http: [
+                                                  {
+                                                          route: [
+                                                                  for i, t in parameter.traffic.weightedTargets {
+                                                                          destination: {
+                                                                                  host:   comp__
+                                                                                  subset: t.revision
+                                                                          }
+                                                                          weight: t.weight
+                                                                  }]
+                                                  },
+                                          ]
+                                  }
+
+                                  traits: "destinationRule": {
+                                           // +patchStrategy=retainKeys
+                                           spec: {
+                                             host: comp__
+                                             subsets: [
+                                                  for i, t in parameter.traffic.weightedTargets {
+                                                          name: t.revision
+                                                          labels: {"app.oam.dev/revision": t.revision}
+                                                  },
+                                          ]}
+                                  }
+                          }
+                  }
+
+                  applyRemaining: op.#ApplyRemaining & {
+                      exceptions: [comp__]
+                  }
+        type: raw
+      - name: istio-gateway
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: use istio to manage in-cluster traffic
+            name: istio-gateway
+            namespace: vela-system
+          spec:
+            appliesToWorkloads:
+            - deployments.apps
+            podDisruptive: true
+            schematic:
+              cue:
+                template: "\noutputs: gateway: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
+                  \   kind: \"Gateway\"\n    metadata: {\n        name:      context.name\n
+                  \       namespace: context.namespace\n    }\n    spec: {\n      selector:
+                  {\n        istio: parameter.gateway\n      }\n      servers: [{\n         hosts:
+                  parameter.hosts\n         port: {\n              name: \"http\"\n              number:
+                  80\n              protocol: \"HTTP\"\n         }\n      }]\n    }\n}\n\noutputs:
+                  virtualService: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
+                  \   kind: \"VirtualService\"\n    metadata: {\n         name:      context.name\n
+                  \        namespace: context.namespace\n    }\n    spec: {\n       gateways:
+                  [context.name]\n       hosts: parameter.hosts\n       http:[{\n       match:
+                  [ for i, u in parameter.match { uri: u} ]\n       route: [{destination:
+                  {\n           host: context.name\n           port: number: parameter.port\n
+                  \      }}]\n       }]\n    }\n}\n\nparameter: {\n    hosts: [string]\n
+                  \   gateway: *\"ingressgateway\"|string\n    match: [...#uri]\n    port:
+                  int\n}\n\n#uri: {\n   exact?: string\n   prefix?: string\n} \n"
+        type: raw
+      - name: canary-rollback
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: WorkflowStepDefinition
+          metadata:
+            name: canary-rollback
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: |-
+                  import ("vela/op")
+
+                  parameter: {...}
+
+                  comps: op.#Load
+                  compNames: [ for name, c in comps.value {name}]
+                  firstcomp: compNames[0]
+
+                  rolloutObj: op.#Read & {
+                    value: {
+                      apiVersion: "standard.oam.dev/v1alpha1"
+                      kind:       "Rollout"
+                      metadata: {
+                        name:      firstcomp
+                        namespace: context.namespace
+                      }
+                    }
+                  }
+
+                  _sourceRevision: rolloutObj.value.status.LastSourceRevision
+
+                  apply: op.#ApplyComponent & {
+                    value: comps.value[firstcomp]
+                    patch: {
+                      traits: "rollout": {
+                        spec: {
+                          targetRevisionName: _sourceRevision
+                        }
+                      }
+
+                      traits: "virtualService": {
+                        spec:
+                          // +patchStrategy=retainKeys
+                          http: [
+                            {
+                              route: [{
+                                destination: {
+                                  host:   firstcomp
+                                  subset: _sourceRevision
+                                }
+                                weight: 100
+                              }]
+                            },
+                          ]
+                      }
+
+                      traits: "destinationRule": {
+                        // +patchStrategy=retainKeys
+                        spec: {
+                          host: firstcomp
+                          subsets: [
+                            {
+                              name: _sourceRevision
+                              labels: {"app.oam.dev/revision": _sourceRevision}
+                            },
+                          ]
+                        }
+                      }
+                    }
+                  }
+
+                  applyRemaining: op.#ApplyRemaining & {
+                      exceptions: [firstcomp]
+                  }
+        type: raw
+      - name: canary-traffic
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: use istio to manage traffic
+            name: canary-traffic
+            namespace: vela-system
+          spec:
+            appliesToWorkloads:
+            - deployments.apps
+            podDisruptive: true
+            schematic:
+              cue:
+                template: "outputs: service: {\n\t\tapiVersion: \"v1\"\n\t\tkind:       \"Service\"\n\t\tmetadata:
+                  name: context.name\n\t\tspec: {\n\t\t\tselector: \"app.oam.dev/component\":
+                  context.name\n\t\t\tports: [\n\t\t\t\tfor p in parameter.port {\n\t\t\t\t\tport:
+                  \      p\n\t\t\t\t\ttargetPort: p\n\t\t\t\t},\n\t\t\t]\n\t\t\ttype:
+                  \"ClusterIP\"\n\t\t}\n}\n\noutputs: virtualService: {\n    apiVersion:
+                  \"networking.istio.io/v1alpha3\"\n    kind: \"VirtualService\"\n    metadata:
+                  {\n        name:      context.name\n        namespace: context.namespace\n
+                  \   }\n    spec: {\n       hosts: [context.name]\n       http: [{route:
+                  [\n       {destination: {\n          host: context.name\n          port:
+                  {number: parameter.port[0]}\n       }}]}]\n    }\n}\n\noutputs: destinationRule:
+                  {\n       apiVersion: \"networking.istio.io/v1alpha3\"\n       kind:
+                  \"DestinationRule\"\n       metadata: {\n           name:      context.name\n
+                  \          namespace: context.namespace\n       }\n       spec: {\n
+                  \         host: context.name\n          subsets: [{\n             name:
+                  context.revision\n             labels: {\"app.oam.dev/revision\": context.revision}\n
+                  \         }]\n       }\n}\n\nparameter: {\n   port: [int]\n} \n"
+        type: raw
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-istio-system
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
+      traffic.
+    addons.oam.dev/name: istio
+  labels:
+    addons.oam.dev/type: istio
+  name: istio
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/keda.yaml
+++ b/charts/vela-core/templates/addons/keda.yaml
@@ -0,0 +1,44 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
+      name: keda
+      namespace: vela-system
+    spec:
+      components:
+      - name: keda
+        properties:
+          chart: keda
+          repoType: helm
+          url: https://kedacore.github.io/charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
+    addons.oam.dev/name: keda
+  labels:
+    addons.oam.dev/type: keda
+  name: keda
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/kruise.yaml
+++ b/charts/vela-core/templates/addons/kruise.yaml
@@ -0,0 +1,189 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
+          automations
+      name: kruise
+      namespace: vela-system
+    spec:
+      components:
+      - name: kruise
+        properties:
+          chart: ./charts/kruise/v0.9.0
+          git:
+            branch: master
+          repoType: git
+          url: https://github.com/openkruise/kruise
+          values:
+            featureGates: PreDownloadImageForInPlaceUpdate=true
+        type: helm
+      - name: cloneset
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Describes long-running, scalable, containerized
+                services that have a stable network endpoint to receive external network
+                traffic from customers. If workload type is skipped for any service defined
+                in Appfile, it will be defaulted to `webservice` type.
+            name: cloneset
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
+                  \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
+                  context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
+                  context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels: {\n\t\t\t\t\"app.oam.dev/component\":
+                  context.name\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:
+                  \ context.name\n\t\t\t\t\timage: parameter.image\n\n\t\t\t\t\tif parameter.cmd
+                  != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif
+                  parameter.args != _|_ {\n\t\t\t\t\t\targs: parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif
+                  parameter.env != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  context.config != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
+                  parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
+                  parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"] != _|_
+                  {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
+                  cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
+                  != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:   parameter.memory\n\t\t\t\t\t\t\trequests:
+                  memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
+                  parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle: {\n\t\t\t\t\t\tif
+                  parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart: exec: command:
+                  parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif parameter.preStop
+                  != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command: parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
+                  parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
+                  parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+                  [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
+                  parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
+                  parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter: {\n\t//
+                  +usage=Which image would you like to use for your service\n\t// +short=i\n\timage:
+                  string\n\n\t// +usage=Specify image pull policy for your service\n\timagePullPolicy?:
+                  string\n\n\t// +usage=Specify image pull secrets for your service\n\timagePullSecrets?:
+                  [...string]\n\n\t// +usage=Number of CPU units for the service, like
+                  `0.5` (0.5 CPU core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify
+                  the amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
+                  +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
+                  +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
+                  commands will be called immediately after a container is created.\n\tpostStart?:
+                  [...string]\n\n\t// +usage=PreStop is called immediately before a container
+                  is terminated due to an API request or management event such as liveness/startup
+                  probe failure, preemption, resource contention, etc. The handler is
+                  not called if the container crashes or exits. The reason for termination
+                  is passed to the handler. The Pod's termination grace period countdown
+                  begins before the PreStop hooked is executed. Regardless of the outcome
+                  of the handler, the container will eventually terminate within the Pod's
+                  termination grace period. Other management of the container blocks until
+                  the hook completes or until the termination grace period is reached.
+                  More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
+                  [...string]\n\n\t// +usage=Which port do you want customer traffic sent
+                  to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define arguments
+                  by using environment variables\n\tenv?: [...#ENV]\n\n\t// +usage=Cloneset
+                  updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
+                  string\n\n\t// +usage=HostAliases is a list of hosts and IPs that will
+                  be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
+                  [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for assessing
+                  whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
+                  +usage=Instructions for assessing whether the container is in a suitable
+                  state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
+                  {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
+                  value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
+                  a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
+                  +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
+                  {\n\t\t\t// +usage=The name of the secret in the pod's namespace to
+                  select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the secret
+                  to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
+                  {\n\n\t// +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.\n\texec?: {\n\t\t//
+                  +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.\n\t\tcommand: [...string]\n\t}\n\n\t//
+                  +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.\n\thttpGet?: {\n\t\t//
+                  +usage=The endpoint, relative to the port, to which the HTTP GET request
+                  should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
+                  within the container to which the HTTP GET request should be directed.\n\t\tport:
+                  int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
+                  +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.\n\ttcpSocket?: {\n\t\t// +usage=The
+                  TCP socket within the container that should be probed to assess container
+                  health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
+                  container is started before the first probe is initiated.\n\tinitialDelaySeconds:
+                  *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
+                  *10 | int\n\n\t// +usage=Number of seconds after which the probe times
+                  out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
+                  successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
+                  *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
+                  the container is not alive (liveness probe) or not ready (readiness
+                  probe).\n\tfailureThreshold: *3 | int\n} \n"
+            workload:
+              definition:
+                apiVersion: apps.kruise.io/v1alpha1
+                kind: CloneSet
+        type: raw
+      - name: predownloadimage
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: WorkflowStepDefinition
+          metadata:
+            name: predownloadimage
+          spec:
+            schematic:
+              cue:
+                template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
+                  int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
+                  *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
+                  int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
+                  op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
+                  \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
+                  \   }\n    spec: {\n      image: parameter.image\n      parallelism:
+                  parameter.parallel\n      selector: matchLabels: parameter.kvs\n      completionPolicy:
+                  {\n        type: parameter.type\n        activeDeadlineSeconds: parameter.activeDeadlineSeconds\n
+                  \       ttlSecondsAfterFinished: parameter.ttlSecondsAfterFinished\n
+                  \     }\n      pullPolicy: {\n        if parameter.backoffLimit != _|_
+                  {\n          backoffLimit: parameter.backoffLimit\n        }\n        if
+                  parameter.timeoutSeconds != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n
+                  \       }\n      }\n      pullSecrets: parameter.arr\n    }            \n
+                  \ }          \n} \n"
+        type: raw
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
+      automations
+    addons.oam.dev/name: kruise
+  labels:
+    addons.oam.dev/type: kruise
+  name: kruise
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/observability.yaml
+++ b/charts/vela-core/templates/addons/observability.yaml
@@ -0,0 +1,249 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: An out of the box solution for KubeVela observability
+      name: observability
+      namespace: vela-system
+    spec:
+      components:
+      - name: ns-observability
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: observability
+        type: raw
+      - name: import-grafana-dashboard-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Import dashboards to Grafana
+            name: import-grafana-dashboard
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
+                  {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:   *\"default\"
+                  | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
+                  *\"default\" | string\n\turls: [...string]\n}\n"
+        type: raw
+      - name: pure-ingress-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Enable public web traffic for the component
+                without creating a Service.
+            name: pure-ingress
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
+                  \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec: {\n\t\trules:
+                  [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths: [\n\t\t\t\t\tfor
+                  k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
+                  {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
+                  v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
+                  {\n\t// +usage=Specify the domain you want to expose\n\tdomain: string\n\n\t//
+                  +usage=Specify the mapping relationship between the http path and the
+                  workload port\n\thttp: [string]: int\n}\n"
+            status:
+              customStatus: |-
+                let igs = context.outputs.ingress.status.loadBalancer.ingress
+                if igs == _|_ {
+                  message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+                }
+                if len(igs) > 0 {
+                  if igs[0].ip != _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+                  }
+                  if igs[0].ip == _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+                  }
+                }
+              healthPolicy: |
+                isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+        type: raw
+      - name: register-grafana-datasource-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Add a datasource to Grafana
+            name: register-grafana-datasource
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
+                  \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
+                  \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
+                  parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
+                  \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
+                  \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
+                  \                     string\n\taccess:                    *\"proxy\"
+                  | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
+                  | string\n}\n"
+        type: raw
+      - name: grafana-registration
+        properties:
+          chart: ./chart
+          git:
+            branch: master
+          repoType: git
+          targetNamespace: observability
+          url: https://github.com/oam-dev/grafana-registration
+          values:
+            replicaCount: 1
+        type: helm
+      - name: grafana
+        properties:
+          chart: grafana
+          releaseName: grafana
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          version: 6.14.1
+        traits:
+        - properties:
+            domain: '[[ index .Args "grafana-domain" ]]'
+            http:
+              /: 80
+          type: pure-ingress
+        - properties:
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            urls:
+            - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
+            - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
+            - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
+            - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
+          type: import-grafana-dashboard
+        type: helm
+      - name: loki
+        properties:
+          chart: loki-stack
+          releaseName: loki
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          version: 2.4.1
+        traits:
+        - properties:
+            access: proxy
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            name: loki
+            namespace: observability
+            service: loki
+            type: loki
+          type: register-grafana-datasource
+        type: helm
+      - name: prometheus-server
+        properties:
+          chart: prometheus
+          releaseName: prometheus
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          values:
+            alertmanager:
+              persistentVolume:
+                enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
+                size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
+                storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
+            server:
+              persistentVolume:
+                enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
+                size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
+                storageClass: '[[ index .Args "server-pvc-class" ]]'
+          version: 14.4.1
+        traits:
+        - properties:
+            access: proxy
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            name: prometheus
+            namespace: observability
+            service: prometheus-server
+            type: prometheus
+          type: register-grafana-datasource
+        type: helm
+      - name: kube-state-metrics
+        properties:
+          chart: kube-state-metrics
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          values:
+            image:
+              repository: oamdev/kube-state-metrics
+              tag: v2.1.0
+          version: 3.4.1
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-observability
+          type: apply-component
+        - name: apply-trait-1
+          properties:
+            component: import-grafana-dashboard-traitdef
+          type: apply-component
+        - name: apply-trait-2
+          properties:
+            component: pure-ingress-traitdef
+          type: apply-component
+        - name: apply-trait-3
+          properties:
+            component: register-grafana-datasource-traitdef
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: An out of the box solution for KubeVela observability
+    addons.oam.dev/name: observability
+  labels:
+    addons.oam.dev/type: observability
+  name: observability
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/ocm-cluster-manager.yaml
+++ b/charts/vela-core/templates/addons/ocm-cluster-manager.yaml
@@ -0,0 +1,522 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: ocm-cluster-manager can deploy an OCM hub cluster
+          environment.
+      name: ocm-cluster-manager
+      namespace: vela-system
+    spec:
+      components:
+      - name: ns-open-cluster-management
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: open-cluster-management
+        type: raw
+      - name: cluster-manager-role-binding
+        properties:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRoleBinding
+          metadata:
+            name: cluster-manager-role-binding
+          roleRef:
+            apiGroup: rbac.authorization.k8s.io
+            kind: ClusterRole
+            name: cluster-manager-cluster-role
+          subjects:
+          - kind: ServiceAccount
+            name: cluster-manager-service-account
+            namespace: open-cluster-management
+        type: raw
+      - name: cluster-manager-cluster-role
+        properties:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          metadata:
+            name: cluster-manager-cluster-role
+          rules:
+          - apiGroups:
+            - ""
+            resources:
+            - configmaps
+            - namespaces
+            - serviceaccounts
+            - services
+            - secrets
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - ""
+            resources:
+            - nodes
+            verbs:
+            - get
+            - list
+            - watch
+          - apiGroups:
+            - authorization.k8s.io
+            resources:
+            - subjectaccessreviews
+            verbs:
+            - create
+          - apiGroups:
+            - ""
+            - events.k8s.io
+            resources:
+            - events
+            verbs:
+            - create
+            - patch
+            - update
+          - apiGroups:
+            - apps
+            resources:
+            - deployments
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - rbac.authorization.k8s.io
+            resources:
+            - clusterrolebindings
+            - rolebindings
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - rbac.authorization.k8s.io
+            resources:
+            - clusterroles
+            - roles
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+            - escalate
+            - bind
+          - apiGroups:
+            - apiextensions.k8s.io
+            resources:
+            - customresourcedefinitions
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - apiregistration.k8s.io
+            resources:
+            - apiservices
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - admissionregistration.k8s.io
+            resources:
+            - validatingwebhookconfigurations
+            - mutatingwebhookconfigurations
+            verbs:
+            - create
+            - get
+            - list
+            - update
+            - watch
+            - patch
+            - delete
+          - apiGroups:
+            - operator.open-cluster-management.io
+            resources:
+            - clustermanagers
+            verbs:
+            - get
+            - list
+            - watch
+            - update
+            - delete
+          - apiGroups:
+            - operator.open-cluster-management.io
+            resources:
+            - clustermanagers/status
+            verbs:
+            - update
+            - patch
+        type: raw
+      - name: cluster-manager-service-account
+        properties:
+          apiVersion: v1
+          kind: ServiceAccount
+          metadata:
+            name: cluster-manager-service-account
+            namespace: open-cluster-management
+        type: raw
+      - name: clustermanagers.operator.open-cluster-management.io
+        properties:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: clustermanagers.operator.open-cluster-management.io
+          spec:
+            group: operator.open-cluster-management.io
+            names:
+              kind: ClusterManager
+              listKind: ClusterManagerList
+              plural: clustermanagers
+              singular: clustermanager
+            preserveUnknownFields: false
+            scope: Cluster
+            versions:
+            - name: v1
+              schema:
+                openAPIV3Schema:
+                  description: ClusterManager configures the controllers on the hub that
+                    govern registration and work distribution for attached Klusterlets.
+                    ClusterManager will only be deployed in open-cluster-management-hub
+                    namespace.
+                  properties:
+                    apiVersion:
+                      description: 'APIVersion defines the versioned schema of this representation
+                        of an object. Servers should convert recognized schemas to the
+                        latest internal value, and may reject unrecognized values. More
+                        info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                      type: string
+                    kind:
+                      description: 'Kind is a string value representing the REST resource
+                        this object represents. Servers may infer this from the endpoint
+                        the client submits requests to. Cannot be updated. In CamelCase.
+                        More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    metadata:
+                      type: object
+                    spec:
+                      description: Spec represents a desired deployment configuration
+                        of controllers that govern registration and work distribution
+                        for attached Klusterlets.
+                      properties:
+                        placementImagePullSpec:
+                          default: quay.io/open-cluster-management/placement
+                          description: PlacementImagePullSpec represents the desired image
+                            configuration of placement controller/webhook installed on
+                            hub.
+                          type: string
+                        registrationImagePullSpec:
+                          default: quay.io/open-cluster-management/registration
+                          description: RegistrationImagePullSpec represents the desired
+                            image of registration controller/webhook installed on hub.
+                          type: string
+                        workImagePullSpec:
+                          default: quay.io/open-cluster-management/work
+                          description: WorkImagePullSpec represents the desired image
+                            configuration of work controller/webhook installed on hub.
+                          type: string
+                      type: object
+                    status:
+                      description: Status represents the current status of controllers
+                        that govern the lifecycle of managed clusters.
+                      properties:
+                        conditions:
+                          description: 'Conditions contain the different condition statuses
+                            for this ClusterManager. Valid condition types are: Applied:
+                            Components in hub are applied. Available: Components in hub
+                            are available and ready to serve. Progressing: Components
+                            in hub are in a transitioning state. Degraded: Components
+                            in hub do not match the desired configuration and only provide
+                            degraded service.'
+                          items:
+                            description: "Condition contains details for one aspect of
+                              the current state of this API Resource. --- This struct
+                              is intended for direct use as an array at the field path
+                              .status.conditions.  For example, type FooStatus struct{
+                              \    // Represents the observations of a foo's current state.
+                              \    // Known .status.conditions.type are: \"Available\",
+                              \"Progressing\", and \"Degraded\"     // +patchMergeKey=type
+                              \    // +patchStrategy=merge     // +listType=map     //
+                              +listMapKey=type     Conditions []metav1.Condition `json:\"conditions,omitempty\"
+                              patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
+                              \n     // other fields }"
+                            properties:
+                              lastTransitionTime:
+                                description: lastTransitionTime is the last time the condition
+                                  transitioned from one status to another. This should
+                                  be when the underlying condition changed.  If that is
+                                  not known, then using the time when the API field changed
+                                  is acceptable.
+                                format: date-time
+                                type: string
+                              message:
+                                description: message is a human readable message indicating
+                                  details about the transition. This may be an empty string.
+                                maxLength: 32768
+                                type: string
+                              observedGeneration:
+                                description: observedGeneration represents the .metadata.generation
+                                  that the condition was set based upon. For instance,
+                                  if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration
+                                  is 9, the condition is out of date with respect to the
+                                  current state of the instance.
+                                format: int64
+                                minimum: 0
+                                type: integer
+                              reason:
+                                description: reason contains a programmatic identifier
+                                  indicating the reason for the condition's last transition.
+                                  Producers of specific condition types may define expected
+                                  values and meanings for this field, and whether the
+                                  values are considered a guaranteed API. The value should
+                                  be a CamelCase string. This field may not be empty.
+                                maxLength: 1024
+                                minLength: 1
+                                pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                                type: string
+                              status:
+                                description: status of the condition, one of True, False,
+                                  Unknown.
+                                enum:
+                                - "True"
+                                - "False"
+                                - Unknown
+                                type: string
+                              type:
+                                description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                                  --- Many .condition.type values are consistent across
+                                  resources like Available, but because arbitrary conditions
+                                  can be useful (see .node.status.conditions), the ability
+                                  to deconflict is important. The regex it matches is
+                                  (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                                maxLength: 316
+                                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                                type: string
+                            required:
+                            - lastTransitionTime
+                            - message
+                            - reason
+                            - status
+                            - type
+                            type: object
+                          type: array
+                        generations:
+                          description: Generations are used to determine when an item
+                            needs to be reconciled or has changed in a way that needs
+                            a reaction.
+                          items:
+                            description: GenerationStatus keeps track of the generation
+                              for a given resource so that decisions about forced updates
+                              can be made. The definition matches the GenerationStatus
+                              defined in github.com/openshift/api/v1
+                            properties:
+                              group:
+                                description: group is the group of the resource that you're
+                                  tracking
+                                type: string
+                              lastGeneration:
+                                description: lastGeneration is the last generation of
+                                  the resource that controller applies
+                                format: int64
+                                type: integer
+                              name:
+                                description: name is the name of the resource that you're
+                                  tracking
+                                type: string
+                              namespace:
+                                description: namespace is where the resource that you're
+                                  tracking is
+                                type: string
+                              resource:
+                                description: resource is the resource type of the resource
+                                  that you're tracking
+                                type: string
+                              version:
+                                description: version is the version of the resource that
+                                  you're tracking
+                                type: string
+                            type: object
+                          type: array
+                        observedGeneration:
+                          description: ObservedGeneration is the last generation change
+                            you've dealt with
+                          format: int64
+                          type: integer
+                        relatedResources:
+                          description: RelatedResources are used to track the resources
+                            that are related to this ClusterManager.
+                          items:
+                            description: RelatedResourceMeta represents the resource that
+                              is managed by an operator
+                            properties:
+                              group:
+                                description: group is the group of the resource that you're
+                                  tracking
+                                type: string
+                              name:
+                                description: name is the name of the resource that you're
+                                  tracking
+                                type: string
+                              namespace:
+                                description: namespace is where the thing you're tracking
+                                  is
+                                type: string
+                              resource:
+                                description: resource is the resource type of the resource
+                                  that you're tracking
+                                type: string
+                              version:
+                                description: version is the version of the thing you're
+                                  tracking
+                                type: string
+                            type: object
+                          type: array
+                      type: object
+                  type: object
+              served: true
+              storage: true
+              subresources:
+                status: {}
+          status:
+            acceptedNames:
+              kind: ""
+              plural: ""
+            conditions: []
+            storedVersions: []
+        type: raw
+      - name: cluster-manager-hub
+        properties:
+          apiVersion: operator.open-cluster-management.io/v1
+          kind: ClusterManager
+          metadata:
+            name: cluster-manager-hub
+          spec:
+            placementImagePullSpec: quay.io/open-cluster-management/placement
+            registrationImagePullSpec: quay.io/open-cluster-management/registration
+            workImagePullSpec: quay.io/open-cluster-management/work
+        type: raw
+      - name: cluster-manager-controller
+        properties:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            labels:
+              app: cluster-manager
+            name: cluster-manager-controller
+            namespace: open-cluster-management
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                app: cluster-manager
+            template:
+              metadata:
+                labels:
+                  app: cluster-manager
+              spec:
+                affinity:
+                  podAntiAffinity:
+                    preferredDuringSchedulingIgnoredDuringExecution:
+                    - podAffinityTerm:
+                        labelSelector:
+                          matchExpressions:
+                          - key: app
+                            operator: In
+                            values:
+                            - cluster-manager
+                        topologyKey: failure-domain.beta.kubernetes.io/zone
+                      weight: 70
+                    - podAffinityTerm:
+                        labelSelector:
+                          matchExpressions:
+                          - key: app
+                            operator: In
+                            values:
+                            - cluster-manager
+                        topologyKey: kubernetes.io/hostname
+                      weight: 30
+                containers:
+                - args:
+                  - /registration-operator
+                  - hub
+                  image: quay.io/open-cluster-management/registration-operator:latest
+                  imagePullPolicy: IfNotPresent
+                  livenessProbe:
+                    httpGet:
+                      path: /healthz
+                      port: 8443
+                      scheme: HTTPS
+                    initialDelaySeconds: 2
+                    periodSeconds: 10
+                  name: registration-operator
+                  readinessProbe:
+                    httpGet:
+                      path: /healthz
+                      port: 8443
+                      scheme: HTTPS
+                    initialDelaySeconds: 2
+                  resources:
+                    requests:
+                      cpu: 10m
+                      memory: 128Mi
+                  securityContext:
+                    allowPrivilegeEscalation: false
+                    capabilities:
+                      drop:
+                      - ALL
+                    privileged: false
+                    runAsNonRoot: true
+                serviceAccountName: cluster-manager-service-account
+        type: raw
+      workflow:
+        steps:
+        - name: apply-ns
+          properties:
+            component: ns-open-cluster-management
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: ocm-cluster-manager can deploy an OCM hub cluster
+      environment.
+    addons.oam.dev/name: ocm-cluster-manager
+  labels:
+    addons.oam.dev/type: ocm-cluster-manager
+  name: ocm-cluster-manager
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/prometheus.yaml
+++ b/charts/vela-core/templates/addons/prometheus.yaml
@@ -0,0 +1,46 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Prometheus is an open-source systems monitoring and
+          alerting toolkit
+      name: prometheus
+      namespace: vela-system
+    spec:
+      components:
+      - name: prometheus
+        properties:
+          chart: premetheus
+          repoType: helm
+          url: https://prometheus-community.github.io/helm-charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Prometheus is an open-source systems monitoring and
+      alerting toolkit
+    addons.oam.dev/name: prometheus
+  labels:
+    addons.oam.dev/type: prometheus
+  name: prometheus
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml
+++ b/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml
@@ -0,0 +1,61 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
+        addons.oam.dev/name: terraform/provider-alibaba
+      name: terraform-provider-alibaba
+      namespace: default
+    spec:
+      components:
+      - name: alibaba-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: alibaba-account-creds
+            namespace: vela-system
+          stringData:
+            credentials: |
+              accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
+              accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
+              securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
+          type: Opaque
+        type: raw
+      - name: default
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: default
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
+                name: alibaba-account-creds
+                namespace: vela-system
+              source: Secret
+            provider: alibaba
+            region: '[[ index .Args "ALICLOUD_REGION" ]]'
+        type: raw
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
+    addons.oam.dev/name: terraform/provider-alibaba
+  labels:
+    addons.oam.dev/type: terraform-provider-alibaba
+  name: terraform-provider-alibaba
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/terraform-provider-aws.yaml
+++ b/charts/vela-core/templates/addons/terraform-provider-aws.yaml
@@ -0,0 +1,61 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Kubernetes Terraform Controller for AWS
+        addons.oam.dev/name: terraform/provider-aws
+      name: terraform-provider-aws
+      namespace: default
+    spec:
+      components:
+      - name: aws-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: aws-account-creds
+            namespace: vela-system
+          stringData:
+            credentials: |
+              awsAccessKeyID: [[ index .Args "AWS_ACCESS_KEY_ID" ]]
+              awsSecretAccessKey: [[ index .Args "AWS_SECRET_ACCESS_KEY" ]]
+              awsSessionToken: [[ index .Args "AWS_SESSION_TOKEN" ]]
+          type: Opaque
+        type: raw
+      - name: aws
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: aws
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
+                name: aws-account-creds
+                namespace: vela-system
+              source: Secret
+            provider: aws
+            region: '[[ index .Args "AWS_DEFAULT_REGION" ]]'
+        type: raw
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kubernetes Terraform Controller for AWS
+    addons.oam.dev/name: terraform/provider-aws
+  labels:
+    addons.oam.dev/type: terraform-provider-aws
+  name: terraform-provider-aws
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/terraform-provider-azure.yaml
+++ b/charts/vela-core/templates/addons/terraform-provider-azure.yaml
@@ -0,0 +1,61 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Kubernetes Terraform Controller for Azure
+        addons.oam.dev/name: terraform/provider-azure
+      name: terraform-provider-azure
+      namespace: default
+    spec:
+      components:
+      - name: azure-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: azure-account-creds
+            namespace: vela-system
+          stringData:
+            credentials: |
+              armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
+              armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
+              armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
+              armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
+          type: Opaque
+        type: raw
+      - name: azure
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: azure
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
+                name: azure-account-creds
+                namespace: vela-system
+              source: Secret
+            provider: azure
+        type: raw
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kubernetes Terraform Controller for Azure
+    addons.oam.dev/name: terraform/provider-azure
+  labels:
+    addons.oam.dev/type: terraform-provider-azure
+  name: terraform-provider-azure
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/charts/vela-core/templates/addons/terraform.yaml
+++ b/charts/vela-core/templates/addons/terraform.yaml
@@ -0,0 +1,362 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
+          Terraform.
+      name: terraform
+      namespace: vela-system
+    spec:
+      components:
+      - name: ns-terraform-system
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: terraform-system
+        type: raw
+      - name: terraform-controller
+        properties:
+          chart: terraform-controller
+          repoType: helm
+          url: https://charts.kubevela.net/addons
+          version: 0.2.6
+        type: helm
+      - name: alibaba-ack
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                ACK cluster
+            labels:
+              type: terraform
+            name: alibaba-ack
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: https://github.com/kubevela-contrib/terraform-modules.git
+                path: alibaba/cs/dedicated-kubernetes
+                type: remote
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-eip
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                Elastic IP
+            labels:
+              type: terraform
+            name: alibaba-eip
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
+                type: remote
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-oss
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                OSS object
+            labels:
+              type: terraform
+            name: alibaba-oss
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n  bucket
+                  = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\" {\n  value
+                  = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
+                  \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
+                  \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
+                  ACL, supported 'private', 'public-read', 'public-read-write'\"\n  default
+                  = \"private\"\n  type = string\n} \n"
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-rds
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                RDS object
+            labels:
+              type: terraform
+            name: alibaba-rds
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  module "rds" {
+                    source = "github.com/kubevela-contrib/terraform-alicloud-rds"
+                    engine = "MySQL"
+                    engine_version = "8.0"
+                    instance_type = "rds.mysql.c1.large"
+                    instance_storage = "20"
+                    instance_name = var.instance_name
+                    account_name = var.account_name
+                    password = var.password
+                    allocate_public_connection = var.allocate_public_connection
+                    security_ips = ["0.0.0.0/0",]
+                  }
+
+                  output "DB_NAME" {
+                    value = module.rds.this_db_instance_name
+                  }
+                  output "DB_USER" {
+                    value = module.rds.this_db_database_account
+                  }
+                  output "DB_PORT" {
+                    value = module.rds.this_db_instance_port
+                  }
+                  output "DB_HOST" {
+                    value = module.rds.this_db_instance_connection_string
+                  }
+                  output "DB_PASSWORD" {
+                    value = var.password
+                  }
+                  output "DB_PUBLIC_HOST" {
+                    value = module.rds.db_public_connection_string
+                  }
+
+                  variable "instance_name" {
+                    description = "RDS instance name"
+                    type = string
+                    default = "poc"
+                  }
+
+                  variable "account_name" {
+                    description = "RDS instance user account name"
+                    type = string
+                    default = "oam"
+                  }
+
+                  variable "password" {
+                    description = "RDS instance account password"
+                    type = string
+                    default = "Xyfff83jfewGGfaked"
+                  }
+
+                  variable "allocate_public_connection" {
+                    description = "Whether to allocate public connection for a RDS instance."
+                    type        = bool
+                    default     = true
+                  }
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: aws-s3
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for AWS S3
+            labels:
+              type: terraform
+            name: aws-s3
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  resource "aws_s3_bucket" "bucket-acl" {
+                    bucket = var.bucket
+                    acl    = var.acl
+                  }
+
+                  output "BUCKET_NAME" {
+                    value = aws_s3_bucket.bucket-acl.bucket_domain_name
+                  }
+
+                  variable "bucket" {
+                    description = "S3 bucket name"
+                    default = "vela-website"
+                    type = string
+                  }
+
+                  variable "acl" {
+                    description = "S3 bucket ACL"
+                    default = "private"
+                    type = string
+                  }
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: azure-database-mariadb
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Azure Database
+                Mariadb
+              provider: azure
+            labels:
+              type: terraform
+            name: azure-database-mariadb
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  # Configure the Microsoft Azure Provider
+                  provider "azurerm" {
+                    features {}
+                  }
+
+                  resource "azurerm_resource_group" "example" {
+                    name = var.resource_group
+                    location = var.location
+                  }
+
+                  resource "azurerm_mariadb_server" "example" {
+                    name = var.server_name
+                    location = var.location
+                    resource_group_name = azurerm_resource_group.example.name
+
+                    sku_name = "B_Gen5_2"
+
+                    storage_mb = 51200
+                    backup_retention_days = 7
+                    geo_redundant_backup_enabled = false
+
+                    administrator_login = var.username
+                    administrator_login_password = var.password
+                    version = "10.2"
+                    ssl_enforcement_enabled = true
+                  }
+
+                  resource "azurerm_mariadb_database" "example" {
+                    name = var.db_name
+                    resource_group_name = azurerm_resource_group.example.name
+                    server_name = azurerm_mariadb_server.example.name
+                    charset = "utf8"
+                    collation = "utf8_general_ci"
+                  }
+
+                  variable "server_name" {
+                    type = string
+                    description = "mariadb server name"
+                    default = "mariadb-svr-sample"
+                  }
+
+                  variable "db_name" {
+                    default = "backend"
+                    type = string
+                    description = "Database instance name"
+                  }
+
+                  variable "username" {
+                    default = "acctestun"
+                    type = string
+                    description = "Database instance username"
+                  }
+
+                  variable "password" {
+                    default = "H@Sh1CoR3!faked"
+                    type = string
+                    description = "Database instance password"
+                  }
+
+                  variable "location" {
+                    description = "Azure location"
+                    type = string
+                    default = "West Europe"
+                  }
+
+                  variable "resource_group" {
+                    description = "Resource group"
+                    type = string
+                    default = "kubevela-group"
+                  }
+
+                  output "SERVER_NAME" {
+                    value = var.server_name
+                  }
+
+                  output "DB_NAME" {
+                    value = var.db_name
+                  }
+                  output "DB_USER" {
+                    value = var.username
+                  }
+                  output "DB_PASSWORD" {
+                    sensitive = true
+                    value = var.password
+                  }
+                  output "DB_PORT" {
+                    value = "3306"
+                  }
+                  output "DB_HOST" {
+                    value = azurerm_mariadb_server.example.fqdn
+                  }
+                providerRef:
+                  name: azure
+                  namespace: default
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-terraform-system
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
+      Terraform.
+    addons.oam.dev/name: terraform
+  labels:
+    addons.oam.dev/type: terraform
+  name: terraform
+  namespace: {{.Values.systemDefinitionNamespace}}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zheng Xi Zhou	d083039a32	Fix: backport all Terraform related features to release-1.1 (#2553 ) Copy all Terraform related code to release-1.1 to fix probelms and support features. Fix #2547	2021-10-28 11:37:41 +08:00
Tianxin Dong	5e6be649c1	[Backport release-1.1] Feat: Commit step-generate data without success (#2565 ) * Feat: commit without success * Feat: add test case Co-authored-by: Jian.Li <lj176172@alibaba-inc.com>	2021-10-28 10:48:39 +08:00
github-actions[bot]	706a65beae	[Backport release-1.1] Feat: add nocalhost dev config trait definition (#2564 ) * Feat: add nocalhost dev config trait definition (cherry picked from commit `965869b43b`) * Feat: add nocalhost dev config trait example add nocalhost dev config trait example in `docs/examples/nocalhost` Signed-off-by: yuyicai <yuyicai@hotmail.com> (cherry picked from commit `70114877ce`) Co-authored-by: yuyicai <yuyicai@hotmail.com>	2021-10-27 16:03:39 +08:00
Jian.Li	d21a337dd7	Backport 2522 to release 1.1 (#2529 ) * Feat: not apply if render hash not change * Fix: generateRenderHash panic	2021-10-27 11:56:11 +08:00
github-actions[bot]	b53f4f4fdd	Feat: add cluster in read or apply object (#2560 ) (cherry picked from commit `5dbd8c8765`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-27 10:08:29 +08:00
github-actions[bot]	24970cd990	Fix: CVE-2021-42836 (#2552 ) CVE-2021-42836 GJSON before 1.9.3 allows a ReDoS (regular expression denial of service) attack. (cherry picked from commit `25e4b682a8`) Co-authored-by: zzxwill <zzxwill@gmail.com>	2021-10-26 12:03:59 +08:00
github-actions[bot]	844f479f54	Feat: add helm type component definition custom status (#2525 ) (cherry picked from commit `d8c33db293`) Co-authored-by: qiaozp <chivalry.pp@gmail.com>	2021-10-19 19:03:16 +08:00
github-actions[bot]	91d336b469	Fix(cli): use flag instead of env in workflow cli (#2524 ) (cherry picked from commit `3a7dea1cbe`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-19 17:54:09 +08:00
Zheng Xi Zhou	516156f32f	Fix: aws/azure Terraform provider are broken (#2517 ) Removed built-in aws/azure Terraform providers, and fix azure mariadb definition issue. Fix #2475	2021-10-19 12:57:36 +08:00
github-actions[bot]	eb5808e4ea	Feat: support secret in webhook notification (#2516 ) (cherry picked from commit `62bd87f13f`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-19 10:46:39 +08:00
github-actions[bot]	66f794e9fd	Feat: add imagePullPolicy/imagePullSecret to task def (#2506 ) (cherry picked from commit `ba5f562b2a`) Co-authored-by: qiaozp <chivalry.pp@gmail.com>	2021-10-18 11:14:38 +08:00
github-actions[bot]	90f46c57e8	Feat: upgrade the image of kube-webhook-certgen (#2500 ) (cherry picked from commit `e1e004d596`) Co-authored-by: yangsoon <yangsoonlx@gmail.com>	2021-10-15 17:40:02 +08:00
github-actions[bot]	95496e55c0	[Backport release-1.1] Feat: add export config and secret def (#2498 ) * Feat: add export config and secret def (cherry picked from commit `ed1f7c787d`) * Fix: change the def name and optimize the example (cherry picked from commit `2d626c872a`) * Fix: fix the name in def (cherry picked from commit `1e92d64767`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-15 15:40:51 +08:00
github-actions[bot]	3009d02fcd	[Backport release-1.1] Fix: add libgit2 support for gitops (#2490 ) * Fix: add libgit2 support for gitops (cherry picked from commit `31102a2e65`) * Fix: resolve rebase (cherry picked from commit `3137e15b3f`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-14 20:57:44 +08:00
qiaozp	df8b60d521	Feat: add read object step def (#2482 ) (#2487 ) (cherry picked from commit `32364aa9e4`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com> Refactor: addon migrate to application (#2444) * Refactor: addon migrate to application * Refactor: change test for addon * Fix: golint * Fix: add annotation const * Refactor: make CLI compatible * Fix: go-lint (cherry picked from commit `8c4af1d69c`) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-10-14 20:55:27 +08:00
github-actions[bot]	6c6e834155	Fix(application): nil pointer for component properties (#2483 ) (cherry picked from commit `92b92e683c`) Co-authored-by: kinsolee <lijingzhao@forchange.tech>	2021-10-14 20:11:38 +08:00
github-actions[bot]	cc3d2e28c0	Feat: add read object step def (#2482 ) (cherry picked from commit `32364aa9e4`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-14 18:25:53 +08:00
github-actions[bot]	f95ff4f06e	[Backport release-1.1] Fix: make nginx class to be default value and allow pvc trait to attach more than once (#2471 ) * Fix: make nginx class to be default value (cherry picked from commit `9c41df7b0f`) * Fix: allow pvc trait to attach more than once (cherry picked from commit `33cf15e439`) Co-authored-by: 天元 <jianbo.sjb@alibaba-inc.com>	2021-10-13 17:21:43 +08:00
github-actions[bot]	e30876e4d2	Fix: compatibility bug (#2470 ) make reivwable (cherry picked from commit `df5a802bd4`) Co-authored-by: wangyike <wangyike_wyk@163.com>	2021-10-13 16:59:30 +08:00
github-actions[bot]	141c6bb2ef	[Backport release-1.1] Fix: change raw extension to pointer (#2469 ) * Fix: change raw extension to pointer (cherry picked from commit `113f785c97`) * Test: fix ut (cherry picked from commit `7b9dac98c2`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-13 16:58:20 +08:00
github-actions[bot]	bdfd8e1f8d	Fix: wrong log print format (#2453 ) (cherry picked from commit `16ecbb8b91`) Co-authored-by: Xiaoxi He <xxhe@alauda.io>	2021-10-12 19:27:53 +08:00
github-actions[bot]	cfbaf38715	[Backport release-1.1] Fix: Closure Bug In newValue (#2452 ) * Fix: new value bug (cherry picked from commit `dc184327a0`) * Fix: strategyUnify Bug (cherry picked from commit `1b2c049ea8`) * Fix: e2e error (cherry picked from commit `f9bfbc0d53`) Co-authored-by: Jian.Li <lj176172@alibaba-inc.com>	2021-10-12 19:10:39 +08:00
github-actions[bot]	d3006f2d9e	[Backport release-1.1] Fix: fix unhandled err (#2450 ) * Fix: fix unhandled err refer to https://lift.sonatype.com/result/bhamail/kubevela/01FFT7CSVNCPF6808ZM856V3HN?tab=results (cherry picked from commit `d0ced6cfc9`) * Test: fix panic err (cherry picked from commit `e5e5f9ac42`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-12 14:36:52 +08:00
github-actions[bot]	8f7aa9b746	Fix: update ingress class (#2447 ) (cherry picked from commit `77e1b8296c`) Co-authored-by: Yin Da <yd219913@alibaba-inc.com>	2021-10-11 20:50:00 +08:00
github-actions[bot]	8431cdb10d	[Backport release-1.1] Fix: add Chart icon and url (#2446 ) * Fix: add Chart icon and url Added an icon and url for KubeVela chart (cherry picked from commit `4dcca2a47f`) * Fix: remove local logo file and use a web image (cherry picked from commit `a86bdb9639`) Co-authored-by: zzxwill <zzxwill@gmail.com>	2021-10-11 20:46:44 +08:00
wyike	66013a9607	Fix: confilict (#2443 ) Fix: nil pointer panic	2021-10-11 17:56:18 +08:00
github-actions[bot]	1d133df1dd	[Backport release-1.1] Feat: add support for envbinding with namespace selector (#2440 ) * Feat: add support for envbinding with namespace selector (cherry picked from commit `409fe1bf38`) * Fix: service account kubeconfig e2e-test (cherry picked from commit `db7539641c`) * Docs: add comments to explain functions (cherry picked from commit `c9bf6b8914`) * Docs: add envbinding example (cherry picked from commit `0011c4563f`) Co-authored-by: Yin Da <yd219913@alibaba-inc.com>	2021-10-11 15:36:20 +08:00
github-actions[bot]	c66f5f103f	Fix: fix depends on app built-in step (#2435 ) (cherry picked from commit `b126cf1a34`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-09 18:52:57 +08:00
github-actions[bot]	e6779f6906	[Backport release-1.1] Fix: fix apiserver 1.1.3 not available bug (#2431 ) * Fix: fix apiserver 1.1.3 not available bug (cherry picked from commit `a0b0c032d4`) * Feat: change apiserver image repository (cherry picked from commit `d417e9014a`) * Fix(helm chart): fix startup args for apiserver (cherry picked from commit `fa759459af`) Co-authored-by: barnettZQG <yiyun.pro>	2021-10-09 16:52:05 +08:00
github-actions[bot]	a48b74d4be	Feat: add secure tls for cluster-gateway (#2428 ) (cherry picked from commit `cf4d508189`) Co-authored-by: Yin Da <yd219913@alibaba-inc.com>	2021-10-09 15:24:41 +08:00
github-actions[bot]	2da80af3c4	[Backport release-1.1] Feat: add apply raw built in workflow steps (#2424 ) * Feat: add apply raw built in workflow steps (cherry picked from commit `be68f388a2`) * Feat: add apply raw example (cherry picked from commit `8243b6d916`) * Fix: change the name to apply object (cherry picked from commit `b996a04862`) * Fix: example server name (cherry picked from commit `2341bf0f5a`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2021-10-09 12:21:28 +08:00
github-actions[bot]	7bf5e17262	Chore(deps): bump github.com/containerd/containerd from 1.4.8 to 1.4.11 (#2422 ) (cherry picked from commit `8450b4153e`) Co-authored-by: 天元 <jianbo.sjb@alibaba-inc.com>	2021-10-09 11:12:08 +08:00
Zheng Xi Zhou	53a6d54b73	Fix: support terraform/provider-azure addon (#2402 ) (#2418 ) Also added some componentdefinitions for Azure cloud resource	2021-10-08 19:14:59 +08:00
github-actions[bot]	bcd072507b	[Backport release-1.1] Feat: multicluster support ServiceAccountToken (#2415 ) * Feat: support serviceaccount in multicluster (cherry picked from commit `6168af830e`) * Fix: add compatibility & support sa (cherry picked from commit `0193d74dfa`) * Fix: add multicluster sa test (cherry picked from commit `d445d29649`) * Fix: add test for upgrade func (cherry picked from commit `f4ba55b540`) * Style: format (cherry picked from commit `0a8645c30c`) Co-authored-by: Yin Da <yd219913@alibaba-inc.com>	2021-10-08 15:55:12 +08:00
qiaozp	ae075e6cb6	Refactor(cli): Refactor vela env, deprecate vela config (#2037 ) (#2413 ) * Refactor(cli): cut env to namespace, use application to save Signed-off-by: qiaozp <chivalry.pp@gmail.com> * Fix: test * Fix: typo (cherry picked from commit `a574fc0fbf`)	2021-10-08 14:44:30 +08:00
Somefive	b2127ee4fa	Feat: use #ApplyComponent for EnvBinding (#2382 ) (#2414 ) * Feat: use #ApplyComponent in EnvBinding * Fix: application test compRev control by resourcetracker * Fix: add more detail in error info	2021-10-08 14:43:44 +08:00