Feat: support vela show for workflow step definition (#3161)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
(cherry picked from commit 23852b3d10)

Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>

.github/CODEOWNERS

@@ -0,0 +1,36 @@
+# This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
+
+*                                  @hongchaodeng @wonderflow @leejanee
+design/                            @hongchaodeng @resouer @wonderflow
+
+# Owner of CUE
+pkg/cue                            @leejanee @FogDong
+pkg/stdlib                         @leejanee @FogDong
+
+# Owner of Workflow
+pkg/workflow                       @leejanee @FogDong
+
+# Owner of rollout
+pkg/controller/common/rollout/                              @wangyikewxgm @wonderflow
+pkg/controller/core.oam.dev/v1alpha2/applicationrollout     @wangyikewxgm @wonderflow
+pkg/controller/standard.oam.dev/v1alpha1/rollout            @wangyikewxgm @wonderflow
+runtime/rollout                                             @wangyikewxgm @wonderflow
+
+# Owner of definition controller
+pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition  @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/policies/policydefinition        @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition   @yangsoon @zzxwill
+pkg/controller/core.oam.dev/v1alpha2/core/traits/traitdefinition           @yangsoon @zzxwill
+
+# Owner of health scope controller
+pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope     @captainroy-hy @zzxwill
+
+# Owner of vela templates
+vela-templates/                     @Somefive @barnettZQG @wonderflow
+
+# Owner of vela CLI
+references/cli/                     @Somefive @zzxwill 
+
+# Owner of vela APIServer
+pkg/apiserver/                     @barnettZQG @yangsoon
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,9 +15,9 @@ A clear and concise description of what the bug is.
 **To Reproduce**
 <!--
 Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+1. The YAML files of Component/Trait I used.
+2. The YAML file of Application I applied.
+3. Other operations I have done.
 4. See error
 -->
 
@@ -31,6 +31,12 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 -->
 
+**KubeVela Version**
+
+<!--
+Describe your KubeVela controller or CLI version information.
+-->
+
 **Cluster information**
 <!--
 Describe your kubernetes cluster information.

.github/ISSUE_TEMPLATE/config.yaml

@@ -1 +0,0 @@
-blank_issues_enabled: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Questions & Help
+    url: https://github.com/oam-dev/kubevela/discussions
+    about: Please ask and answer questions here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,37 @@
+
+### Description of your changes
+
+<!--
+
+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":
+
+-->
+
+Fixes #
+
+I have:
+
+- [ ] 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.
+
+-->

.github/bot.md

@@ -0,0 +1,31 @@
+### GitHub & kubevela automation
+
+The bot is configured via [issue-commands.json](https://github.com/oam-dev/kubevela/blob/master/.github/workflows/issue-commands.json) 
+and some other GitHub [workflows](https://github.com/oam-dev/kubevela/blob/master/.github/workflows).
+By default, users with write access to the repo is allowed to use the comments, 
+the [userlist](https://github.com/oam-dev/kubevela/blob/master/.github/comment.userlist) 
+file is for adding additional members who do not have access and want to contribute to the issue triage.
+
+Comment commands:
+* Write the word `/needsInvestigation` in a comment, and the bot will add the corresponding label.
+* Write the word `/needsMoreInfo` in a comment, and the bot will add the correct label and standard message.
+* Write the word `/duplicate #<number>` to have `type/duplicate` label, the issue number is required for remind where is the other issue.
+* Write the word `/type/*` in a comment, and the bot will add the corresponding label `/type/*`.
+* Write the word `/area/*` in a comment, and the bot will add the corresponding label `/area/*`.
+* Write the word `/priority/*` in a comment, and the bot will add the corresponding label `/priority/*`.
+
+The `*` mention above represent a specific word. Please read the details about label category in [ISSUE_TRIAGE.md](https://github.com/oam-dev/kubevela/blob/master/ISSUE_TRIAGE.md)  
+
+Label commands:
+
+* Add label `bot/question` the bot will close with standard question message and add label `type/question`
+* Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
+* Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
+* Add label `bot/duplicate` to have `type/duplicate` label & the bot will close issue with an appropriate message.
+* Add label `bot/close feature request` for bot to close a feature request with standard message.
+
+Assign:
+When you participating in an issue area, and you want to assign to others
+to distribute this task or self-assign to give a solution. You can use the comment bellow.
+* Write the word `/assign githubname` in a comment, the robot will automatically assign to the corresponding person.
+* Specially, write the word `/assign` in a comment, you can assgin this task to yourself.  

.github/comment.userlist

@@ -0,0 +1,14 @@
+resouer
+wonderflow
+hongchaodeng
+zzxwill
+ryanzhang-oss
+captainroy-hy
+wangyikewxgm
+BinaryHB0916
+yangsoon
+wangyuan249
+chivalryq
+FogDong
+leejanee
+barnettZQG

.github/how-to.md

@@ -0,0 +1,15 @@
+# Github Utilities
+
+## How to add a custom runner
+
+1. Create an ECS that can connect github. Create a normal user(DON'T use `root`).
+2. Install Dependencies:
+  - Kind
+  - Docker `apt install docker.io`, and the user to docker group(`usermod -aG docker <user>`)
+  - Kubectl
+  - Go(1.14 for now, must align with CI)
+  - Helm v3
+  - ginkgo
+  - Add all these dependencies to $PATH.
+3. Install Custom runner agent https://docs.github.com/en/actions/hosting-your-own-runners/adding-self-hosted-runners
+4. Run the runner as service https://docs.github.com/en/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service

.github/issue-commands.json

@@ -0,0 +1,153 @@
+[
+  {
+    "type": "comment",
+    "name": "needsMoreInfo",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "needs more info"
+  },
+  {
+    "type": "comment",
+    "name": "needsInvestigation",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "needs investigation"
+  },
+  {
+    "type": "comment",
+    "name": "assign",
+    "allowUsers": ["*"]
+  },
+  {
+    "type": "comment",
+    "name": "type/bug",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "type/bug"
+  },
+  {
+    "type": "comment",
+    "name": "type/docs",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "type/docs"
+  },
+  {
+    "type": "comment",
+    "name": "type/enhancement",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "type/enhancement"
+  },
+  {
+    "type": "comment",
+    "name": "priority/critical",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/critical"
+  },
+  {
+    "type": "comment",
+    "name": "priority/important-soon",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/important-soon"
+  },
+  {
+    "type": "comment",
+    "name": "priority/important-longterm",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/important-longterm"
+  },
+  {
+    "type": "comment",
+    "name": "priority/nice-to-have",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/nice-to-have"
+  },
+  {
+    "type": "comment",
+    "name": "priority/awaiting-more-evidence",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/awaiting-more-evidence"
+  },
+  {
+    "type": "comment",
+    "name": "priority/unscheduled",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "priority/unscheduled"
+  },
+  {
+    "type": "comment",
+    "name": "area/appconfig",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/appconfig"
+  },
+  {
+    "type": "comment",
+    "name": "area/application",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/application"
+  },
+  {
+    "type": "comment",
+    "name": "area/component",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/component"
+  },
+  {
+    "type": "comment",
+    "name": "area/controller",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/controller"
+  },
+  {
+    "type": "comment",
+    "name": "area/cue",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/cue"
+  },
+  {
+    "type": "comment",
+    "name": "area/trait",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "area/trait"
+  },
+  {
+    "type": "comment",
+    "name": "duplicate",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "type/duplicate"
+  },
+  {
+    "type": "label",
+    "name": "bot/duplicate",
+    "addLabel": "type/duplicate",
+    "removeLabel": "bot/duplicate",
+    "action": "close",
+    "comment": "Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/oam-dev/kubevela/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+  },
+  {
+    "type": "label",
+    "name": "bot/no new info",
+    "action": "close",
+    "comment": "We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/oam-dev/kubevela/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+  },
+  {
+    "type": "label",
+    "name": "bot/close feature request",
+    "action": "close",
+    "comment": "This feature request has been open for a long time with few received upvotes or comments, so we are closing it. We're trying to limit open GitHub issues in order to better track planned work and features.  \r\n\r\nThis doesn't mean that we'll never ever implement it or that we will never accept a PR for it. A closed issue can still attract upvotes and act as a ticket to track feature demand\/interest. \r\n\r\nThank You to you for taking the time to create this issue!"
+  }
+]

.github/pr-title-checker-config.json

@@ -0,0 +1,10 @@
+{
+  "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"]
+  }
+}

.github/workflows/apiserver-test.yaml

@@ -0,0 +1,122 @@
+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.16'
+  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

.github/workflows/back-port.yaml

@@ -0,0 +1,22 @@
+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 }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,30 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, release-* ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/commit-lint.yml

@@ -0,0 +1,19 @@
+name: PR Title Checker
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: thehanimo/pr-title-checker@v1.3.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pass_on_octokit_error: true
+          configuration_path: ".github/pr-title-checker-config.json"

.github/workflows/dashboard.yml

@@ -1,29 +0,0 @@
-name: Dashboard
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [master]
-  workflow_dispatch: {}
-
-defaults:
-  run:
-    working-directory: ./dashboard
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn lint
-    - run: yarn build
-

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

@@ -0,0 +1,112 @@
+name: E2E MultiCluster Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+env:
+  # Common versions
+  GO_VERSION: '1.16'
+  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
+
+  e2e-multi-cluster-tests:
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - 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 (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
+
+      - 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: /tmp/e2e-profile.out
+          flags: e2e-multicluster-test
+          name: codecov-umbrella
+
+      - name: Clean e2e profile
+        run: rm /tmp/e2e-profile.out
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup

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

@@ -0,0 +1,102 @@
+name: E2E Rollout Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+env:
+  # Common versions
+  GO_VERSION: '1.16'
+  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
+
+  e2e-rollout-tests:
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - 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
+        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: Run Make
+        run: make
+
+      - name: Run Make Manager
+        run: make manager
+
+      - name: Prepare for e2e tests
+        run: |
+          make e2e-cleanup
+          make e2e-setup
+          helm lint ./charts/vela-core
+          helm test -n vela-system kubevela --timeout 5m
+
+      - name: Run e2e tests
+        run: make e2e-rollout-test
+
+      - name: Stop kubevela, get profile
+        run: make end-e2e
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: /tmp/e2e-profile.out
+          flags: e2e-rollout-tests
+          name: codecov-umbrella
+
+      - name: Clean e2e profile
+        run: rm /tmp/e2e-profile.out
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup

.github/workflows/e2e-test.yml

@@ -0,0 +1,108 @@
+name: E2E Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+env:
+  # Common versions
+  GO_VERSION: '1.16'
+  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
+
+  e2e-tests:
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - 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
+        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: Run Make
+        run: make
+
+      - name: Run Make Manager
+        run: make manager
+
+      - name: Prepare for e2e tests
+        run: |
+          make e2e-cleanup
+          make e2e-setup
+          helm lint ./charts/vela-core
+          helm test -n vela-system kubevela --timeout 5m
+
+      - 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
+
+      - name: Stop kubevela, get profile
+        run: make end-e2e
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: /tmp/e2e-profile.out
+          flags: e2etests
+          name: codecov-umbrella
+
+      - name: Clean e2e profile
+        run: rm /tmp/e2e-profile.out
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup

.github/workflows/go.yml

@@ -13,156 +13,37 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.14'
-  GOLANGCI_VERSION: 'v1.31'
-  DOCKER_BUILDX_VERSION: 'v0.4.2'
+  GO_VERSION: '1.16'
+  GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
 jobs:
 
-  unit-tests:
+  detect-noop:
     runs-on: ubuntu-20.04
+    outputs:
+      noop: ${{ steps.noop.outputs.should_skip }}
     steps:
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
+      - name: Detect No-op Changes
+        id: noop
+        uses: fkirc/skip-duplicate-actions@v3.3.0
         with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
+          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
+          concurrent_skipping: false
 
-      - 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: wonderflow/kubebuilder-action@v1.1
-
-      - name: Run Make test
-        run: make test
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.txt
-          flags: unittests
-          name: codecov-umbrella
-
-  compatibility-test:
+  staticcheck:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
     steps:
-      - name: Set up Go 1.14
-        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: wonderflow/kubebuilder-action@v1.1
-
-      - name: Run Make compatibility-test
-        run: make compatibility-test
-
-      - name: Clean up testdata
-        run: make compatibility-testdata-cleanup
-
-  e2e-tests:
-    runs-on: aliyun
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - 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
-        run: |
-          kind delete cluster
-          kind create cluster
-          kubectl version
-          kubectl cluster-info
-
-      - name: Load Image to kind cluster
-        run: make kind-load
-
-      - name: Run Make
-        run: make
-
-      - name: Run Make Manager
-        run: make manager
-
-      - name: Prepare for e2e tests
-        run: |
-          make e2e-cleanup
-          make e2e-setup
-
-      - name: Wait for e2e preparation ready
-        run: |
-          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/workloads)" != "200" ]]; do sleep 5; done' || false
-
-      - name: Run api e2e tests
-        run: make e2e-api-test
-
-      - name: Run e2e tests
-        run: make e2e-test
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup
-
-  staticcheck:
-    runs-on: ubuntu-20.04
-
-    steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -175,11 +56,19 @@ jobs:
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-pkg-
 
+      - name: Install StaticCheck
+        run: GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck
+
       - name: Static Check
-        run: go run honnef.co/go/tools/cmd/staticcheck -- ./...
+        run: staticcheck ./...
+
+      - name: License Header Check
+        run: make check-license-header
 
   lint:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -204,7 +93,9 @@ jobs:
           version: ${{ env.GOLANGCI_VERSION }}
 
   check-diff:
-    runs-on: ubuntu-20.04
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -227,5 +118,11 @@ jobs:
       - name: Check code formatting
         run: go install golang.org/x/tools/cmd/goimports && make fmt
 
+      - name: Run cross-build
+        run: make cross-build
+
       - name: Check Diff
         run: make check-diff
+              
+      - name: Cleanup binary
+        run: make build-cleanup

.github/workflows/issue-commands.yml

@@ -0,0 +1,69 @@
+name: Run commands when issues are labeled or comments added
+on:
+  issues:
+    types: [labeled, opened]
+  issue_comment:
+    types: [created]
+
+jobs:
+  bot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "oam-dev/kubevela-github-actions"
+          path: ./actions
+          ref: v0.4.1
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run Commands
+        uses: ./actions/commands
+        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 }}

.github/workflows/license.yml

@@ -0,0 +1,26 @@
+name: license
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+jobs:
+  license_check:
+    runs-on: ubuntu-latest
+    name: Check for unapproved licenses
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Install dependencies
+        run: gem install license_finder
+      - name: Run tests
+        run: license_finder --decisions_file .license/dependency_decisions.yml

.github/workflows/registry.yml

@@ -8,8 +8,8 @@ on:
   workflow_dispatch: {}
 
 env:
-  BUCKET: kubevelacharts
-  ENDPOINT: oss-cn-hangzhou.aliyuncs.com
+  BUCKET: ${{ secrets.OSS_BUCKET }}
+  ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
   ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
   ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
   ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}
@@ -36,18 +36,31 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login docker.io
         uses: docker/login-action@v1
         with:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login Alibaba Cloud ACR
+        uses: docker/login-action@v1
+        with:
+          registry: 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
+        name: Build & Pushing vela-core for Dockerhub and GHCR
         with:
           context: .
           file: Dockerfile
@@ -59,27 +72,67 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
           tags: |-
-            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
             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 }}
+      - 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
+        with:
+          context: .
+          file: runtime/rollout/Dockerfile
+          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-rollout:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}
 
   publish-charts:
     env:
       HELM_CHARTS_DIR: charts
       HELM_CHART: charts/vela-core
+      MINIMAL_HELM_CHART: charts/vela-minimal
       LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
+      OAM_RUNTIME_HELM_CHART: charts/oam-runtime
+      VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
       LOCAL_OSS_DIRECTORY: .oss/
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            VERSION=latest
-          fi
-          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
@@ -93,14 +146,39 @@ jobs:
         run: |
           rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
           rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
+      - name: Prepare vela chart
+        run: |
+          rsync -r $VELA_ROLLOUT_HELM_CHART $HELM_CHARTS_DIR
+      - uses: oprypin/find-latest-tag@v1
+        with:
+          repository: oam-dev/kubevela
+          releases-only: true
+        id: latest_tag
       - name: Tag helm chart image
-        run:  |
-          version=${{ steps.get_version.outputs.VERSION }}
-          sed -i "s/latest/$version/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/$version/g" $LEGACY_HELM_CHART/values.yaml
-          number=${version#"v"}
-          sed -i "s/0.1.0/$number/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$number/g" $LEGACY_HELM_CHART/Chart.yaml
+        run: |
+          latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
+          sub="."
+          major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
+          minor="$(cut -d"$sub" -f2 <<<"$latest_repo_tag")"
+          patch="0"
+          current_repo_tag="$major.$minor.$patch"
+          image_tag=${GITHUB_REF#refs/tags/}
+          chart_version=$latest_repo_tag
+          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
+            image_tag=latest
+            chart_version=${current_repo_tag}-nightly-build
+          fi
+          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $MINIMAL_HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $LEGACY_HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $OAM_RUNTIME_HELM_CHART/values.yaml
+          sed -i "s/latest/${image_tag}/g" $VELA_ROLLOUT_HELM_CHART/values.yaml
+          chart_smever=${chart_version#"v"}
+          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $MINIMAL_HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $OAM_RUNTIME_HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $VELA_ROLLOUT_HELM_CHART/Chart.yaml
       - name: Install ossutil
         run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
       - name: Configure Alibaba Cloud OSSUTIL
@@ -109,14 +187,38 @@ jobs:
         run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
       - name: add artifacthub stuff to the repo
         run: |
-          rsync docs/en/install.md $HELM_CHART/README.md
-          rsync docs/en/install.md $LEGACY_HELM_CHART/README.md
+          rsync README.md $HELM_CHART/README.md
+          rsync README.md $LEGACY_HELM_CHART/README.md
+          rsync README.md $OAM_RUNTIME_HELM_CHART/README.md
+          rsync README.md $VELA_ROLLOUT_HELM_CHART/README.md
           sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
           rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
       - name: Package helm charts
         run: |
           helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $MINIMAL_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
           helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $OAM_RUNTIME_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
           helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
       - name: sync local to cloud
         run: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f
+
+  publish-capabilities:
+    env:
+      CAPABILITY_BUCKET: kubevela-registry
+      CAPABILITY_DIR: capabilities
+      CAPABILITY_ENDPOINT: oss-cn-beijing.aliyuncs.com
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@master
+      - name: Install ossutil
+        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
+      - name: Configure Alibaba Cloud OSSUTIL
+        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${CAPABILITY_ENDPOINT} -c .ossutilconfig
+      - 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
+      - name: sync local to cloud
+        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f

.github/workflows/release.yml

@@ -4,92 +4,146 @@ on:
   push:
     tags:
       - "v*"
-  workflow_dispatch: {}
+  workflow_dispatch: { }
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  publish-cli:
+  build:
     runs-on: ubuntu-latest
+    name: build
+    strategy:
+      matrix:
+        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
     env:
-      VELA_VERSION: ${{ github.ref }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      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
     steps:
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14
-        id: go
-      - name: Check out code into the Go module directory
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-      - name: Use Node.js 10.x
-        uses: actions/setup-node@v1
+      - name: Set up Go
+        uses: actions/setup-go@v2
         with:
-          node-version: 12.x
-      - name: Run dashboard install
-        run: make dashboard-install
-      - name: Run dashboard build
-        run: make dashboard-build
-      - 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 generate-source
-        run: make generate-source
-      - name: Run cross-build
-        run: make cross-build
-      - name: Run compress binary
-        run: make compress
+          go-version: 1.16
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Upload Linux amd64 tar.gz
+      - 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-linux-amd64.tar.gz
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          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 Linux amd64 zip
+      - 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-linux-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          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 MacOS tar.gz
+      - 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/vela-darwin-amd64.tar.gz
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          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 MacOS zip
+      - 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/vela-darwin-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          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: Upload Windows tar.gz
-        uses: actions/upload-release-asset@v1.0.2
+      - name: Post sha256
+        uses: actions/upload-artifact@v2
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/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 Windows zip
-        uses: actions/upload-release-asset@v1.0.2
+          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
+        uses: actions/checkout@v2
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
+      - name: Download sha256sums
+        uses: actions/download-artifact@v2
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-windows-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
-          asset_content_type: binary/octet-stream
+          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
       - name: Upload Checksums
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/sha256sums.txt
+          asset_path: cli-artifacts/sha256sums.txt
           asset_name: sha256sums.txt
-          asset_content_type: text/plain
+          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

.github/workflows/sync-api.yml

@@ -0,0 +1,37 @@
+name: sync-api
+on:
+  push:
+    paths:
+      - 'apis/**'
+      - 'pkg/oam/**'
+    tags:
+      - "v*"
+
+jobs:
+  sync-core-api:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Set up Go 1.16
+        uses: actions/setup-go@v1
+        env:
+          GO_VERSION: '1.16'
+          GOLANGCI_VERSION: 'v1.38'
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        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: Sync to kubevela-core-api Repo
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.VELA_API_DEPLOY }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
+          COMMIT_ID: ${{ github.sha }}
+        run: |
+          bash ./hack/apis/clientgen.sh
+          bash ./hack/apis/sync.sh

.github/workflows/timed-task.yml

@@ -0,0 +1,10 @@
+name: Timed Task
+on:
+  schedule:
+    - cron: '* * * * *'
+jobs:
+  clean-image:
+    runs-on: aliyun
+    steps:
+      - name: Cleanup image
+        run: docker image prune -f

.github/workflows/unit-test.yml

@@ -0,0 +1,85 @@
+name: Unit-Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+env:
+  # Common versions
+  GO_VERSION: '1.16'
+  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
+
+  unit-tests:
+    runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Install ginkgo
+        run:  |
+          sudo apt-get install -y golang-ginkgo-dev
+
+      - name: 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 test
+        run: make test
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.txt
+          flags: core-unittests
+          name: codecov-umbrella

.gitignore

@@ -25,6 +25,7 @@ coverage.txt
 *.swo
 *~
 .DS_Store
+_.yaml
 
 # Dependency directories (remove the comment below to include it)
 vendor/
@@ -34,23 +35,18 @@ vendor/
 
 pkg/test/vela
 config/crd/bases
-tmp/
+_tmp/
 
-cmd/vela/fake/source.go
-cmd/vela/fake/chart_source.go
+references/cmd/cli/fake/source.go
+references/cmd/cli/fake/chart_source.go
 charts/vela-core/crds/_.yaml
 .test_vela
+tmp/
 
 .vela/
 
-# Dashboard
-node_modules/
-.eslintcache
-dashboard/dist/
-dashboard/package-lock.json
-dashboard/src/.umi/
-package-lock.json
-dashboard/src/.umi-production/
+# check docs
+git-page/
 
-# Swagger: generate Restful API
-pkg/server/docs/index.html
+# e2e rollout runtime image build
+runtime/rollout/e2e/tmp

.golangci.yml

@@ -113,7 +113,6 @@ linters:
     - govet
     - gocyclo
     - gocritic
-    - interfacer
     - goconst
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.

.krew.yaml

@@ -0,0 +1,47 @@
+apiVersion: krew.googlecontainertools.github.com/v1alpha2
+kind: Plugin
+metadata:
+  name: vela
+spec:
+  version: "{{ .TagName }}"
+  platforms:
+  - selector:
+      matchLabels:
+        os: linux
+        arch: amd64
+    {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-linux-amd64.tar.gz" .TagName }}
+    files:
+    - from: "*/kubectl-vela"
+      to: "."
+    - from: "*/LICENSE"
+      to: "."
+    bin: "kubectl-vela"
+  - selector:
+      matchLabels:
+        os: darwin
+        arch: amd64
+    {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-darwin-amd64.tar.gz" .TagName }}
+    files:
+    - from: "*/kubectl-vela"
+      to: "."
+    - from: "*/LICENSE"
+      to: "."
+    bin: "kubectl-vela"
+  - selector:
+      matchLabels:
+        os: windows
+        arch: amd64
+    {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-windows-amd64.zip" .TagName }}
+    files:
+    - from: "*/kubectl-vela.exe"
+      to: "."
+    - from: "*/LICENSE"
+      to: "."
+    bin: "kubectl-vela.exe"
+  shortDescription: Easily interact with KubeVela
+  homepage: https://kubevela.io
+  description: |
+    kubectl vela is a kubectl plugin from the KubeVela project. KubeVela is
+    a modern application platform that is fully self-service, and adapts to
+    your needs when you grow. This plugin allows you to better view, manage
+    and maintain KubeVela applications.

.license/README.md

@@ -0,0 +1,19 @@
+# License Checker
+
+Our license checker CI rely on https://github.com/pivotal/LicenseFinder.
+
+## How to add a new license?
+
+LicenseFinder is a ruby project, so make sure you have ruby installed.
+
+### Install the tool
+
+```shell
+gem install license_finder
+```
+
+### Add a license
+
+```shell
+license_finder  permitted_licenses add MIT --decisions_file .license/dependency_decisions.yml
+```

.license/dependency_decisions.yml

@@ -0,0 +1,43 @@
+---
+- - :permit
+  - MIT
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:35:34.645031000 Z
+- - :permit
+  - Apache 2.0
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:19:18.243194000 Z
+- - :permit
+  - New BSD
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:19:28.540675000 Z
+- - :permit
+  - Simplified BSD
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:20:01.774212000 Z
+- - :permit
+  - Mozilla Public License 2.0
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:21:05.194536000 Z
+- - :permit
+  - unknown
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:21:43.379269000 Z
+- - :permit
+  - ISC
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2021-03-12 07:22:07.265966000 Z

CHANGELOG/CHANGELOG-1.0.md

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

CHANGELOG/CHANGELOG-1.1.md

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

CHANGELOG/CHANGELOG-1.2.md

@@ -0,0 +1,5 @@
+# v1.2.0-alpha1
+
+## What's changed
+
+1. Feature: support terraform/provider-azure addon #2402 by @zzxwill 

CHANGELOG/README.md

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

CONTRIBUTING.md

@@ -3,131 +3,64 @@
 ## About KubeVela
 
 KubeVela project is initialized and maintained by the cloud native community since day 0 with [bootstrapping contributors from 8+ different organizations](https://github.com/oam-dev/kubevela/graphs/contributors).
-We intend for KubeVela to have an open governance since the very beginning and donate the project to neutral foundation as soon as it's released. 
+We intend for KubeVela to have an open governance since the very beginning and donate the project to neutral foundation as soon as it's released.
+To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](./CODE_OF_CONDUCT.md).
 
-This doc explains how to set up a development environment, so you can get started
-contributing to `kubevela` or build a PoC (Proof of Concept). 
+This document is a guide to help you through the process of contributing to KubeVela.
+
+## Become a contributor
+
+You can contribute to KubeVela in several ways. Here are some examples:
+
+* Contribute to the KubeVela codebase.
+* Contribute to the [KubeVela docs](https://github.com/oam-dev/kubevela.io).
+* Report and triage bugs.
+* Develop community CRD operators as workload or trait and contribute to [catalog](https://github.com/oam-dev/catalog).
+* Write technical documentation and blog posts, for users and contributors.
+* Organize meetups and user groups in your local area.
+* Help others by answering questions about KubeVela.
+
+For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
 
 
-## Development
+### Report bugs
 
-### Prerequisites
+Before submitting a new issue, try to make sure someone hasn't already reported the problem.
+Look through the [existing issues](https://github.com/oam-dev/kubevela/issues) for similar issues.
 
-1. Golang version 1.13+
-2. Kubernetes version v1.16+ with `~/.kube/config` configured.
-3. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test))
-4. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.
+Report a bug by submitting a [bug report](https://github.com/oam-dev/kubevela/issues/new?assignees=&labels=kind%2Fbug&template=bug_report.md&title=).
+Make sure that you provide as much information as possible on how to reproduce the bug.
 
-We also recommend you to learn about KubeVela's [design](docs/en/design.md) before dive into its code.
+Follow the issue template and add additional information that will help us replicate the problem.
 
-### Build
+#### Security issues
 
-* Clone this project
+If you believe you've found a security vulnerability, please read our [security policy](https://github.com/oam-dev/kubevela/blob/master/SECURITY.md) for more details.
 
-```shell script
-git clone git@github.com:oam-dev/kubevela.git
-```
+### Suggest enhancements
 
-KubeVela includes two parts, `vela core` and `vela cli`.
+If you have an idea to improve KubeVela, submit an [feature request](https://github.com/oam-dev/kubevela/issues/new?assignees=&labels=kind%2Ffeature&template=feature_request.md&title=%5BFeature%5D).
 
-- The `vela core` is actually a K8s controller, it will watch OAM Spec CRD and deploy resources.
-- The `vela cli` is a command line tool that can build, run apps(with the help of `vela core`).
+### Triage issues
 
-For local development, we probably need to build both of them.
+If you don't have the knowledge or time to code, consider helping with _issue triage_. The community will thank you for saving them time by spending some of yours.
 
-* Build Vela CLI
+Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
 
-```shell script
-make
-```
+### Answering questions
 
-After the vela cli built successfully, `make` command will create `vela` binary to `bin/` under the project.
+If you have a question and you can't find the answer in the [documentation](https://kubevela.io/docs/),
+the next step is to ask it on the [github discussion](https://github.com/oam-dev/kubevela/discussions).
 
-* Configure `vela` binary to System PATH
+It's important to us to help these users, and we'd love your help. You can help other KubeVela users by answering [their questions](https://github.com/oam-dev/kubevela/discussions).
 
-```shell script
-export PATH=$PATH:/your/path/to/project/kubevela/bin
-```
+### Your first contribution
 
-Then you can use `vela` command directly.
+Unsure where to begin contributing to KubeVela? Start by browsing issues labeled `good first issue` or `help wanted`.
 
-* Build Vela Core
+- [Good first issue](https://github.com/oam-dev/kubevela/labels/good%20first%20issue) issues are generally straightforward to complete.
+- [Help wanted](https://github.com/oam-dev/kubevela/labels/help%20wanted) issues are problems we would like the community to help us with regardless of complexity.
 
-```shell script
-make manager
-```
+If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
 
-* Run Vela Core
-
-Firstly make sure your cluster has CRDs, below is the command that can help install all CRDs.
-
-```shell script
-make core-install
-```
-
-Run locally:
-
-```shell script
-make core-run
-```
-
-This command will run controller locally, it will use your local KubeConfig which means you need to have a k8s cluster
-locally. If you don't have a one, we suggest that you could setup up a cluster with [kind](https://kind.sigs.k8s.io/).
-
-When you're developing `vela-core`, make sure the controller installed by helm chart is not running.
-Otherwise, it will conflict with your local running controller.
-
-You can check and uninstall it by using helm.
-
-```shell script
-helm list -A
-helm uninstall -n vela-system kubevela
-```
-
-### Use
-
-You can try use your local built binaries follow [the documentation](https://kubevela.io/#/en/quick-start).
-
-## Testing
-
-### Unit test
-
-```shell script
-make test
-```
-
-### E2E test
-
-**Before e2e test start, make sure you have vela-core running.**
-
-```shell script
-make core-run
-```
-
-Start to test.
-
-```
-make e2e-test
-```
-
-## Make a pull request
-
-Remember to write unit-test and e2e-test after you have finished your code.
- 
-Run following checks before making a pull request.
-
-```shell script
-make reviewable
-```
-
-The command will do some lint checks and clean code.
-
-After that, check in all changes and send a pull request.
-
-## Merge Regulations
-
-Before merging, the pull request should obey the following rules:
-
-- The commit title and message should be clear about what this PR does.
-- All test CI should pass green.
-- The `codecov/project` should pass. This means the coverage should not drop. See [Codecov commit status](https://docs.codecov.io/docs/commit-status#project-status).
+When you're ready to contribute, it's time to [Create a pull request](/contribute/create-pull-request.md).

Dockerfile

@@ -1,16 +1,23 @@
+ARG BASE_IMAGE="alpine:latest"
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14 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
 
 # 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/
@@ -19,20 +26,25 @@ COPY version/ version/
 ARG TARGETARCH
 ARG VERSION
 ARG GITVERSION
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on \
-    go build -a -ldflags "-X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
+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
 
-# Use distroless as minimal base image to package the manager binary
+# 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
-# Could use `--build-arg=BASE_DISTROLESS=gcr.io/distroless/static:nonroot` to overwrite
-ARG BASE_DISTROLESS
-FROM ${BASE_DISTROLESS:-gcr.io/distroless/static:nonroot}
+# Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
+FROM ${BASE_IMAGE:-alpine:latest}
+# This is required by daemon connnecting with cri
+RUN apk add --no-cache ca-certificates bash
 
 WORKDIR /
 
 ARG TARGETARCH
-COPY --from=builder /workspace/manager-${TARGETARCH} /manager
-USER nonroot:nonroot
+COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager
 
-ENTRYPOINT ["/manager"]
+COPY entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["manager"]

Dockerfile.apiserver

@@ -0,0 +1,48 @@
+ARG BASE_IMAGE="alpine:latest"
+# Build the manager binary
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-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:latest}
+# This is required by daemon connnecting with cri
+RUN apk add --no-cache ca-certificates bash
+
+WORKDIR /
+
+ARG TARGETARCH
+COPY --from=builder /workspace/apiserver-${TARGETARCH} /usr/local/bin/apiserver
+
+COPY entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["apiserver"]

Dockerfile.e2e

@@ -0,0 +1,55 @@
+# Build the manager binary
+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
+# 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/core/main_e2e_test.go main_e2e_test.go
+COPY cmd/apiserver/main.go cmd/apiserver/main.go
+COPY cmd/ cmd/
+COPY apis/ apis/
+COPY pkg/ pkg/
+COPY version/ version/
+
+# Build
+ARG TARGETARCH
+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 ./... .
+
+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`
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-alpine:latest}
+# This is required by daemon connnecting with cri
+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/
+
+VOLUME ["/workspace/data"]
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["manager"]

ISSUE_TRIAGE.md

@@ -0,0 +1,323 @@
+# Triage issues
+
+The main goal of issue triage is to categorize all incoming KubeVela issues and make sure each issue has all basic
+information needed for anyone else to understand and be able to start working on it.
+
+> **Note:** This information is for OAM/KubeVela project Maintainers, Owners, and Admins.
+>  If you are a Contributor, then you will not be able to perform most of the tasks in this topic.
+
+The core maintainers of the OAM/KubeVela project are responsible for categorizing all incoming issues and delegating
+any critical or important issue to other maintainers. Currently one maintainer each week is responsible.
+Besides that part, triage provides an important way to contribute to an open source project.
+
+Triage helps ensure issues resolve quickly by:
+
+- Ensuring the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for
+  an issue to explain how an end user experiences a problem and what actions they took.
+- Giving a contributor the information they need before they commit to resolving an issue.
+- Lowering the issue count by preventing duplicate issues.
+- Streamlining the development process by preventing duplicate discussions.
+
+If you don't have the knowledge or time to code, consider helping with triage.
+The community will thank you for saving them time by spending some of yours.
+
+## Simplified flowchart diagram of the issue triage process
+
+<!-- https://textik.com/#908a27a44c590528 -->
+```
+                               +-----------------------------+                                                                                              
+                               |                             |                                                                                              
+                               |  New Issues Opened          |                                                                                              
+             +-----------------+                             |                                                                                              
+             |                 |  Or More information needed |                                                                                              
+             |                 |                             |                                                                                              
+             |                 +--------------+--------------+                                                                                              
+             |   Ask for more info            |                                                                                                             
+             |                                |                                                                                                             
+             |                 +--------------+------------+                                                                                                
+             |                 |                           |    Yes                                                                                         
+             |                 |  All informatio  needed   |                                                                                                
+             |     +-----------+  to categorize the issue？ +---------------+                                                                                
+             |     |   No      |                           |               |                                                                                
+             |     |           +---------------------------+               |                                                                                
+             |     |                                           +-----------+-----------+          +---------------------------+                             
++------------+-----+-----+                                     |                       |     Yes  |                           |                             
+|                        |                                     | Needs investigation ？ +---------+ label: needs investigation|                             
+| label: needs more info |                                     |                       |          |                           |                             
+|                        |                                     +----------+------------+          +-------------+-------------+                             
++------------------------+                                                |                                     |                                           
+                                                                          | No                                  |                                           
+                                                                          |                                     |                                           
+                                                               +----------+----------+       investigate        |                                           
+                                                               |   label: type/*     |                          |                                           
+                                                               |   label: area/*     +--------------------------+                                           
+                                                               |                     |                                                                      
+                                                               +--|-------------|----+                                                                      
+                                                                  |             |                Yes                                                        
+                                                                  |     +-------|-------------+     +-------------------+                                   
+                                                                  |     |  needs priority？    +----+ label: priority/* |                                   
+                                                                  |     +-------|-------------+     +----------|--------+                                   
+                                                                  |             | No                           |                                            
+                                                                  |             |                              |                                            
+                                                     +----- ------|---+      +--|----- --+                     |                                            
+                                                     | close issue    + ---- +    done   +---------------------+                                            
+                                                     +----------------+      +-----------+                                                                  
+```
+
+## 1. Find uncategorized issues
+
+To get started with issue triage and finding issues that haven't been triaged you have two alternatives.
+
+### Browse unlabeled issues
+
+The easiest and straight forward way of getting started and finding issues that haven't been triaged is to browse
+[unlabeled issues](https://github.com/oam-dev/kubevela/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and starting from
+the bottom and working yourself to the top.
+
+### Subscribe to all notifications
+
+The more advanced, but recommended way is to subscribe to all notifications from this repository which means that
+all new issues, pull requests, comments and important status changes are sent to your configured email address.
+Read this [guide](https://help.github.com/en/articles/watching-and-unwatching-repositories#watching-a-single-repository)
+for help with setting this up.
+
+It's highly recommended that you setup filters to automatically remove emails from the inbox and label/categorize
+them accordingly to make it easy for you to understand when you need to act upon a notification or where to look for
+finding issues that haven't been triaged etc.
+
+
+## 2. Ensure the issue contains basic information
+
+Before triaging an issue very far, make sure that the issue's author provided the standard issue information.
+This will help you make an educated recommendation on how to categorize the issue.
+The KubeVela project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository)
+to guide contributors to provide standard information that must be included for each type of template or type of issue.
+
+### Standard issue information that must be included
+
+Given a certain [issue template]([template](https://github.com/oam-dev/kubevela/issues/new/choose)) have been used
+by the issue author or depending how the issue is perceived by the issue triage responsible, the following should
+help you understand what standard issue information that must be included.
+
+#### Bug reports
+
+Should explain what happened, what was expected and how to reproduce it together with any additional information that
+may help giving a complete picture of what happened such as screenshots, application related YAMLs, and any environment
+related information that's applicable and/or maybe related to the reported problem:
+- KubeVela version
+- K8s cluster version KubeVela is installed on
+- Which other K8s CRD controllers used
+- Development environment like Go versions, if applicable
+
+#### Enhancement requests
+
+Should explain what enhancement or feature that the author wants to be added and why that is needed.
+
+### Good practices
+
+To make it easier for everyone to understand and find issues they're searching for it's suggested as a general rule of thumbs to:
+
+- Make sure that issue titles are named to explain the subject of the issue, has a correct spelling and doesn't include irrelevant information and/or sensitive information.
+- Make sure that issue descriptions doesn't include irrelevant information, information from template that haven't been filled out and/or sensitive information.
+- Do your best effort to change title and description or request suggested changes by adding a comment.
+
+> **Note:** Above rules is applicable to both new and existing issues of the KubeVela project.
+
+### Do you have all the information needed to categorize an issue?
+
+Depending on the issue, you might not feel all this information is needed. Use your best judgement.
+If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the
+above information to clarify the problem. Label issue with `needs more info` and add any related `area/*` or `type/*` labels.
+
+If the author provides the standard information but you are still unable to triage the issue, request additional information.
+Do this kindly and politely because you are asking for more of the author's time.
+
+If the author does not respond to the requested information within the timespan of a week,
+close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.
+
+When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).
+
+If you receive a notification with additional information provided but you are not anymore on issue triage and
+you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
+
+## 3. Categorizing an issue
+
+An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have:
+
+- One label identifying its type (`type/*`).
+- One or multiple labels identifying the functional areas of interest or component (`area/*`), if applicable.
+
+| Label                    | Description                                                               |
+| ------------------------ | ------------------------------------------------------------------------- |
+| `type/bug`               | A feature isn't working as expected given design or documentation.        |
+| `type/enhancement`       | Request for a new feature or enhancement.                                 |
+| `type/docs`              | Documentation problem or enhancement.                                     |
+| `type/question`          | Issue is a question or is perceived as such.                              |
+| `type/duplicate`         | An existing issue of the same subject/request have already been reported. |
+| `type/wontfix`           | A reported bug works as intended/by design.                               |
+| `type/invalid`           | A reported bug with invalid usage.                                        |
+| `area/*`                 | Subject is related to a functional area of interest or component.         |
+
+### Duplicate issues
+
+Make sure it's not a duplicate by searching existing issues using related terms from the issue title and description.
+If you think you know there is an existing issue, but can't find it, please reach out to one of the maintainers and ask for help.
+If you identify that the issue is a duplicate of an existing issue:
+
+1. Add a comment `/duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
+2. The KubeVela bot will do the rest, adding the correct label and closing comment
+3. Optionally add any related `area/*` labels.
+
+### Bug reports
+
+If it's not perfectly clear that it's an actual bug, quickly try to reproduce it.
+
+**It's a bug/it can be reproduced:**
+
+1. Add a comment describing detailed steps for how to reproduce it, if applicable.
+2. Label the issue `type/bug` and at least one `area/*` label.
+3. If you know that maintainers won't be able to put any resources into it for some time then label the issue
+   with `help wanted` and optionally `good first issue` together with pointers on which code to update to fix the bug.
+   This should signal to the community that we would appreciate any help we can get to resolve this.
+4. Move on to [prioritizing the issue](#4-prioritization-of-issues).
+
+**It can't be reproduced:**
+1. Either [ask for more information](#2-ensure-the-issue-contains-basic-information) needed to investigate it more thoroughly.
+2. Either [delegate further investigations](#investigation-of-issues) to someone else.
+
+**It works as intended/by design:**
+1. Kindly and politely add a comment explaining briefly why we think it works as intended and close the issue.
+2. Label the issue `type/wontfix`.
+
+### Enhancement/feature?
+
+1. Label the issue `type/enhancement` and at least one `area/*` label.
+2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
+
+### Documentation issue?
+
+First, evaluate if the documentation makes sense to be included in the KubeVela project:
+
+- Is this something we want/can maintain as a project?
+- Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with KubeVela?
+- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments)
+  to identify that lots of other users want/need this.
+
+Second, label the issue `type/docs` and at least one `area/*` label.
+
+**Minor typo/error/lack of information:**
+
+There's a minor typo/error/lack of information that adds a lot of confusion for users and given the amount of work is a big win to make sure fixing it:
+1. Either update the documentation yourself and open a pull request.
+2. Either delegate the work to someone else by assigning that person to the issue and add the issue to next major/minor milestone.
+
+**Major error/lack of information:**
+
+1. Label the issue with `help wanted` and `good first issue`, if applicable, to signal that we find this important to
+   fix and we would appreciate any help we can get from the community.
+2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
+
+### Support requests and questions
+
+1. Kindly and politely direct the issue author to the [github discussion](https://github.com/oam-dev/kubevela/discussions)
+   and explain that issue is mainly used for tracking bugs and feature requests.
+   If possible, it's usually a good idea to add some pointers to the issue author's question.
+2. Close the issue and label it with `type/question`.
+
+## 4. Prioritization of issues
+
+In general bugs and enhancement issues should be labeled with a priority.
+
+This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience
+before being able to think of and start feel comfortable adding a certain priority label.
+
+The key here is asking for help and discuss issues to understand how more experienced project members think and reason.
+By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
+
+In case there is an uncertainty around the prioritization of an issue, please ask the maintainers for help.
+
+| Label                             | Description                                                                                                              |
+| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `priority/critical`               | Highest priority. Must be actively worked on as someone's top priority right now.                                        |
+| `priority/important-soon`         | Must be staffed and worked on either currently, or very soon, ideally in time for the next release.                      |
+| `priority/important-longterm`     | Important over the long term, but may not be staffed and/or may need multiple releases to complete.                      |
+| `priority/nice-to-have`           | It's a good idea, but not scheduled for any release.                                                                     |
+| `priority/awaiting-more-evidence` | Lowest priority. Possibly useful, but not yet enough interest in it.                                                     |
+| `priority/unscheduled`            | Something to look into before and to be discussed during the planning of the next (upcoming) major/minor stable release. |
+
+**Critical bugs**
+
+1. If a bug has been categorized and any of the following criteria apply, the bug should be labeled as critical and
+   must be actively worked on as someone's top priority right now.
+
+    - Results in any crash or data loss.
+    - Critical security or performance issues
+    - Problem that makes a feature unusable
+    - Multiple users experience a severe problem affecting their business, users etc.
+
+2. Label the issue `priority/critical`.
+3. Add the issue to the next upcoming patch release milestone. Create a new milestone if there are none.
+4. Escalate the problem to the maintainers.
+5. Assign or ask a maintainer for help assigning someone to make this issue their top priority right now.
+
+**Important short-term**
+
+1. Label the issue `priority/important-soon`.
+2. Add the issue to the next upcoming patch or major/minor stable release milestone. Ask maintainers for help if unsure if it's a patch or not.
+   Create a new milestone if there are none.
+3. Make sure to add the issue to a suitable backlog of a GitHub project and prioritize it or assign someone to work on it now or very soon.
+4. Consider requesting [help from the community](#5-requesting-help-from-the-community), even though it may be problematic given a short amount of time until it should be released.
+
+**Important long-term**
+
+1. Label the issue `priority/important-longterm`.
+2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
+
+**Nice to have**
+
+1. Label the issue `priority/nice-to-have`.
+2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
+
+**Not critical, but unsure?**
+
+1. Label the issue `priority/unscheduled`.
+2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
+
+## 5. Requesting help from the community
+
+Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community
+is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement.
+In general, requesting help from the community means that a contribution has a good chance of getting accepted and merged.
+
+1. Kindly and politely add a comment to signal to users subscribed to updates of the issue.
+    - Explain that the issue would be nice to get resolved, but it isn't prioritized to work on by maintainers for an unforeseen future.
+    - If possible or applicable, try to help contributors getting starting by adding pointers and references to
+      what code/files need to be changed and/or ideas of a good way to solve/implement the issue.
+2. Label the issue with `help wanted`.
+3. If applicable, label the issue with `good first issue` to denote that the issue is suitable for a beginner to work on.
+4. If possible, try to estimate the amount of work by adding `effort/small`, `effort/medium` or `effort/large`.
+
+## Investigation of issues
+
+When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported
+problem at a first glance, the issue is labeled [Needs investigation](https://github.com/oam-dev/kubevela/labels/needs%20investigation).
+Depending on the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments),
+the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor)
+picks it up and eventually starts investigating it.
+
+Investigating issues can be a very time consuming task, especially for the maintainers, provide as much related info will
+make it easier for maintainers to investigate.
+
+Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments)
+the issue if you happen to have the same problem. If you have further details that may help investigating the issue
+please provide as much information as possible.
+
+## Automation
+
+We have some automation that triggers on comments or labels being added to issues.
+Many of these automated behaviors are defined in [issue-commands.json](https://github.com/oam-dev/kubevela/blob/master/.github/issue-commands.json).
+
+* Add comment `/duplicate #<number>` to have `type/duplicate` label, the issue number is required for remind where is the other issue.
+* Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
+
+Read more bot actions on [bot.md](https://github.com/oam-dev/kubevela/blob/master/.github/bot.md)

Makefile

@@ -1,103 +1,40 @@
-# 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_VAR    := github.com/oam-dev/kubevela/version.VelaVersion
-VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision
-LDFLAGS             ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
-
-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
+include makefiles/const.mk
+include makefiles/dependency.mk
+include makefiles/release.mk
+include makefiles/develop.mk
+include makefiles/build.mk
+include makefiles/e2e.mk
 
+.DEFAULT_GOAL := all
 all: build
 
 # Run tests
-test: vet lint staticcheck
-	go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/...
+test: vet lint staticcheck unit-test-core
 	@$(OK) unit-tests pass
 
-# Build manager binary
-build: fmt vet lint staticcheck
-	go run hack/chart/generate.go
-	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
-	git checkout cmd/vela/fake/chart_source.go
+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:
-	go run hack/chart/generate.go
-	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
-	git checkout cmd/vela/fake/chart_source.go
-
-dashboard-build:
-	cd dashboard && yarn build && cd ./..
-
-dashboard-install:
-	cd dashboard && yarn && cd ./..
-
-doc-gen:
-	rm -r docs/en/cli/*
-	go run hack/docgen/gen.go
-	go run hack/references/generate.go
-
-api-gen:
-	swag init -g pkg/server/route.go --output pkg/server/docs
-	swagger-codegen generate -l html2 -i pkg/server/docs/swagger.yaml -o pkg/server/docs
-	mv pkg/server/docs/index.html docs/en/developers/references/restful-api/
-
-generate-source:
-	go run hack/frontend/source.go
-
-cross-build:
-	go run hack/chart/generate.go
-	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./cmd/vela/
-
-compress:
-	( \
-		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
-		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
-		cd _bin && \
-		$(DIST_DIRS) cp ../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../README.md {} \; && \
-		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
-		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
-		sha256sum vela-* > sha256sums.txt \
-	)
-
-# Run against the configured Kubernetes cluster in ~/.kube/config
-run: fmt vet
-	go run ./cmd/core/main.go
+build-cleanup:
+	rm -rf _bin
 
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
-	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd
-	$(CUE) fmt ./hack/vela-templates/cue/*
-
+	$(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
+	$(CUE) fmt ./pkg/workflow/tasks/template/static/*
 # Run go vet against code
 vet:
 	go vet ./...
@@ -106,167 +43,86 @@ staticcheck: staticchecktool
 	$(STATICCHECK) ./...
 
 lint: golangci
-	$(GOLANGCILINT) run  ./...
+	$(GOLANGCILINT) run ./...
 
 reviewable: manifests fmt vet lint staticcheck
 	go mod tidy
 
 # Execute auto-gen code commands and ensure branch is clean.
 check-diff: reviewable
+	git --no-pager diff
 	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 ${IMG}
-
 # Push the docker image
 docker-push:
-	docker push ${IMG}
+	docker push $(VELA_CORE_IMAGE)
 
-e2e-setup:
-	bin/vela install --set installCertManager=true --image-pull-policy IfNotPresent --image-repo vela-core-test --image-tag $(GIT_COMMIT)
-	ginkgo version
-	ginkgo -v -r e2e/setup
-	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
-	bin/vela dashboard &
+build-swagger:
+	go run ./cmd/apiserver/main.go build-swagger ./docs/apidoc/swagger.json
 
-e2e-api-test:
-	# Run e2e test
-	ginkgo -v -skipPackage capability,setup,apiserver,application -r e2e
-	ginkgo -v -r e2e/apiserver
-	ginkgo -v -r e2e/application
 
-e2e-test:
-	# Run e2e test
-	ginkgo -v ./test/e2e-test
-	# integration test will clean environment, please don't put test behind it.
-	CGO_ENABLED=0 go test -timeout 1h -count=1 -v -tags 'integration' ./test/integration
-	@$(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:
-# Delete Docker image
-ifneq ($(shell docker images -q vela-core-test:$(GIT_COMMIT)),)
-	docker image rm -f vela-core-test:$(GIT_COMMIT)
+ifneq (, $(shell which docker))
+# Delete Docker images
+
+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
+
+
+
 # load docker image to the kind cluster
 kind-load:
-	docker build -t vela-core-test:$(GIT_COMMIT) .
-	kind load docker-image vela-core-test:$(GIT_COMMIT) || { echo >&2 "kind not installed or error loading image: $(IMAGE)"; exit 1; }
+	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; }
 
-# Image URL to use all building/pushing image targets
-IMG ?= vela-core:latest
+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
 
-# Build manager binary
+# Build vela core manager and apiserver binary
 manager: fmt vet lint manifests
-	go build -o bin/manager ./cmd/core/main.go
+	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go
+	$(GOBUILD_ENV) go build -o bin/apiserver -a -ldflags $(LDFLAGS) ./cmd/apiserver/main.go
 
-# Run against the configured Kubernetes cluster in ~/.kube/config
-core-run: fmt vet manifests
-	go run ./cmd/core/main.go
-
-# 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/
-	kubectl apply -f charts/vela-core/templates/defwithtemplate/
-	kubectl apply -f charts/vela-core/templates/definitions/
-	kubectl apply -f charts/vela-core/templates/velaConfig.yaml
-	bin/vela workloads
-	@$(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/templates/definitions/
-	kubectl delete -f charts/vela-core/templates/defwithtemplate/
-	kubectl delete -f charts/vela-core/crds/
+vela-runtime-rollout-manager: fmt vet lint manifests
+	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests:
+manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
-	./hack/vela-templates/gen_definitions.sh
+	# TODO(yangsoon): kustomize will merge all CRD into a whole file, it may not work if we want patch more than one CRD in this way
+	$(KUSTOMIZE) build config/crd -o config/crd/base/core.oam.dev_applications.yaml
+	./hack/crd/cleanup.sh
+	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
+
 
-GOLANGCILINT_VERSION ?= v1.31.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
+check-license-header:
+	./hack/licence/header-check.sh
 
-.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
+def-install:
+	./hack/utils/installdefinition.sh
 
-.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
-
-start-dashboard:
-	go run pkg/server/main/startAPIServer.go &
-	cd dashboard && npm install && npm start && cd ..
-
-swagger-gen:
-	$(GOBIN)/swag init -g server/route.go -d pkg/ -o pkg/server/docs/

PROJECT

@@ -1,7 +0,0 @@
-domain: oam.dev
-repo: github.com/oam-dev/kubevela
-resources:
-- group: standard
-  kind: Route
-  version: v1alpha1
-version: "2"

README.md

@@ -1,3 +1,11 @@
+<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)
@@ -7,42 +15,58 @@
 [![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)
 
-![alt](docs/resources/KubeVela-03.png)
+## Introduction
 
-*Make shipping applications more enjoyable.*
+KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable.
 
-# KubeVela
+![](docs/resources/what-is-kubevela.png)
 
-For developers, KubeVela is an easy-to-use yet extensible platform that enables them to design and ship applications with minimal effort.
+## Highlights
 
-For platform builders, KubeVela is the core engine that empowers them to create above platform with ease.
+KubeVela practices the "render, orchestrate, deploy" workflow with below highlighted values added to existing ecosystem:
 
-## Community
+- *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.
 
-- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel
-- Gitter: [Discussion](https://gitter.im/oam-dev/community)
+- *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.
 
-> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
+- *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.
 
-## How It Works?
+## Getting Started
 
-![alt](docs/resources/how-it-works.png)
-
-## Quick Start
-
-Quick start guides for developers are available on [this section](https://kubevela.io/#/en/quick-start).
-
-## Platform Builder Guide
-
-Detailed guides for platform teams are available on [this section](https://kubevela.io/#/en/platform-engineers/overview).
+- [Introduction](https://kubevela.io/docs)
+- [Installation](https://kubevela.io/docs/install)
+- [Design Your First Deployment Plan](https://kubevela.io/docs/quick-start)
 
 ## Documentation
 
-For full documentation, please visit the KubeVela website: [https://kubevela.io](https://kubevela.io/).
+Full documentation is available on the [KubeVela website](https://kubevela.io/).
+
+## Community
+
+- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel (*English*)
+- Gitter: [oam-dev](https://gitter.im/oam-dev/community) (*English*)
+- [DingTalk Group](https://page.dingtalk.com/wow/dingtalk/act/en-home): `23310022` (*Chinese*)
+- Wechat Group (*Chinese*): Broker wechat to add you into the user group.
+ 
+  <img src="https://static.kubevela.net/images/barnett-wechat.jpg" width="200" />
+- Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs)
+
+## Talks and Conferences
+
+| Engagement | Link        |
+|:-----------|:------------|
+| 🎤  Talks | - [KubeVela - The Modern App Delivery System in Alibaba](https://docs.google.com/presentation/d/1CWCLcsKpDQB3bBDTfdv2BZ8ilGGJv2E8L-iOA5HMrV0/edit?usp=sharing) |
+| 🌎 KubeCon | - [ [NA 2020] Standardizing Cloud Native Application Delivery Across Different Clouds](https://www.youtube.com/watch?v=0yhVuBIbHcI) <br> - [ [EU 2021] Zero Pain Microservice Development and Deployment with Dapr and KubeVela](https://sched.co/iE4S) |
+| 📺 Conferences | - [Dapr, Rudr, OAM: Mark Russinovich presents next gen app development & deployment](https://www.youtube.com/watch?v=eJCu6a-x9uo) <br> - [Mark Russinovich presents "The Future of Cloud Native Applications with OAM and Dapr"](https://myignite.techcommunity.microsoft.com/sessions/82059)|
 
 ## Contributing
 Check out [CONTRIBUTING](./CONTRIBUTING.md) to see how to develop with KubeVela.
 
+## Report Vulnerability
+
+Security is a first priority thing for us at KubeVela. If you come across a related issue, please send email to security@mail.kubevela.io .
+
 ## Code of Conduct
-This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.
+KubeVela adopts [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

SECURITY.md

@@ -0,0 +1,20 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you've found a security issue that you'd like to disclose confidentially please send email to security@mail.kubevela.io .
+
+### Who Reads Email Sent to security@mail.kubevela.io?
+
+Only a restricted and carefully chosen group of KubeVela maintainers will have access to material sent to the security@mail.kubevela.io address.
+No outside users can subscribe to this list.
+
+### What to Send to security@mail.kubevela.io
+
+Please provide as much information about your system and the issue as possible when contacting the list.
+
+## How We Respond
+
+Email sent to security@mail.kubevela.io is read and acknowledged with a non-automated response within three working days.
+For issues that are complicated and require significant attention,
+we will open an investigation and will provide you with a mechanism to check the status of our progress at any time.

apis/apis.go

@@ -1,2 +1,18 @@
+/*
+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 apis contains all api types of KubeVela
 package apis

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

@@ -0,0 +1,19 @@
+/*
+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 contains types required for both v1alpha2 and v1beta1
+// +kubebuilder:object:generate=true
+package common

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

@@ -0,0 +1,610 @@
+/*
+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 (
+	"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"
+
+	"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
+type Kube struct {
+	// Template defines the raw Kubernetes resource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Template runtime.RawExtension `json:"template"`
+
+	// Parameters defines configurable parameters
+	Parameters []KubeParameter `json:"parameters,omitempty"`
+}
+
+// ParameterValueType refers to a data type of parameter
+type ParameterValueType string
+
+// data types of parameter value
+const (
+	StringType  ParameterValueType = "string"
+	NumberType  ParameterValueType = "number"
+	BooleanType ParameterValueType = "boolean"
+)
+
+// A KubeParameter defines a configurable parameter of a component.
+type KubeParameter struct {
+	// Name of this parameter
+	Name string `json:"name"`
+
+	// +kubebuilder:validation:Enum:=string;number;boolean
+	// ValueType indicates the type of the parameter value, and
+	// only supports basic data types: string, number, boolean.
+	ValueType ParameterValueType `json:"type"`
+
+	// FieldPaths specifies an array of fields within this workload that will be
+	// overwritten by the value of this parameter. 	All fields must be of the
+	// same type. Fields are specified as JSON field paths without a leading
+	// dot, for example 'spec.replicas'.
+	FieldPaths []string `json:"fieldPaths"`
+
+	// +kubebuilder:default:=false
+	// Required specifies whether or not a value for this parameter must be
+	// supplied when authoring an Application.
+	Required *bool `json:"required,omitempty"`
+
+	// Description of this parameter.
+	Description *string `json:"description,omitempty"`
+}
+
+// CUE defines the encapsulation in CUE format
+type CUE struct {
+	// Template defines the abstraction template data of the capability, it will replace the old CUE template in extension field.
+	// Template is a required field if CUE is defined in Capability Definition.
+	Template string `json:"template"`
+}
+
+// Schematic defines the encapsulation of this capability(workload/trait/scope),
+// the encapsulation can be defined in different ways, e.g. CUE/HCL(terraform)/KUBE(K8s Object)/HELM, etc...
+type Schematic struct {
+	KUBE *Kube `json:"kube,omitempty"`
+
+	CUE *CUE `json:"cue,omitempty"`
+
+	HELM *Helm `json:"helm,omitempty"`
+
+	Terraform *Terraform `json:"terraform,omitempty"`
+}
+
+// A Helm represents resources used by a Helm module
+type Helm struct {
+	// Release records a Helm release used by a Helm module workload.
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Release runtime.RawExtension `json:"release"`
+
+	// HelmRelease records a Helm repository used by a Helm module workload.
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Repository runtime.RawExtension `json:"repository"`
+}
+
+// Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+type Terraform struct {
+	// Configuration is Terraform Configuration
+	Configuration string `json:"configuration"`
+
+	// Type specifies which Terraform configuration it is, HCL or JSON syntax
+	// +kubebuilder:default:=hcl
+	// +kubebuilder:validation:Enum:=hcl;json;remote
+	Type string `json:"type,omitempty"`
+
+	// 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"`
+}
+
+// A WorkloadTypeDescriptor refer to a Workload Type
+type WorkloadTypeDescriptor struct {
+	// Type ref to a WorkloadDefinition via name
+	Type string `json:"type,omitempty"`
+	// Definition mutually exclusive to workload.type, a embedded WorkloadDefinition
+	Definition WorkloadGVK `json:"definition,omitempty"`
+}
+
+// WorkloadGVK refer to a Workload Type
+type WorkloadGVK struct {
+	APIVersion string `json:"apiVersion"`
+	Kind       string `json:"kind"`
+}
+
+// A DefinitionReference refers to a CustomResourceDefinition by name.
+type DefinitionReference struct {
+	// Name of the referenced CustomResourceDefinition.
+	Name string `json:"name"`
+
+	// Version indicate which version should be used if CRD has multiple versions
+	// by default it will use the first one if not specified
+	Version string `json:"version,omitempty"`
+}
+
+// A ChildResourceKind defines a child Kubernetes resource kind with a selector
+type ChildResourceKind struct {
+	// APIVersion of the child resource
+	APIVersion string `json:"apiVersion"`
+
+	// Kind of the child resource
+	Kind string `json:"kind"`
+
+	// Selector to select the child resources that the workload wants to expose to traits
+	Selector map[string]string `json:"selector,omitempty"`
+}
+
+// Status defines the loop back status of the abstraction by using CUE template
+type Status struct {
+	// CustomStatus defines the custom status message that could display to user
+	// +optional
+	CustomStatus string `json:"customStatus,omitempty"`
+	// HealthPolicy defines the health check policy for the abstraction
+	// +optional
+	HealthPolicy string `json:"healthPolicy,omitempty"`
+}
+
+// ApplicationPhase is a label for the condition of an application at the current time
+type ApplicationPhase string
+
+const (
+	// ApplicationRollingOut means the app is in the middle of rolling out
+	ApplicationRollingOut ApplicationPhase = "rollingOut"
+	// ApplicationStarting means the app is preparing for reconcile
+	ApplicationStarting ApplicationPhase = "starting"
+	// ApplicationRendering means the app is rendering
+	ApplicationRendering ApplicationPhase = "rendering"
+	// ApplicationPolicyGenerating means the app is generating policies
+	ApplicationPolicyGenerating ApplicationPhase = "generatingPolicy"
+	// ApplicationRunningWorkflow means the app is running workflow
+	ApplicationRunningWorkflow ApplicationPhase = "runningWorkflow"
+	// ApplicationWorkflowSuspending means the app's workflow is suspending
+	ApplicationWorkflowSuspending ApplicationPhase = "workflowSuspending"
+	// ApplicationWorkflowTerminated means the app's workflow is terminated
+	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
+	// ApplicationWorkflowFinished means the app's workflow is finished
+	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
+	// ApplicationRunning means the app finished rendering and applied result to the cluster
+	ApplicationRunning ApplicationPhase = "running"
+	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
+	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 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
+type ApplicationComponentStatus struct {
+	Name string `json:"name"`
+	Env  string `json:"env,omitempty"`
+	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
+	Healthy            bool                     `json:"healthy"`
+	Message            string                   `json:"message,omitempty"`
+	Traits             []ApplicationTraitStatus `json:"traits,omitempty"`
+	Scopes             []corev1.ObjectReference `json:"scopes,omitempty"`
+}
+
+// ApplicationTraitStatus records the trait health status
+type ApplicationTraitStatus struct {
+	Type    string `json:"type"`
+	Healthy bool   `json:"healthy"`
+	Message string `json:"message,omitempty"`
+}
+
+// Revision has name and revision number
+type Revision struct {
+	Name     string `json:"name"`
+	Revision int64  `json:"revision"`
+
+	// RevisionHash record the hash value of the spec of ApplicationRevision object.
+	RevisionHash string `json:"revisionHash,omitempty"`
+}
+
+// RawComponent record raw component
+type RawComponent struct {
+	// +kubebuilder:validation:EmbeddedResource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Raw runtime.RawExtension `json:"raw"`
+}
+
+// WorkflowStepStatus record the status of a workflow step
+type WorkflowStepStatus struct {
+	ID    string            `json:"id"`
+	Name  string            `json:"name,omitempty"`
+	Type  string            `json:"type,omitempty"`
+	Phase WorkflowStepPhase `json:"phase,omitempty"`
+	// A human readable message indicating details about why the workflowStep is in this state.
+	Message string `json:"message,omitempty"`
+	// A brief CamelCase message indicating details about why the workflowStep is in this state.
+	Reason   string          `json:"reason,omitempty"`
+	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
+type WorkflowSubStepStatus struct {
+	ID    string            `json:"id"`
+	Name  string            `json:"name,omitempty"`
+	Type  string            `json:"type,omitempty"`
+	Phase WorkflowStepPhase `json:"phase,omitempty"`
+	// A human readable message indicating details about why the workflowStep is in this state.
+	Message string `json:"message,omitempty"`
+	// A brief CamelCase message indicating details about why the workflowStep is in this state.
+	Reason string `json:"reason,omitempty"`
+}
+
+// AppStatus defines the observed state of Application
+type AppStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+	condition.ConditionedStatus `json:",inline"`
+
+	// The generation observed by the application controller.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	Phase ApplicationPhase `json:"status,omitempty"`
+
+	// Components record the related Components created by Application Controller
+	Components []corev1.ObjectReference `json:"components,omitempty"`
+
+	// 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"`
+
+	// Workflow record the status of workflow
+	Workflow *WorkflowStatus `json:"workflow,omitempty"`
+
+	// LatestRevision of the application configuration it generates
+	// +optional
+	LatestRevision *Revision `json:"latestRevision,omitempty"`
+
+	// 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.
+type SubStepsStatus struct {
+	StepIndex int                     `json:"stepIndex,omitempty"`
+	Mode      WorkflowMode            `json:"mode,omitempty"`
+	Steps     []WorkflowSubStepStatus `json:"steps,omitempty"`
+}
+
+// WorkflowStepPhase describes the phase of a workflow step.
+type WorkflowStepPhase string
+
+const (
+	// WorkflowStepPhaseSucceeded will make the controller run the next step.
+	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
+	// WorkflowStepPhaseFailed will report error in `message`.
+	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
+	// WorkflowStepPhaseStopped will make the controller stop the workflow.
+	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
+	// WorkflowStepPhaseRunning will make the controller continue the workflow.
+	WorkflowStepPhaseRunning WorkflowStepPhase = "running"
+)
+
+// DefinitionType describes the type of DefinitionRevision.
+// +kubebuilder:validation:Enum=Component;Trait;Policy;WorkflowStep
+type DefinitionType string
+
+const (
+	// ComponentType represents DefinitionRevision refer to type ComponentDefinition
+	ComponentType DefinitionType = "Component"
+
+	// TraitType represents DefinitionRevision refer to type TraitDefinition
+	TraitType DefinitionType = "Trait"
+
+	// PolicyType represents DefinitionRevision refer to type PolicyDefinition
+	PolicyType DefinitionType = "Policy"
+
+	// WorkflowStepType represents DefinitionRevision refer to type WorkflowStepDefinition
+	WorkflowStepType DefinitionType = "WorkflowStep"
+)
+
+// WorkflowMode describes the mode of workflow
+type WorkflowMode string
+
+const (
+	// WorkflowModeDAG describes the DAG mode of workflow
+	WorkflowModeDAG WorkflowMode = "DAG"
+	// WorkflowModeStep describes the step by step mode of workflow
+	WorkflowModeStep WorkflowMode = "StepByStep"
+)
+
+// AppRolloutStatus defines the observed state of AppRollout
+type AppRolloutStatus struct {
+	v1alpha1.RolloutStatus `json:",inline"`
+
+	// 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"`
+}
+
+// ApplicationTrait defines the trait of application
+type ApplicationTrait struct {
+	Type string `json:"type"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+}
+
+// ApplicationComponent describe the component of application
+type ApplicationComponent struct {
+	Name string `json:"name"`
+	Type string `json:"type"`
+	// ExternalRevision specified the component revisionName
+	ExternalRevision string `json:"externalRevision,omitempty"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+
+	DependsOn []string    `json:"dependsOn,omitempty"`
+	Inputs    StepInputs  `json:"inputs,omitempty"`
+	Outputs   StepOutputs `json:"outputs,omitempty"`
+
+	// Traits define the trait of one component, the type must be array to keep the order.
+	Traits []ApplicationTrait `json:"traits,omitempty"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// scopes in ApplicationComponent defines the component-level scopes
+	// the format is <scope-type:scope-instance-name> pairs, the key represents type of `ScopeDefinition` while the value represent the name of scope instance.
+	Scopes map[string]string `json:"scopes,omitempty"`
+}
+
+// StepOutputs defines output variable of WorkflowStep
+type StepOutputs []outputItem
+
+// StepInputs defines variable input of WorkflowStep
+type StepInputs []inputItem
+
+type inputItem struct {
+	ParameterKey string `json:"parameterKey"`
+	From         string `json:"from"`
+}
+
+type outputItem struct {
+	ValueFrom string `json:"valueFrom"`
+	Name      string `json:"name"`
+}
+
+// ClusterSelector defines the rules to select a Cluster resource.
+// Either name or labels is needed.
+type ClusterSelector struct {
+	// Name is the name of the cluster.
+	Name string `json:"name,omitempty"`
+
+	// Labels defines the label selector to select the cluster.
+	Labels map[string]string `json:"labels,omitempty"`
+}
+
+// Distribution defines the replica distribution of an AppRevision to a cluster.
+type Distribution struct {
+	// Replicas is the replica number.
+	Replicas int `json:"replicas,omitempty"`
+}
+
+// ClusterPlacement defines the cluster placement rules for an app revision.
+type ClusterPlacement struct {
+	// ClusterSelector selects the cluster to  deploy apps to.
+	// If not specified, it indicates the host cluster per se.
+	ClusterSelector *ClusterSelector `json:"clusterSelector,omitempty"`
+
+	// Distribution defines the replica distribution of an AppRevision to a cluster.
+	Distribution Distribution `json:"distribution,omitempty"`
+}
+
+// ResourceCreatorRole defines the resource creator.
+type ResourceCreatorRole string
+
+const (
+	// PolicyResourceCreator create the policy resource.
+	PolicyResourceCreator ResourceCreatorRole = "policy"
+	// WorkflowResourceCreator create the resource in workflow.
+	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"`
+	Creator                ResourceCreatorRole `json:"creator,omitempty"`
+	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
+}
+
+// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value.
+// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
+func (re RawExtensionPointer) MarshalJSON() ([]byte, error) {
+	if re.RawExtension == nil {
+		return nil, nil
+	}
+	if re.RawExtension.Raw == nil {
+		// TODO: this is to support legacy behavior of JSONPrinter and YAMLPrinter, which
+		// expect to call json.Marshal on arbitrary versioned objects (even those not in
+		// the scheme). pkg/kubectl/resource#AsVersionedObjects and its interaction with
+		// kubectl get on objects not in the scheme needs to be updated to ensure that the
+		// objects that are not part of the scheme are correctly put into the right form.
+		if re.RawExtension.Object != nil {
+			return json.Marshal(re.RawExtension.Object)
+		}
+		return []byte("null"), nil
+	}
+	// 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")
+}

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

@@ -0,0 +1,60 @@
+/*
+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))
+}

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

@@ -0,0 +1,709 @@
+// +build !ignore_autogenerated
+
+/*
+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.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package common
+
+import (
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// 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
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]v1.ObjectReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.Services != nil {
+		in, out := &in.Services, &out.Services
+		*out = make([]ApplicationComponentStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
+	if in.Workflow != nil {
+		in, out := &in.Workflow, &out.Workflow
+		*out = new(WorkflowStatus)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.LatestRevision != nil {
+		in, out := &in.LatestRevision, &out.LatestRevision
+		*out = new(Revision)
+		**out = **in
+	}
+	if in.AppliedResources != nil {
+		in, out := &in.AppliedResources, &out.AppliedResources
+		*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.
+func (in *AppStatus) DeepCopy() *AppStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(AppStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationComponent) DeepCopyInto(out *ApplicationComponent) {
+	*out = *in
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.DependsOn != nil {
+		in, out := &in.DependsOn, &out.DependsOn
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]ApplicationTrait, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Scopes != nil {
+		in, out := &in.Scopes, &out.Scopes
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponent.
+func (in *ApplicationComponent) DeepCopy() *ApplicationComponent {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationComponent)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStatus) {
+	*out = *in
+	out.WorkloadDefinition = in.WorkloadDefinition
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]ApplicationTraitStatus, len(*in))
+		copy(*out, *in)
+	}
+	if in.Scopes != nil {
+		in, out := &in.Scopes, &out.Scopes
+		*out = make([]v1.ObjectReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponentStatus.
+func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationComponentStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
+	*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 ApplicationTrait.
+func (in *ApplicationTrait) DeepCopy() *ApplicationTrait {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationTrait)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationTraitStatus) DeepCopyInto(out *ApplicationTraitStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTraitStatus.
+func (in *ApplicationTraitStatus) DeepCopy() *ApplicationTraitStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationTraitStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CUE) DeepCopyInto(out *CUE) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CUE.
+func (in *CUE) DeepCopy() *CUE {
+	if in == nil {
+		return nil
+	}
+	out := new(CUE)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ChildResourceKind) DeepCopyInto(out *ChildResourceKind) {
+	*out = *in
+	if in.Selector != nil {
+		in, out := &in.Selector, &out.Selector
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChildResourceKind.
+func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
+	if in == nil {
+		return nil
+	}
+	out := new(ChildResourceKind)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterObjectReference) DeepCopyInto(out *ClusterObjectReference) {
+	*out = *in
+	out.ObjectReference = in.ObjectReference
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterObjectReference.
+func (in *ClusterObjectReference) DeepCopy() *ClusterObjectReference {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterObjectReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterPlacement) DeepCopyInto(out *ClusterPlacement) {
+	*out = *in
+	if in.ClusterSelector != nil {
+		in, out := &in.ClusterSelector, &out.ClusterSelector
+		*out = new(ClusterSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	out.Distribution = in.Distribution
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacement.
+func (in *ClusterPlacement) DeepCopy() *ClusterPlacement {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterPlacement)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterSelector) DeepCopyInto(out *ClusterSelector) {
+	*out = *in
+	if in.Labels != nil {
+		in, out := &in.Labels, &out.Labels
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSelector.
+func (in *ClusterSelector) DeepCopy() *ClusterSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterSelector)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DefinitionReference) DeepCopyInto(out *DefinitionReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionReference.
+func (in *DefinitionReference) DeepCopy() *DefinitionReference {
+	if in == nil {
+		return nil
+	}
+	out := new(DefinitionReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Distribution) DeepCopyInto(out *Distribution) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Distribution.
+func (in *Distribution) DeepCopy() *Distribution {
+	if in == nil {
+		return nil
+	}
+	out := new(Distribution)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Helm) DeepCopyInto(out *Helm) {
+	*out = *in
+	in.Release.DeepCopyInto(&out.Release)
+	in.Repository.DeepCopyInto(&out.Repository)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Helm.
+func (in *Helm) DeepCopy() *Helm {
+	if in == nil {
+		return nil
+	}
+	out := new(Helm)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kube) DeepCopyInto(out *Kube) {
+	*out = *in
+	in.Template.DeepCopyInto(&out.Template)
+	if in.Parameters != nil {
+		in, out := &in.Parameters, &out.Parameters
+		*out = make([]KubeParameter, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kube.
+func (in *Kube) DeepCopy() *Kube {
+	if in == nil {
+		return nil
+	}
+	out := new(Kube)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KubeParameter) DeepCopyInto(out *KubeParameter) {
+	*out = *in
+	if in.FieldPaths != nil {
+		in, out := &in.FieldPaths, &out.FieldPaths
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Required != nil {
+		in, out := &in.Required, &out.Required
+		*out = new(bool)
+		**out = **in
+	}
+	if in.Description != nil {
+		in, out := &in.Description, &out.Description
+		*out = new(string)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeParameter.
+func (in *KubeParameter) DeepCopy() *KubeParameter {
+	if in == nil {
+		return nil
+	}
+	out := new(KubeParameter)
+	in.DeepCopyInto(out)
+	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
+	in.Raw.DeepCopyInto(&out.Raw)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RawComponent.
+func (in *RawComponent) DeepCopy() *RawComponent {
+	if in == nil {
+		return nil
+	}
+	out := new(RawComponent)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RawExtensionPointer) DeepCopyInto(out *RawExtensionPointer) {
+	*out = *in
+	if in.RawExtension != nil {
+		in, out := &in.RawExtension, &out.RawExtension
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RawExtensionPointer.
+func (in *RawExtensionPointer) DeepCopy() *RawExtensionPointer {
+	if in == nil {
+		return nil
+	}
+	out := new(RawExtensionPointer)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Revision) DeepCopyInto(out *Revision) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Revision.
+func (in *Revision) DeepCopy() *Revision {
+	if in == nil {
+		return nil
+	}
+	out := new(Revision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Schematic) DeepCopyInto(out *Schematic) {
+	*out = *in
+	if in.KUBE != nil {
+		in, out := &in.KUBE, &out.KUBE
+		*out = new(Kube)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.CUE != nil {
+		in, out := &in.CUE, &out.CUE
+		*out = new(CUE)
+		**out = **in
+	}
+	if in.HELM != nil {
+		in, out := &in.HELM, &out.HELM
+		*out = new(Helm)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Terraform != nil {
+		in, out := &in.Terraform, &out.Terraform
+		*out = new(Terraform)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schematic.
+func (in *Schematic) DeepCopy() *Schematic {
+	if in == nil {
+		return nil
+	}
+	out := new(Schematic)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Status) DeepCopyInto(out *Status) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Status.
+func (in *Status) DeepCopy() *Status {
+	if in == nil {
+		return nil
+	}
+	out := new(Status)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepInputs) DeepCopyInto(out *StepInputs) {
+	{
+		in := &in
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepInputs.
+func (in StepInputs) DeepCopy() StepInputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepInputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepOutputs) DeepCopyInto(out *StepOutputs) {
+	{
+		in := &in
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepOutputs.
+func (in StepOutputs) DeepCopy() StepOutputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepOutputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SubStepsStatus) DeepCopyInto(out *SubStepsStatus) {
+	*out = *in
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]WorkflowSubStepStatus, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SubStepsStatus.
+func (in *SubStepsStatus) DeepCopy() *SubStepsStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(SubStepsStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Terraform) DeepCopyInto(out *Terraform) {
+	*out = *in
+	in.BaseConfigurationSpec.DeepCopyInto(&out.BaseConfigurationSpec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
+func (in *Terraform) DeepCopy() *Terraform {
+	if in == nil {
+		return nil
+	}
+	out := new(Terraform)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
+	*out = *in
+	if in.ContextBackend != nil {
+		in, out := &in.ContextBackend, &out.ContextBackend
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]WorkflowStepStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	in.StartTime.DeepCopyInto(&out.StartTime)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
+func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
+	*out = *in
+	if in.SubSteps != nil {
+		in, out := &in.SubSteps, &out.SubSteps
+		*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.
+func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowSubStepStatus) DeepCopyInto(out *WorkflowSubStepStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStepStatus.
+func (in *WorkflowSubStepStatus) DeepCopy() *WorkflowSubStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowSubStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadGVK.
+func (in *WorkloadGVK) DeepCopy() *WorkloadGVK {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadGVK)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadTypeDescriptor) DeepCopyInto(out *WorkloadTypeDescriptor) {
+	*out = *in
+	out.Definition = in.Definition
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadTypeDescriptor.
+func (in *WorkloadTypeDescriptor) DeepCopy() *WorkloadTypeDescriptor {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadTypeDescriptor)
+	in.DeepCopyInto(out)
+	return out
+}

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

@@ -0,0 +1,282 @@
+/*
+
+// This file is originally from https://github.com/crossplane/crossplane-runtime/blob/master/apis/common/v1/condition.go
+// We copy it here to reduce dependency and add more
+
+Copyright 2021 The KubeVela Authors.
+Copyright 2019 The Crossplane 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 condition
+
+import (
+	"sort"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// A ConditionType represents a condition a resource could be in.
+// nolint:golint
+type ConditionType string
+
+// Condition types.
+const (
+	// TypeReady resources are believed to be ready to handle work.
+	TypeReady ConditionType = "Ready"
+
+	// TypeSynced resources are believed to be in sync with the
+	// Kubernetes resources that manage their lifecycle.
+	TypeSynced ConditionType = "Synced"
+)
+
+// A ConditionReason represents the reason a resource is in a condition.
+// nolint:golint
+type ConditionReason string
+
+// Reasons a resource is or is not ready.
+const (
+	ReasonAvailable   ConditionReason = "Available"
+	ReasonUnavailable ConditionReason = "Unavailable"
+	ReasonCreating    ConditionReason = "Creating"
+	ReasonDeleting    ConditionReason = "Deleting"
+)
+
+// Reasons a resource is or is not synced.
+const (
+	ReasonReconcileSuccess ConditionReason = "ReconcileSuccess"
+	ReasonReconcileError   ConditionReason = "ReconcileError"
+)
+
+// A Condition that may apply to a resource.
+type Condition struct {
+	// Type of this condition. At most one of each condition type may apply to
+	// a resource at any point in time.
+	Type ConditionType `json:"type"`
+
+	// Status of this condition; is it currently True, False, or Unknown?
+	Status corev1.ConditionStatus `json:"status"`
+
+	// LastTransitionTime is the last time this condition transitioned from one
+	// status to another.
+	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
+
+	// A Reason for this condition's last transition from one status to another.
+	Reason ConditionReason `json:"reason"`
+
+	// A Message containing details about this condition's last transition from
+	// one status to another, if any.
+	// +optional
+	Message string `json:"message,omitempty"`
+}
+
+// Equal returns true if the condition is identical to the supplied condition,
+// ignoring the LastTransitionTime.
+func (c Condition) Equal(other Condition) bool {
+	return c.Type == other.Type &&
+		c.Status == other.Status &&
+		c.Reason == other.Reason &&
+		c.Message == other.Message
+}
+
+// WithMessage returns a condition by adding the provided message to existing
+// condition.
+func (c Condition) WithMessage(msg string) Condition {
+	c.Message = msg
+	return c
+}
+
+// NOTE(negz): Conditions are implemented as a slice rather than a map to comply
+// with Kubernetes API conventions. Ideally we'd comply by using a map that
+// marshalled to a JSON array, but doing so confuses the CRD schema generator.
+// https://github.com/kubernetes/community/blob/9bf8cd/contributors/devel/sig-architecture/api-conventions.md#lists-of-named-subobjects-preferred-over-maps
+
+// NOTE(negz): Do not manipulate Conditions directly. Use the Set method.
+
+// A ConditionedStatus reflects the observed status of a resource. Only
+// one condition of each type may exist.
+type ConditionedStatus struct {
+	// Conditions of the resource.
+	// +optional
+	Conditions []Condition `json:"conditions,omitempty"`
+}
+
+// NewConditionedStatus returns a stat with the supplied conditions set.
+func NewConditionedStatus(c ...Condition) *ConditionedStatus {
+	s := &ConditionedStatus{}
+	s.SetConditions(c...)
+	return s
+}
+
+// GetCondition returns the condition for the given ConditionType if exists,
+// otherwise returns nil
+func (s *ConditionedStatus) GetCondition(ct ConditionType) Condition {
+	for _, c := range s.Conditions {
+		if c.Type == ct {
+			return c
+		}
+	}
+
+	return Condition{Type: ct, Status: corev1.ConditionUnknown}
+}
+
+// SetConditions sets the supplied conditions, replacing any existing conditions
+// of the same type. This is a no-op if all supplied conditions are identical,
+// ignoring the last transition time, to those already set.
+func (s *ConditionedStatus) SetConditions(c ...Condition) {
+	for _, new := range c {
+		exists := false
+		for i, existing := range s.Conditions {
+			if existing.Type != new.Type {
+				continue
+			}
+
+			if existing.Equal(new) {
+				exists = true
+				continue
+			}
+
+			s.Conditions[i] = new
+			exists = true
+		}
+		if !exists {
+			s.Conditions = append(s.Conditions, new)
+		}
+	}
+}
+
+// Equal returns true if the status is identical to the supplied status,
+// ignoring the LastTransitionTimes and order of statuses.
+func (s *ConditionedStatus) Equal(other *ConditionedStatus) bool {
+	if s == nil || other == nil {
+		return s == nil && other == nil
+	}
+
+	if len(other.Conditions) != len(s.Conditions) {
+		return false
+	}
+
+	sc := make([]Condition, len(s.Conditions))
+	copy(sc, s.Conditions)
+
+	oc := make([]Condition, len(other.Conditions))
+	copy(oc, other.Conditions)
+
+	// We should not have more than one condition of each type.
+	sort.Slice(sc, func(i, j int) bool { return sc[i].Type < sc[j].Type })
+	sort.Slice(oc, func(i, j int) bool { return oc[i].Type < oc[j].Type })
+
+	for i := range sc {
+		if !sc[i].Equal(oc[i]) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// Creating returns a condition that indicates the resource is currently
+// being created.
+func Creating() Condition {
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonCreating,
+	}
+}
+
+// Deleting returns a condition that indicates the resource is currently
+// being deleted.
+func Deleting() Condition {
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonDeleting,
+	}
+}
+
+// Available returns a condition that indicates the resource is
+// currently observed to be available for use.
+func Available() Condition {
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionTrue,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonAvailable,
+	}
+}
+
+// Unavailable returns a condition that indicates the resource is not
+// currently available for use. Unavailable should be set only when Crossplane
+// expects the resource to be available but knows it is not, for example
+// because its API reports it is unhealthy.
+func Unavailable() Condition {
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonUnavailable,
+	}
+}
+
+// ReconcileSuccess returns a condition indicating that Crossplane successfully
+// completed the most recent reconciliation of the resource.
+func ReconcileSuccess() Condition {
+	return Condition{
+		Type:               TypeSynced,
+		Status:             corev1.ConditionTrue,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonReconcileSuccess,
+	}
+}
+
+// ReconcileError returns a condition indicating that Crossplane encountered an
+// error while reconciling the resource. This could mean Crossplane was
+// unable to update the resource to reflect its desired state, or that
+// Crossplane was unable to determine the current actual state of the resource.
+func ReconcileError(err error) Condition {
+	return Condition{
+		Type:               TypeSynced,
+		Status:             corev1.ConditionFalse,
+		LastTransitionTime: metav1.Now(),
+		Reason:             ReasonReconcileError,
+		Message:            err.Error(),
+	}
+}
+
+// ReadyCondition generate ready condition for conditionType
+func ReadyCondition(tpy string) Condition {
+	return Condition{
+		Type:               ConditionType(tpy),
+		Status:             corev1.ConditionTrue,
+		Reason:             ReasonAvailable,
+		LastTransitionTime: metav1.NewTime(time.Now()),
+	}
+}
+
+// ErrorCondition generate error condition for conditionType and error
+func ErrorCondition(tpy string, err error) Condition {
+	return Condition{
+		Type:               ConditionType(tpy),
+		Status:             corev1.ConditionFalse,
+		LastTransitionTime: metav1.NewTime(time.Now()),
+		Reason:             ReasonReconcileError,
+		Message:            err.Error(),
+	}
+}

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

@@ -0,0 +1,221 @@
+// This file is originally from https://github.com/crossplane/crossplane-runtime/blob/master/apis/common/v1/condition_test.go
+// We copy it here to reduce dependency
+
+/*
+Copyright 2019 The Crossplane 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 condition
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/pkg/errors"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestConditionEqual(t *testing.T) {
+	cases := map[string]struct {
+		a    Condition
+		b    Condition
+		want bool
+	}{
+		"IdenticalIgnoringTimestamp": {
+			a:    Condition{Type: TypeReady, LastTransitionTime: metav1.Now()},
+			b:    Condition{Type: TypeReady, LastTransitionTime: metav1.Now()},
+			want: true,
+		},
+		"DifferentType": {
+			a:    Condition{Type: TypeReady},
+			b:    Condition{Type: TypeSynced},
+			want: false,
+		},
+		"DifferentStatus": {
+			a:    Condition{Status: corev1.ConditionTrue},
+			b:    Condition{Status: corev1.ConditionFalse},
+			want: false,
+		},
+		"DifferentReason": {
+			a:    Condition{Reason: ReasonCreating},
+			b:    Condition{Reason: ReasonDeleting},
+			want: false,
+		},
+		"DifferentMessage": {
+			a:    Condition{Message: "cool"},
+			b:    Condition{Message: "uncool"},
+			want: false,
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			got := tc.a.Equal(tc.b)
+
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
+			}
+		})
+	}
+}
+
+func TestConditionedStatusEqual(t *testing.T) {
+	cases := map[string]struct {
+		a    *ConditionedStatus
+		b    *ConditionedStatus
+		want bool
+	}{
+		"Identical": {
+			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
+			b:    NewConditionedStatus(Available(), ReconcileSuccess()),
+			want: true,
+		},
+		"IdenticalExceptOrder": {
+			a:    NewConditionedStatus(Unavailable(), ReconcileSuccess()),
+			b:    NewConditionedStatus(ReconcileSuccess(), Unavailable()),
+			want: true,
+		},
+		"DifferentLength": {
+			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
+			b:    NewConditionedStatus(ReconcileSuccess()),
+			want: false,
+		},
+		"DifferentCondition": {
+			a:    NewConditionedStatus(Creating(), ReconcileSuccess()),
+			b:    NewConditionedStatus(Creating(), ReconcileError(errors.New("boom"))),
+			want: false,
+		},
+		"AIsNil": {
+			a:    nil,
+			b:    NewConditionedStatus(Deleting(), ReconcileSuccess()),
+			want: false,
+		},
+		"BIsNil": {
+			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
+			b:    nil,
+			want: false,
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			got := tc.a.Equal(tc.b)
+
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
+			}
+		})
+	}
+}
+
+func TestSetConditions(t *testing.T) {
+	cases := map[string]struct {
+		cs   *ConditionedStatus
+		c    []Condition
+		want *ConditionedStatus
+	}{
+		"TypeIsIdentical": {
+			cs:   NewConditionedStatus(Available()),
+			c:    []Condition{Available()},
+			want: NewConditionedStatus(Available()),
+		},
+		"TypeIsDifferent": {
+			cs:   NewConditionedStatus(Creating()),
+			c:    []Condition{Available()},
+			want: NewConditionedStatus(Available()),
+		},
+		"TypeDoesNotExist": {
+			cs:   NewConditionedStatus(ReconcileSuccess()),
+			c:    []Condition{Available()},
+			want: NewConditionedStatus(ReconcileSuccess(), Available()),
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			tc.cs.SetConditions(tc.c...)
+
+			got := tc.cs
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("tc.cs.SetConditions(...): -want, +got:\n%s", diff)
+			}
+		})
+	}
+}
+
+func TestGetCondition(t *testing.T) {
+	cases := map[string]struct {
+		cs   *ConditionedStatus
+		t    ConditionType
+		want Condition
+	}{
+		"ConditionExists": {
+			cs:   NewConditionedStatus(Available()),
+			t:    TypeReady,
+			want: Available(),
+		},
+		"ConditionDoesNotExist": {
+			cs: NewConditionedStatus(Available()),
+			t:  TypeSynced,
+			want: Condition{
+				Type:   TypeSynced,
+				Status: corev1.ConditionUnknown,
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			got := tc.cs.GetCondition(tc.t)
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("tc.cs.GetConditions(...): -want, +got:\n%s", diff)
+			}
+		})
+	}
+}
+
+func TestConditionWithMessage(t *testing.T) {
+	testMsg := "Something went wrong on cloud side"
+	cases := map[string]struct {
+		c    Condition
+		msg  string
+		want Condition
+	}{
+		"MessageAdded": {
+			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable},
+			msg:  testMsg,
+			want: Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
+		},
+		"MessageChanged": {
+			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: "Some other message"},
+			msg:  testMsg,
+			want: Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
+		},
+		"MessageCleared": {
+			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
+			msg:  "",
+			want: Condition{Type: TypeReady, Reason: ReasonUnavailable},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			got := tc.c.WithMessage(tc.msg)
+
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
+			}
+		})
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package commands
-
-// constants used in `svc` command
-const (
-	App     = "app"
-	Service = "svc"
-)
+// Package condition contains condition types
+// +kubebuilder:object:generate=true
+package condition

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

@@ -0,0 +1,59 @@
+// +build !ignore_autogenerated
+
+/*
+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.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package condition
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Condition) DeepCopyInto(out *Condition) {
+	*out = *in
+	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Condition.
+func (in *Condition) DeepCopy() *Condition {
+	if in == nil {
+		return nil
+	}
+	out := new(Condition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ConditionedStatus) DeepCopyInto(out *ConditionedStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionedStatus.
+func (in *ConditionedStatus) DeepCopy() *ConditionedStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ConditionedStatus)
+	in.DeepCopyInto(out)
+	return out
+}

apis/core.oam.dev/groupversion_info.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -20,12 +20,14 @@ package core_oam_dev
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 )
 
 func init() {
 	// Register the types with the Scheme so the resources can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme, v1alpha2.SchemeBuilder.AddToScheme, v1beta1.SchemeBuilder.AddToScheme)
 }
 
 // AddToSchemes may be used to add all resources defined in the project to a Scheme

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

@@ -0,0 +1,27 @@
+/*
+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"`
+}

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

@@ -0,0 +1,22 @@
+/*
+ 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 contains resources relating to the Open Application Model.
+// See https://github.com/oam-dev/spec for more details.
+// +kubebuilder:object:generate=true
+// +groupName=core.oam.dev
+// +versionName=v1alpha1
+package v1alpha1

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

@@ -0,0 +1,134 @@
+/*
+ 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/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+const (
+	// EnvBindingPolicyType refers to the type of EnvBinding
+	EnvBindingPolicyType = "env-binding"
+)
+
+// EnvTraitPatch is the patch to trait
+type EnvTraitPatch struct {
+	Type       string                `json:"type"`
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+	Disable    bool                  `json:"disable,omitempty"`
+}
+
+// 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
+}
+
+// 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"`
+}
+
+// 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
+}
+
+// EnvPatch specify the parameter configuration for different environments
+type EnvPatch struct {
+	Components []EnvComponentPatch `json:"components,omitempty"`
+}
+
+// NamespaceSelector defines the rules to select a Namespace resource.
+// Either name or labels is needed.
+type NamespaceSelector struct {
+	// Name is the name of the namespace.
+	Name string `json:"name,omitempty"`
+	// Labels defines the label selector to select the namespace.
+	Labels map[string]string `json:"labels,omitempty"`
+}
+
+// EnvPlacement defines the placement rules for an app.
+type EnvPlacement struct {
+	ClusterSelector   *common.ClusterSelector `json:"clusterSelector,omitempty"`
+	NamespaceSelector *NamespaceSelector      `json:"namespaceSelector,omitempty"`
+}
+
+// EnvSelector defines which components should this env contains
+type EnvSelector struct {
+	Components []string `json:"components,omitempty"`
+}
+
+// EnvConfig is the configuration for different environments.
+type EnvConfig struct {
+	Name      string       `json:"name"`
+	Placement EnvPlacement `json:"placement,omitempty"`
+	Selector  *EnvSelector `json:"selector,omitempty"`
+	Patch     EnvPatch     `json:"patch,omitempty"`
+}
+
+// EnvBindingSpec defines a list of envs
+type EnvBindingSpec struct {
+	Envs []EnvConfig `json:"envs"`
+}
+
+// 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
+type EnvBindingStatus struct {
+	Envs               []EnvStatus         `json:"envs"`
+	ClusterConnections []ClusterConnection `json:"clusterConnections"`
+}

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

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

@@ -0,0 +1,83 @@
+/*
+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)
+			}
+		})
+	}
+}

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

@@ -0,0 +1,39 @@
+/*
+ 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/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+// Package type metadata.
+const (
+	Group   = "core.oam.dev"
+	Version = "v1alpha1"
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: Group, Version: Version}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+)
+
+func init() {
+}

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

@@ -0,0 +1,357 @@
+// +build !ignore_autogenerated
+
+/*
+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.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"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) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOncePolicySpec.
+func (in *ApplyOncePolicySpec) DeepCopy() *ApplyOncePolicySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplyOncePolicySpec)
+	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) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterConnection.
+func (in *ClusterConnection) DeepCopy() *ClusterConnection {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterConnection)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// 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
+	if in.Envs != nil {
+		in, out := &in.Envs, &out.Envs
+		*out = make([]EnvConfig, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingSpec.
+func (in *EnvBindingSpec) DeepCopy() *EnvBindingSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvBindingSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// 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))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingStatus.
+func (in *EnvBindingStatus) DeepCopy() *EnvBindingStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvBindingStatus)
+	in.DeepCopyInto(out)
+	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
+	in.Placement.DeepCopyInto(&out.Placement)
+	if in.Selector != nil {
+		in, out := &in.Selector, &out.Selector
+		*out = new(EnvSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	in.Patch.DeepCopyInto(&out.Patch)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvConfig.
+func (in *EnvConfig) DeepCopy() *EnvConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvPatch) DeepCopyInto(out *EnvPatch) {
+	*out = *in
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]EnvComponentPatch, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvPatch.
+func (in *EnvPatch) DeepCopy() *EnvPatch {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvPatch)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvPlacement) DeepCopyInto(out *EnvPlacement) {
+	*out = *in
+	if in.ClusterSelector != nil {
+		in, out := &in.ClusterSelector, &out.ClusterSelector
+		*out = new(common.ClusterSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.NamespaceSelector != nil {
+		in, out := &in.NamespaceSelector, &out.NamespaceSelector
+		*out = new(NamespaceSelector)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvPlacement.
+func (in *EnvPlacement) DeepCopy() *EnvPlacement {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvPlacement)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvSelector) DeepCopyInto(out *EnvSelector) {
+	*out = *in
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvSelector.
+func (in *EnvSelector) DeepCopy() *EnvSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvSelector)
+	in.DeepCopyInto(out)
+	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
+	if in.Labels != nil {
+		in, out := &in.Labels, &out.Labels
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamespaceSelector.
+func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(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
+}

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

@@ -1,81 +0,0 @@
-/*
-Copyright 2020 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"
-)
-
-// ApplicationDeploymentSpec defines how to describe an upgrade between different application
-type ApplicationDeploymentSpec struct {
-	// TargetApplicationName contains the name of the application that we need to upgrade to.
-	// We assume that an application is immutable, thus the name alone is suffice
-	TargetApplicationName string `json:"targetApplicationName"`
-
-	// SourceApplicationName contains the name of the application that we need to upgrade from.
-	// it can be empty only when it's the first time to deploy the application
-	SourceApplicationName string `json:"sourceApplicationName,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, default is false
-	// It will remove the target application from the kubernetes
-	// +optional
-	RevertOnDelete *bool `json:"revertOnDelete,omitempty"`
-}
-
-// ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
-type ApplicationDeploymentStatus struct {
-	v1alpha1.RolloutStatus `json:",inline"`
-
-	// LastTargetApplicationName contains the name of the application that we upgraded to
-	// We will restart the rollout if this is not the same as the spec
-	LastTargetApplicationName string `json:"lastTargetApplicationName"`
-
-	// LastSourceApplicationName contains the name of the application that we need to upgrade from.
-	// We will restart the rollout if this is not the same as the spec
-	LastSourceApplicationName string `json:"lastSourceApplicationName,omitempty"`
-}
-
-// ApplicationDeployment is the Schema for the ApplicationDeployment API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type ApplicationDeployment struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ApplicationDeploymentSpec   `json:"spec,omitempty"`
-	Status ApplicationDeploymentStatus `json:"status,omitempty"`
-}
-
-// ApplicationDeploymentList contains a list of ApplicationDeployment
-// +kubebuilder:object:root=true
-type ApplicationDeploymentList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationDeployment `json:"items"`
-}

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

@@ -1,5 +1,5 @@
 /*
-
+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.
@@ -17,65 +17,44 @@ limitations under the License.
 package v1alpha2
 
 import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	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"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// ApplicationPhase is a label for the condition of a application at the current time
-type ApplicationPhase string
-
-const (
-	// ApplicationRollingOut means the app is in the middle of rolling out
-	ApplicationRollingOut ApplicationPhase = "rollingOut"
-	// ApplicationRendering means the app is rendering
-	ApplicationRendering ApplicationPhase = "rendering"
-	// ApplicationRunning means the app finished rendering and applied result to the cluster
-	ApplicationRunning ApplicationPhase = "running"
-	// ApplicationHealthChecking means the app finished rendering and applied result to the cluster, but still unhealthy
-	ApplicationHealthChecking ApplicationPhase = "healthChecking"
-)
-
 // AppStatus defines the observed state of Application
 type AppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+	v1alpha1.RolloutStatus `json:",inline"`
 
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-
-	Phase ApplicationPhase `json:"status,omitempty"`
+	Phase common.ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
-	Components []runtimev1alpha1.TypedReference `json:"components,omitempty"`
+	Components []corev1.ObjectReference `json:"components,omitempty"`
 
 	// Services record the status of the application services
-	Services []ApplicationComponentStatus `json:"services,omitempty"`
-}
+	Services []common.ApplicationComponentStatus `json:"services,omitempty"`
 
-// ApplicationComponentStatus record the health status of App component
-type ApplicationComponentStatus struct {
-	Name    string                   `json:"name"`
-	Healthy bool                     `json:"healthy"`
-	Message string                   `json:"message,omitempty"`
-	Traits  []ApplicationTraitStatus `json:"traits,omitempty"`
-}
+	// ResourceTracker record the status of the ResourceTracker
+	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
 
-// ApplicationTraitStatus records the trait health status
-type ApplicationTraitStatus struct {
-	Type    string `json:"type"`
-	Healthy bool   `json:"healthy"`
-	Message string `json:"message,omitempty"`
+	// LatestRevision of the application configuration it generates
+	// +optional
+	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
 }
 
 // ApplicationTrait defines the trait of application
 type ApplicationTrait struct {
 	Name string `json:"name"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties"`
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
 }
 
 // ApplicationComponent describe the component of application
@@ -83,7 +62,7 @@ type ApplicationComponent struct {
 	Name         string `json:"name"`
 	WorkloadType string `json:"type"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Settings runtime.RawExtension `json:"settings"`
+	Settings runtime.RawExtension `json:"settings,omitempty"`
 
 	// Traits define the trait of one component, the type must be array to keep the order.
 	Traits []ApplicationTrait `json:"traits,omitempty"`
@@ -99,18 +78,29 @@ type ApplicationSpec struct {
 	Components []ApplicationComponent `json:"components"`
 
 	// 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
-
 // Application is the Schema for the applications API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=app
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
+// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
+// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ApplicationSpec `json:"spec,omitempty"`
-	Status AppStatus       `json:"status,omitempty"`
+	Spec   ApplicationSpec  `json:"spec,omitempty"`
+	Status common.AppStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -1,3 +1,19 @@
+/*
+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 (
@@ -5,7 +21,7 @@ import (
 	"testing"
 )
 
-func TestApplication_GetComponent(t *testing.T) {
+func TestApplicationGetComponent(t *testing.T) {
 	ac1 := ApplicationComponent{
 		Name:         "ac1",
 		WorkloadType: "type1",

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

@@ -0,0 +1,73 @@
+/*
+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"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// ApplicationRevisionSpec is the spec of ApplicationRevision
+type ApplicationRevisionSpec struct {
+	// Application records the snapshot of the created/modified Application
+	Application Application `json:"application"`
+
+	// ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
+	ComponentDefinitions map[string]ComponentDefinition `json:"componentDefinitions,omitempty"`
+
+	// WorkloadDefinitions records the snapshot of the workloadDefinitions related with the created/modified Application
+	WorkloadDefinitions map[string]WorkloadDefinition `json:"workloadDefinitions,omitempty"`
+
+	// TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
+	TraitDefinitions map[string]TraitDefinition `json:"traitDefinitions,omitempty"`
+
+	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
+	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
+
+	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
+
+	Components []common.RawComponent `json:"components,omitempty"`
+
+	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
+	// it will contains the whole K8s CR of trait and the reference component in it.
+	// +kubebuilder:validation:EmbeddedResource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
+}
+
+// ApplicationRevision is the Schema for the ApplicationRevision API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=apprev
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+type ApplicationRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
+}
+
+// ApplicationRevisionList contains a list of ApplicationRevision
+// +kubebuilder:object:root=true
+type ApplicationRevisionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationRevision `json:"items"`
+}

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

@@ -0,0 +1,103 @@
+/*
+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"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// ComponentDefinitionSpec defines the desired state of ComponentDefinition
+type ComponentDefinitionSpec struct {
+	// Workload is a workload type descriptor
+	Workload common.WorkloadTypeDescriptor `json:"workload"`
+
+	// ChildResourceKinds are the list of GVK of the child resources this workload generates
+	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
+
+	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
+	// can be used by trait to create resource selectors(e.g. label selector for pods).
+	// +optional
+	RevisionLabel string `json:"revisionLabel,omitempty"`
+
+	// PodSpecPath indicates where/if this workload has K8s podSpec field
+	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
+	// +optional
+	PodSpecPath string `json:"podSpecPath,omitempty"`
+
+	// Status defines the custom health policy and status message for workload
+	// +optional
+	Status *common.Status `json:"status,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the workload
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+}
+
+// ComponentDefinitionStatus is the status of ComponentDefinition
+type ComponentDefinitionStatus 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"`
+}
+
+// +kubebuilder:object:root=true
+
+// ComponentDefinition is the Schema for the componentdefinitions API
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+type ComponentDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ComponentDefinitionSpec   `json:"spec,omitempty"`
+	Status ComponentDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for WorkloadDefinition
+func (cd *ComponentDefinition) SetConditions(c ...condition.Condition) {
+	cd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkloadDefinition
+func (cd *ComponentDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return cd.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+
+// ComponentDefinitionList contains a list of ComponentDefinition
+type ComponentDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ComponentDefinition `json:"items"`
+}

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

@@ -0,0 +1,139 @@
+/*
+ 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"
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
+)
+
+// ApplicationV1alpha2ToV1beta1 will convert v1alpha2 to v1beta1
+func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application) {
+	// 1) convert metav1.TypeMeta
+	// apiVersion and Kind automatically converted
+
+	// 2) convert metav1.ObjectMeta
+	v1b1.ObjectMeta = *v1a2.ObjectMeta.DeepCopy()
+
+	// 3) convert Spec  ApplicationSpec
+	// 3.1) convert Spec.Components
+	for _, comp := range v1a2.Spec.Components {
+
+		// convert trait, especially for `.name` -> `.type`
+		var traits = make([]common.ApplicationTrait, len(comp.Traits))
+		for j, trait := range comp.Traits {
+			traits[j] = common.ApplicationTrait{
+				Type:       trait.Name,
+				Properties: trait.Properties.DeepCopy(),
+			}
+		}
+
+		// deep copy scopes
+		scopes := make(map[string]string)
+		for k, v := range comp.Scopes {
+			scopes[k] = v
+		}
+		// convert component
+		// `.settings` -> `.properties`
+		v1b1.Spec.Components = append(v1b1.Spec.Components, common.ApplicationComponent{
+			Name:       comp.Name,
+			Type:       comp.WorkloadType,
+			Properties: comp.Settings.DeepCopy(),
+			Traits:     traits,
+			Scopes:     scopes,
+		})
+	}
+
+	// 4) convert Status common.AppStatus
+	v1b1.Status = *v1a2.Status.DeepCopy()
+}
+
+// ConvertTo converts this Application to the Hub version (v1beta1 only for now).
+func (app *Application) ConvertTo(dst conversion.Hub) error {
+	switch convertedApp := dst.(type) {
+	case *v1beta1.Application:
+		klog.Infof("convert *v1alpha2.Application [%s] to *v1beta1.Application", app.Name)
+		ApplicationV1alpha2ToV1beta1(app, convertedApp)
+		return nil
+	default:
+	}
+	return fmt.Errorf("unsupported convertTo object %v", reflect.TypeOf(dst))
+}
+
+// ConvertFrom converts from the Hub version (v1beta1) to this version (v1alpha2).
+func (app *Application) ConvertFrom(src conversion.Hub) error {
+	switch sourceApp := src.(type) {
+	case *v1beta1.Application:
+
+		klog.Infof("convert *v1alpha2.Application from *v1beta1.Application [%s]", sourceApp.Name)
+
+		// 1) convert metav1.TypeMeta
+		// apiVersion and Kind automatically converted
+
+		// 2) convert metav1.ObjectMeta
+		app.ObjectMeta = *sourceApp.ObjectMeta.DeepCopy()
+
+		// 3) convert Spec  ApplicationSpec
+		// 3.1) convert Spec.Components
+		for _, comp := range sourceApp.Spec.Components {
+
+			// convert trait, especially for `.type` -> `.name`
+			var traits = make([]ApplicationTrait, len(comp.Traits))
+			for j, trait := range comp.Traits {
+				traits[j] = ApplicationTrait{
+					Name:       trait.Type,
+					Properties: trait.Properties.DeepCopy(),
+				}
+			}
+
+			// deep copy scopes
+			scopes := make(map[string]string)
+			for k, v := range comp.Scopes {
+				scopes[k] = v
+			}
+			// convert component
+			//  `.properties` -> `.settings`
+
+			var compProperties runtime.RawExtension
+
+			if comp.Properties != nil {
+				compProperties = *comp.Properties.DeepCopy()
+			}
+
+			app.Spec.Components = append(app.Spec.Components, ApplicationComponent{
+				Name:         comp.Name,
+				WorkloadType: comp.Type,
+				Settings:     compProperties,
+				Traits:       traits,
+				Scopes:       scopes,
+			})
+		}
+
+		// 4) convert Status common.AppStatus
+		app.Status = *sourceApp.Status.DeepCopy()
+		return nil
+	default:
+	}
+	return fmt.Errorf("unsupported ConvertFrom object %v", reflect.TypeOf(src))
+}

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

@@ -0,0 +1,117 @@
+/*
+ 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"))
+}

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -17,9 +17,11 @@ limitations under the License.
 package v1alpha2
 
 import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
@@ -45,21 +47,50 @@ type HealthScopeSpec struct {
 	// ProbeInterval is the amount of time in seconds between probing tries.
 	ProbeInterval *int32 `json:"probe-interval,omitempty"`
 
+	// AppRefs records references of applications' components
+	AppRefs []AppReference `json:"appReferences,omitempty"`
+
 	// WorkloadReferences to the workloads that are in this scope.
-	WorkloadReferences []runtimev1alpha1.TypedReference `json:"workloadRefs"`
+	// +deprecated
+	WorkloadReferences []corev1.ObjectReference `json:"workloadRefs"`
+}
+
+// AppReference records references of an application's components
+type AppReference struct {
+	AppName        string          `json:"appName,omitempty"`
+	CompReferences []CompReference `json:"compReferences,omitempty"`
+}
+
+// CompReference records references of a component's resources
+type CompReference struct {
+	CompName string                   `json:"compName,omitempty"`
+	Workload corev1.ObjectReference   `json:"workload,omitempty"`
+	Traits   []corev1.ObjectReference `json:"traits,omitempty"`
 }
 
 // A HealthScopeStatus represents the observed state of a HealthScope.
 type HealthScopeStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	condition.ConditionedStatus `json:",inline"`
 
 	// ScopeHealthCondition represents health condition summary of the scope
 	ScopeHealthCondition ScopeHealthCondition `json:"scopeHealthCondition"`
 
+	// AppHealthConditions represents health condition of applications in the scope
+	AppHealthConditions []*AppHealthCondition `json:"appHealthConditions,omitempty"`
+
 	// WorkloadHealthConditions represents health condition of workloads in the scope
+	// Use AppHealthConditions to provide app level status
+	// +deprecated
 	WorkloadHealthConditions []*WorkloadHealthCondition `json:"healthConditions,omitempty"`
 }
 
+// AppHealthCondition represents health condition of an application
+type AppHealthCondition struct {
+	AppName    string                     `json:"appName"`
+	EnvName    string                     `json:"envName,omitempty"`
+	Components []*WorkloadHealthCondition `json:"components,omitempty"`
+}
+
 // ScopeHealthCondition represents health condition summary of a scope.
 type ScopeHealthCondition struct {
 	HealthStatus       HealthStatus `json:"healthStatus"`
@@ -69,21 +100,32 @@ type ScopeHealthCondition struct {
 	UnknownWorkloads   int64        `json:"unknownWorkloads,omitempty"`
 }
 
-// WorkloadHealthCondition represents informative health condition.
+// WorkloadHealthCondition represents informative health condition of a workload.
 type WorkloadHealthCondition struct {
 	// ComponentName represents the component name if target is a workload
-	ComponentName  string                         `json:"componentName,omitempty"`
-	TargetWorkload runtimev1alpha1.TypedReference `json:"targetWorkload,omitempty"`
-	HealthStatus   HealthStatus                   `json:"healthStatus"`
-	Diagnosis      string                         `json:"diagnosis,omitempty"`
+	ComponentName  string                 `json:"componentName,omitempty"`
+	TargetWorkload corev1.ObjectReference `json:"targetWorkload,omitempty"`
+	HealthStatus   HealthStatus           `json:"healthStatus"`
+	Diagnosis      string                 `json:"diagnosis,omitempty"`
 	// WorkloadStatus represents status of workloads whose HealthStatus is UNKNOWN.
-	WorkloadStatus string `json:"workloadStatus,omitempty"`
+	WorkloadStatus  string                  `json:"workloadStatus,omitempty"`
+	CustomStatusMsg string                  `json:"customStatusMsg,omitempty"`
+	Traits          []*TraitHealthCondition `json:"traits,omitempty"`
+}
+
+// TraitHealthCondition represents informative health condition of a trait.
+type TraitHealthCondition struct {
+	Type            string       `json:"type"`
+	Resource        string       `json:"resource"`
+	HealthStatus    HealthStatus `json:"healthStatus"`
+	Diagnosis       string       `json:"diagnosis,omitempty"`
+	CustomStatusMsg string       `json:"customStatusMsg,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
 // A HealthScope determines an aggregate health status based of the health of components.
-// +kubebuilder:resource:categories={crossplane,oam}
+// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".status.health",name=HEALTH,type=string
 type HealthScope struct {

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -17,9 +17,11 @@ limitations under the License.
 package v1alpha2
 
 import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
@@ -31,19 +33,19 @@ type ManualScalerTraitSpec struct {
 	ReplicaCount int32 `json:"replicaCount"`
 
 	// WorkloadReference to the workload this trait applies to.
-	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef"`
+	WorkloadReference corev1.ObjectReference `json:"workloadRef"`
 }
 
 // A ManualScalerTraitStatus represents the observed state of a
 // ManualScalerTrait.
 type ManualScalerTraitStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	condition.ConditionedStatus `json:",inline"`
 }
 
 // +kubebuilder:object:root=true
 
 // A ManualScalerTrait determines how many replicas a workload should have.
-// +kubebuilder:resource:categories={crossplane,oam}
+// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 type ManualScalerTrait struct {
 	metav1.TypeMeta   `json:",inline"`

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -17,42 +17,24 @@ limitations under the License.
 package v1alpha2
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/types"
 )
 
-// A DefinitionReference refers to a CustomResourceDefinition by name.
-type DefinitionReference struct {
-	// Name of the referenced CustomResourceDefinition.
-	Name string `json:"name"`
-
-	// Version indicate which version should be used if CRD has multiple versions
-	// by default it will use the first one if not specified
-	Version string `json:"version,omitempty"`
-}
-
-// A ChildResourceKind defines a child Kubernetes resource kind with a selector
-type ChildResourceKind struct {
-	// APIVersion of the child resource
-	APIVersion string `json:"apiVersion"`
-
-	// Kind of the child resource
-	Kind string `json:"kind"`
-
-	// Selector to select the child resources that the workload wants to expose to traits
-	Selector map[string]string `json:"selector,omitempty"`
-}
-
 // A WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
 type WorkloadDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this workload kind.
-	Reference DefinitionReference `json:"definitionRef"`
+	Reference common.DefinitionReference `json:"definitionRef"`
 
 	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []ChildResourceKind `json:"childResourceKinds,omitempty"`
+	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
 
 	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
 	// can be used by trait to create resource selectors(e.g. label selector for pods).
@@ -66,17 +48,11 @@ type WorkloadDefinitionSpec struct {
 
 	// Status defines the custom health policy and status message for workload
 	// +optional
-	Status *Status `json:"status,omitempty"`
+	Status *common.Status `json:"status,omitempty"`
 
-	// Template defines the abstraction template data of the workload, it will replace the old template in extension field.
-	// the data format depends on templateType, by default it's CUE
+	// Schematic defines the data format and template of the encapsulation of the workload
 	// +optional
-	Template string `json:"template,omitempty"`
-
-	// TemplateType defines the data format of the template, by default it's CUE format
-	// Terraform HCL, Helm Chart will also be candidates in the near future.
-	// +optional
-	TemplateType string `json:"templateType,omitempty"`
+	Schematic *common.Schematic `json:"schematic,omitempty"`
 
 	// Extension is used for extension needs by OAM platform builders
 	// +optional
@@ -84,14 +60,9 @@ type WorkloadDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
-// Status defines the loop back status of the abstraction by using CUE template
-type Status struct {
-	// CustomStatus defines the custom status message that could display to user
-	// +optional
-	CustomStatus string `json:"customStatus,omitempty"`
-	// HealthPolicy defines the health check policy for the abstraction
-	// +optional
-	HealthPolicy string `json:"healthPolicy,omitempty"`
+// WorkloadDefinitionStatus is the status of WorkloadDefinition
+type WorkloadDefinitionStatus struct {
+	condition.ConditionedStatus `json:",inline"`
 }
 
 // +kubebuilder:object:root=true
@@ -100,13 +71,24 @@ type Status struct {
 // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
 // is used to validate the schema of the workload when it is embedded in an OAM
 // Component.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
+// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec WorkloadDefinitionSpec `json:"spec,omitempty"`
+	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
+	Status WorkloadDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for WorkloadDefinition
+func (wd *WorkloadDefinition) SetConditions(c ...condition.Condition) {
+	wd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkloadDefinition
+func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return wd.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
@@ -121,7 +103,7 @@ type WorkloadDefinitionList struct {
 // A TraitDefinitionSpec defines the desired state of a TraitDefinition.
 type TraitDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
-	Reference DefinitionReference `json:"definitionRef,omitempty"`
+	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
 
 	// Revision indicates whether a trait is aware of component revision
 	// +optional
@@ -131,6 +113,10 @@ type TraitDefinitionSpec struct {
 	// +optional
 	WorkloadRefPath string `json:"workloadRefPath,omitempty"`
 
+	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+	// +optional
+	PodDisruptive bool `json:"podDisruptive,omitempty"`
+
 	// AppliesToWorkloads specifies the list of workload kinds this trait
 	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
@@ -150,19 +136,13 @@ type TraitDefinitionSpec struct {
 	// +optional
 	ConflictsWith []string `json:"conflictsWith,omitempty"`
 
-	// Template defines the abstraction template data of the workload, it will replace the old template in extension field.
-	// the data format depends on templateType, by default it's CUE
+	// Schematic defines the data format and template of the encapsulation of the trait
 	// +optional
-	Template string `json:"template,omitempty"`
-
-	// TemplateType defines the data format of the template, by default it's CUE format
-	// Terraform HCL, Helm Chart will also be candidates in the near future.
-	// +optional
-	TemplateType string `json:"templateType,omitempty"`
+	Schematic *common.Schematic `json:"schematic,omitempty"`
 
 	// Status defines the custom health policy and status message for trait
 	// +optional
-	Status *Status `json:"status,omitempty"`
+	Status *common.Status `json:"status,omitempty"`
 
 	// Extension is used for extension needs by OAM platform builders
 	// +optional
@@ -170,19 +150,43 @@ type TraitDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
+// TraitDefinitionStatus is the status of TraitDefinition
+type TraitDefinitionStatus 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 trait definition
+	// +optional
+	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 
 // A TraitDefinition registers a kind of Kubernetes custom resource as a valid
 // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
 // to validate the schema of the trait when it is embedded in an OAM
 // ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec TraitDefinitionSpec `json:"spec,omitempty"`
+	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
+	Status TraitDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for TraitDefinition
+func (td *TraitDefinition) SetConditions(c ...condition.Condition) {
+	td.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from TraitDefinition
+func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return td.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
@@ -197,7 +201,7 @@ type TraitDefinitionList struct {
 // A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
 type ScopeDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this scope kind.
-	Reference DefinitionReference `json:"definitionRef"`
+	Reference common.DefinitionReference `json:"definitionRef"`
 
 	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
 	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
@@ -219,7 +223,7 @@ type ScopeDefinitionSpec struct {
 // to validate the schema of the scope when it is embedded in an OAM
 // ApplicationConfiguration.
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -270,6 +274,10 @@ type ComponentSpec struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Workload runtime.RawExtension `json:"workload"`
 
+	// HelmRelease records a Helm release used by a Helm module workload.
+	// +optional
+	Helm *common.Helm `json:"helm,omitempty"`
+
 	// Parameters exposed by this component. ApplicationConfigurations that
 	// reference this component may specify values for these parameters, which
 	// will in turn be injected into the embedded workload.
@@ -283,25 +291,19 @@ type ComponentStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration"`
 
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	condition.ConditionedStatus `json:",inline"`
 
 	// LatestRevision of component
 	// +optional
-	LatestRevision *Revision `json:"latestRevision,omitempty"`
+	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
 
 	// One Component should only be used by one AppConfig
 }
 
-// Revision has name and revision number
-type Revision struct {
-	Name     string `json:"name"`
-	Revision int64  `json:"revision"`
-}
-
 // +kubebuilder:object:root=true
 
 // A Component describes how an OAM workload kind may be instantiated.
-// +kubebuilder:resource:categories={crossplane,oam}
+// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".spec.workload.kind",name=WORKLOAD-KIND,type=string
 // +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
@@ -351,7 +353,7 @@ type ComponentTrait struct {
 // A ComponentScope specifies a scope in which a component should exist.
 type ComponentScope struct {
 	// A ScopeReference must refer to an OAM scope resource.
-	ScopeReference runtimev1alpha1.TypedReference `json:"scopeRef"`
+	ScopeReference corev1.ObjectReference `json:"scopeRef"`
 }
 
 // An ApplicationConfigurationComponent specifies a component of an
@@ -408,7 +410,7 @@ type WorkloadTrait struct {
 	Status TraitStatus `json:"status,omitempty"`
 
 	// Reference to a trait created by an ApplicationConfiguration.
-	Reference runtimev1alpha1.TypedReference `json:"traitRef"`
+	Reference corev1.ObjectReference `json:"traitRef"`
 
 	// Message will allow controller to leave some additional information for this trait
 	Message string `json:"message,omitempty"`
@@ -434,7 +436,7 @@ type WorkloadScope struct {
 	Status ScopeStatus `json:"status,omitempty"`
 
 	// Reference to a scope created by an ApplicationConfiguration.
-	Reference runtimev1alpha1.TypedReference `json:"scopeRef"`
+	Reference corev1.ObjectReference `json:"scopeRef"`
 }
 
 // A WorkloadStatus represents the status of a workload.
@@ -456,7 +458,7 @@ type WorkloadStatus struct {
 	AppliedComponentRevision string `json:"appliedComponentRevision,omitempty"`
 
 	// Reference to a workload created by an ApplicationConfiguration.
-	Reference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
+	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
 
 	// Traits associated with this workload.
 	Traits []WorkloadTrait `json:"traits,omitempty"`
@@ -471,7 +473,7 @@ type HistoryWorkload struct {
 	Revision string `json:"revision,omitempty"`
 
 	// Reference to running workload.
-	Reference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
+	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
 }
 
 // A ApplicationStatus represents the state of the entire application.
@@ -480,7 +482,7 @@ type ApplicationStatus string
 // An ApplicationConfigurationStatus represents the observed state of a
 // ApplicationConfiguration.
 type ApplicationConfigurationStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	condition.ConditionedStatus `json:",inline"`
 
 	// Status is a place holder for a customized controller to fill
 	// if it needs a single place to summarize the status of the entire application
@@ -488,6 +490,9 @@ type ApplicationConfigurationStatus struct {
 
 	Dependency DependencyStatus `json:"dependency,omitempty"`
 
+	// RollingStatus indicates what phase are we in the rollout phase
+	RollingStatus types.RollingStatus `json:"rollingStatus,omitempty"`
+
 	// Workloads created by this ApplicationConfiguration.
 	Workloads []WorkloadStatus `json:"workloads,omitempty"`
 
@@ -515,20 +520,20 @@ type UnstaifiedDependency struct {
 
 // DependencyFromObject represents the object that dependency data comes from.
 type DependencyFromObject struct {
-	runtimev1alpha1.TypedReference `json:",inline"`
-	FieldPath                      string `json:"fieldPath,omitempty"`
+	corev1.ObjectReference `json:",inline"`
+	FieldPath              string `json:"fieldPath,omitempty"`
 }
 
 // DependencyToObject represents the object that dependency data goes to.
 type DependencyToObject struct {
-	runtimev1alpha1.TypedReference `json:",inline"`
-	FieldPaths                     []string `json:"fieldPaths,omitempty"`
+	corev1.ObjectReference `json:",inline"`
+	FieldPaths             []string `json:"fieldPaths,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
 // An ApplicationConfiguration represents an OAM application.
-// +kubebuilder:resource:shortName=appconfig,categories={crossplane,oam}
+// +kubebuilder:resource:shortName=appconfig,categories={oam}
 // +kubebuilder:subresource:status
 type ApplicationConfiguration struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -560,8 +565,50 @@ type DataOutput struct {
 	// If no conditions is specified, it is by default to check output value not empty.
 	// +optional
 	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+	// OutputStore specifies the object used to store intermediate data generated by Operations
+	OutputStore StoreReference `json:"outputStore,omitempty"`
 }
 
+// StoreReference specifies the referenced object in DataOutput or DataInput
+type StoreReference struct {
+	corev1.ObjectReference `json:",inline"`
+	// Operations specify the data processing operations
+	Operations []DataOperation `json:"operations,omitempty"`
+}
+
+// DataOperation defines the specific operation for data
+type DataOperation struct {
+	// Type specifies the type of DataOperation
+	Type string `json:"type"`
+	// Operator specifies the operation under this DataOperation type
+	Operator DataOperator `json:"op"`
+	// ToFieldPath refers to the value of an object's field
+	ToFieldPath string `json:"toFieldPath"`
+	// ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+	ToDataPath string `json:"toDataPath,omitempty"`
+	// +optional
+	// Value specifies an expected value
+	// This is mutually exclusive with ValueFrom
+	Value string `json:"value,omitempty"`
+	// +optional
+	// ValueFrom specifies expected value from object such as workload and trait
+	// This is mutually exclusive with Value
+	ValueFrom  ValueFrom              `json:"valueFrom,omitempty"`
+	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+}
+
+// DataOperator defines the type of Operator in DataOperation
+type DataOperator string
+
+const (
+	// AddOperator specifies the add operation for data passing
+	AddOperator DataOperator = "add"
+	// DeleteOperator specifies the delete operation for data passing
+	DeleteOperator DataOperator = "delete"
+	// ReplaceOperator specifies the replace operation for data passing
+	ReplaceOperator DataOperator = "replace"
+)
+
 // DataInput specifies a data input sink to an object.
 // If input is array, it will be appended to the target field paths.
 type DataInput struct {
@@ -576,6 +623,12 @@ type DataInput struct {
 	// If StrategyMergeKeys specified, we will check the key in the target array.
 	// If any key exist, do update; if no key exist, append.
 	StrategyMergeKeys []string `json:"strategyMergeKeys,omitempty"`
+
+	// When the Conditions is satified, ToFieldPaths will be filled with passed value
+	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+
+	// InputStore specifies the object used to read intermediate data genereted by DataOutput
+	InputStore StoreReference `json:"inputStore,omitempty"`
 }
 
 // DataInputValueFrom specifies the value source for a data input.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -19,12 +19,8 @@ limitations under the License.
 package v1alpha2
 
 import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"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/pkg/oam"
 )
 
 // An OperatingSystem required by a containerised workload.
@@ -357,53 +353,3 @@ 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 {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-
-	// Resources managed by this containerised workload.
-	Resources []runtimev1alpha1.TypedReference `json:"resources,omitempty"`
-}
-
-var _ oam.Workload = &ContainerizedWorkload{}
-
-// +kubebuilder:object:root=true
-
-// A ContainerizedWorkload is a workload that runs OCI containers.
-// +kubebuilder:resource:categories={crossplane,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"`
-}

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -19,75 +19,67 @@ limitations under the License.
 package v1alpha2
 
 import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
 // GetCondition of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+func (tr *ManualScalerTrait) GetCondition(ct condition.ConditionType) condition.Condition {
 	return tr.Status.GetCondition(ct)
 }
 
 // SetConditions of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetConditions(c ...runtimev1alpha1.Condition) {
+func (tr *ManualScalerTrait) SetConditions(c ...condition.Condition) {
 	tr.Status.SetConditions(c...)
 }
 
 // GetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
+func (tr *ManualScalerTrait) GetWorkloadReference() corev1.ObjectReference {
 	return tr.Spec.WorkloadReference
 }
 
 // SetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
+func (tr *ManualScalerTrait) SetWorkloadReference(r corev1.ObjectReference) {
 	tr.Spec.WorkloadReference = r
 }
 
 // GetCondition of this ApplicationConfiguration.
-func (ac *ApplicationConfiguration) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+func (ac *ApplicationConfiguration) GetCondition(ct condition.ConditionType) condition.Condition {
 	return ac.Status.GetCondition(ct)
 }
 
 // SetConditions of this ApplicationConfiguration.
-func (ac *ApplicationConfiguration) SetConditions(c ...runtimev1alpha1.Condition) {
+func (ac *ApplicationConfiguration) SetConditions(c ...condition.Condition) {
 	ac.Status.SetConditions(c...)
 }
 
 // GetCondition of this Component.
-func (cm *Component) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+func (cm *Component) GetCondition(ct condition.ConditionType) condition.Condition {
 	return cm.Status.GetCondition(ct)
 }
 
 // SetConditions of this Component.
-func (cm *Component) SetConditions(c ...runtimev1alpha1.Condition) {
+func (cm *Component) SetConditions(c ...condition.Condition) {
 	cm.Status.SetConditions(c...)
 }
 
-// GetCondition of this ContainerizedWorkload.
-func (wl *ContainerizedWorkload) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return wl.Status.GetCondition(ct)
-}
-
-// SetConditions of this ContainerizedWorkload.
-func (wl *ContainerizedWorkload) SetConditions(c ...runtimev1alpha1.Condition) {
-	wl.Status.SetConditions(c...)
-}
-
 // GetCondition of this HealthScope.
-func (hs *HealthScope) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+func (hs *HealthScope) GetCondition(ct condition.ConditionType) condition.Condition {
 	return hs.Status.GetCondition(ct)
 }
 
 // SetConditions of this HealthScope.
-func (hs *HealthScope) SetConditions(c ...runtimev1alpha1.Condition) {
+func (hs *HealthScope) SetConditions(c ...condition.Condition) {
 	hs.Status.SetConditions(c...)
 }
 
 // GetWorkloadReferences to get all workload references for scope.
-func (hs *HealthScope) GetWorkloadReferences() []runtimev1alpha1.TypedReference {
+func (hs *HealthScope) GetWorkloadReferences() []corev1.ObjectReference {
 	return hs.Spec.WorkloadReferences
 }
 
 // AddWorkloadReference to add a workload reference to this scope.
-func (hs *HealthScope) AddWorkloadReference(r runtimev1alpha1.TypedReference) {
+func (hs *HealthScope) AddWorkloadReference(r corev1.ObjectReference) {
 	hs.Spec.WorkloadReferences = append(hs.Spec.WorkloadReferences, r)
 }

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -37,6 +37,14 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )
 
+// ComponentDefinition type metadata.
+var (
+	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
+	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
+	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
+	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
+)
+
 // WorkloadDefinition type metadata.
 var (
 	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
@@ -77,14 +85,6 @@ 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,23 +109,23 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
-// Application type metadata.
+// ApplicationRevision type metadata
 var (
-	ApplicationDeploymentKind            = reflect.TypeOf(ApplicationDeployment{}).Name()
-	ApplicationDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationDeploymentKind}.String()
-	ApplicationDeploymentKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ApplicationDeploymentKindVersionKind = SchemeGroupVersion.WithKind(ApplicationDeploymentKind)
+	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
+	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
+	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
+	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
 )
 
 func init() {
+	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
 	SchemeBuilder.Register(&TraitDefinition{}, &TraitDefinitionList{})
 	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(&ApplicationDeployment{}, &ApplicationDeploymentList{})
+	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
 }

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

@@ -21,26 +21,87 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	v1 "k8s.io/api/core/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 *AppHealthCondition) DeepCopyInto(out *AppHealthCondition) {
+	*out = *in
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]*WorkloadHealthCondition, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(WorkloadHealthCondition)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppHealthCondition.
+func (in *AppHealthCondition) DeepCopy() *AppHealthCondition {
+	if in == nil {
+		return nil
+	}
+	out := new(AppHealthCondition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppReference) DeepCopyInto(out *AppReference) {
+	*out = *in
+	if in.CompReferences != nil {
+		in, out := &in.CompReferences, &out.CompReferences
+		*out = make([]CompReference, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppReference.
+func (in *AppReference) DeepCopy() *AppReference {
+	if in == nil {
+		return nil
+	}
+	out := new(AppReference)
+	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
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]v1alpha1.TypedReference, len(*in))
+		*out = make([]v1.ObjectReference, len(*in))
 		copy(*out, *in)
 	}
 	if in.Services != nil {
 		in, out := &in.Services, &out.Services
-		*out = make([]ApplicationComponentStatus, len(*in))
+		*out = make([]common.ApplicationComponentStatus, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
+	if in.LatestRevision != nil {
+		in, out := &in.LatestRevision, &out.LatestRevision
+		*out = new(common.Revision)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -110,26 +171,6 @@ func (in *ApplicationComponent) DeepCopy() *ApplicationComponent {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStatus) {
-	*out = *in
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]ApplicationTraitStatus, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponentStatus.
-func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationComponentStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationConfiguration) DeepCopyInto(out *ApplicationConfiguration) {
 	*out = *in
@@ -286,107 +327,6 @@ func (in *ApplicationConfigurationStatus) DeepCopy() *ApplicationConfigurationSt
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeployment) DeepCopyInto(out *ApplicationDeployment) {
-	*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 ApplicationDeployment.
-func (in *ApplicationDeployment) DeepCopy() *ApplicationDeployment {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationDeployment)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationDeployment) 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 *ApplicationDeploymentList) DeepCopyInto(out *ApplicationDeploymentList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ApplicationDeployment, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentList.
-func (in *ApplicationDeploymentList) DeepCopy() *ApplicationDeploymentList {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationDeploymentList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationDeploymentList) 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 *ApplicationDeploymentSpec) DeepCopyInto(out *ApplicationDeploymentSpec) {
-	*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 ApplicationDeploymentSpec.
-func (in *ApplicationDeploymentSpec) DeepCopy() *ApplicationDeploymentSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationDeploymentSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeploymentStatus) DeepCopyInto(out *ApplicationDeploymentStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentStatus.
-func (in *ApplicationDeploymentStatus) DeepCopy() *ApplicationDeploymentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationDeploymentStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationList) DeepCopyInto(out *ApplicationList) {
 	*out = *in
@@ -419,6 +359,116 @@ func (in *ApplicationList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationRevision) DeepCopyInto(out *ApplicationRevision) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevision.
+func (in *ApplicationRevision) DeepCopy() *ApplicationRevision {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationRevision) 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 *ApplicationRevisionList) DeepCopyInto(out *ApplicationRevisionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ApplicationRevision, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionList.
+func (in *ApplicationRevisionList) DeepCopy() *ApplicationRevisionList {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationRevisionList) 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 *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
+	*out = *in
+	in.Application.DeepCopyInto(&out.Application)
+	if in.ComponentDefinitions != nil {
+		in, out := &in.ComponentDefinitions, &out.ComponentDefinitions
+		*out = make(map[string]ComponentDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.WorkloadDefinitions != nil {
+		in, out := &in.WorkloadDefinitions, &out.WorkloadDefinitions
+		*out = make(map[string]WorkloadDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.TraitDefinitions != nil {
+		in, out := &in.TraitDefinitions, &out.TraitDefinitions
+		*out = make(map[string]TraitDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.ScopeDefinitions != nil {
+		in, out := &in.ScopeDefinitions, &out.ScopeDefinitions
+		*out = make(map[string]ScopeDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]common.RawComponent, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	in.ApplicationConfiguration.DeepCopyInto(&out.ApplicationConfiguration)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
+func (in *ApplicationRevisionSpec) DeepCopy() *ApplicationRevisionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	*out = *in
@@ -429,6 +479,11 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	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.
@@ -444,7 +499,11 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
 	*out = *in
-	in.Properties.DeepCopyInto(&out.Properties)
+	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 ApplicationTrait.
@@ -457,21 +516,6 @@ func (in *ApplicationTrait) DeepCopy() *ApplicationTrait {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationTraitStatus) DeepCopyInto(out *ApplicationTraitStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTraitStatus.
-func (in *ApplicationTraitStatus) DeepCopy() *ApplicationTraitStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationTraitStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CPUResources) DeepCopyInto(out *CPUResources) {
 	*out = *in
@@ -489,23 +533,22 @@ func (in *CPUResources) DeepCopy() *CPUResources {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ChildResourceKind) DeepCopyInto(out *ChildResourceKind) {
+func (in *CompReference) DeepCopyInto(out *CompReference) {
 	*out = *in
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
+	out.Workload = in.Workload
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]v1.ObjectReference, len(*in))
+		copy(*out, *in)
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChildResourceKind.
-func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CompReference.
+func (in *CompReference) DeepCopy() *CompReference {
 	if in == nil {
 		return nil
 	}
-	out := new(ChildResourceKind)
+	out := new(CompReference)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -537,6 +580,124 @@ func (in *Component) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// 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
+	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 ComponentDefinition.
+func (in *ComponentDefinition) DeepCopy() *ComponentDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ComponentDefinition) 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 *ComponentDefinitionList) DeepCopyInto(out *ComponentDefinitionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ComponentDefinition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionList.
+func (in *ComponentDefinitionList) DeepCopy() *ComponentDefinitionList {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ComponentDefinitionList) 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 *ComponentDefinitionSpec) DeepCopyInto(out *ComponentDefinitionSpec) {
+	*out = *in
+	out.Workload = in.Workload
+	if in.ChildResourceKinds != nil {
+		in, out := &in.ChildResourceKinds, &out.ChildResourceKinds
+		*out = make([]common.ChildResourceKind, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Status != nil {
+		in, out := &in.Status, &out.Status
+		*out = new(common.Status)
+		**out = **in
+	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(common.Schematic)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Extension != nil {
+		in, out := &in.Extension, &out.Extension
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionSpec.
+func (in *ComponentDefinitionSpec) DeepCopy() *ComponentDefinitionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ComponentDefinitionStatus) DeepCopyInto(out *ComponentDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.LatestRevision != nil {
+		in, out := &in.LatestRevision, &out.LatestRevision
+		*out = new(common.Revision)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionStatus.
+func (in *ComponentDefinitionStatus) DeepCopy() *ComponentDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentList) DeepCopyInto(out *ComponentList) {
 	*out = *in
@@ -635,6 +796,11 @@ func (in *ComponentScope) DeepCopy() *ComponentScope {
 func (in *ComponentSpec) DeepCopyInto(out *ComponentSpec) {
 	*out = *in
 	in.Workload.DeepCopyInto(&out.Workload)
+	if in.Helm != nil {
+		in, out := &in.Helm, &out.Helm
+		*out = new(common.Helm)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Parameters != nil {
 		in, out := &in.Parameters, &out.Parameters
 		*out = make([]ComponentParameter, len(*in))
@@ -660,7 +826,7 @@ func (in *ComponentStatus) DeepCopyInto(out *ComponentStatus) {
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
 	if in.LatestRevision != nil {
 		in, out := &in.LatestRevision, &out.LatestRevision
-		*out = new(Revision)
+		*out = new(common.Revision)
 		**out = **in
 	}
 }
@@ -946,118 +1112,6 @@ 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([]v1alpha1.TypedReference, 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
@@ -1072,6 +1126,12 @@ func (in *DataInput) DeepCopyInto(out *DataInput) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]ConditionRequirement, len(*in))
+		copy(*out, *in)
+	}
+	in.InputStore.DeepCopyInto(&out.InputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataInput.
@@ -1099,6 +1159,27 @@ func (in *DataInputValueFrom) DeepCopy() *DataInputValueFrom {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataOperation) DeepCopyInto(out *DataOperation) {
+	*out = *in
+	out.ValueFrom = in.ValueFrom
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]ConditionRequirement, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOperation.
+func (in *DataOperation) DeepCopy() *DataOperation {
+	if in == nil {
+		return nil
+	}
+	out := new(DataOperation)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 	*out = *in
@@ -1107,6 +1188,7 @@ func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 		*out = make([]ConditionRequirement, len(*in))
 		copy(*out, *in)
 	}
+	in.OutputStore.DeepCopyInto(&out.OutputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOutput.
@@ -1119,25 +1201,10 @@ func (in *DataOutput) DeepCopy() *DataOutput {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DefinitionReference) DeepCopyInto(out *DefinitionReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionReference.
-func (in *DefinitionReference) DeepCopy() *DefinitionReference {
-	if in == nil {
-		return nil
-	}
-	out := new(DefinitionReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DependencyFromObject) DeepCopyInto(out *DependencyFromObject) {
 	*out = *in
-	out.TypedReference = in.TypedReference
+	out.ObjectReference = in.ObjectReference
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DependencyFromObject.
@@ -1175,7 +1242,7 @@ func (in *DependencyStatus) DeepCopy() *DependencyStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DependencyToObject) DeepCopyInto(out *DependencyToObject) {
 	*out = *in
-	out.TypedReference = in.TypedReference
+	out.ObjectReference = in.ObjectReference
 	if in.FieldPaths != nil {
 		in, out := &in.FieldPaths, &out.FieldPaths
 		*out = make([]string, len(*in))
@@ -1373,9 +1440,16 @@ func (in *HealthScopeSpec) DeepCopyInto(out *HealthScopeSpec) {
 		*out = new(int32)
 		**out = **in
 	}
+	if in.AppRefs != nil {
+		in, out := &in.AppRefs, &out.AppRefs
+		*out = make([]AppReference, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	if in.WorkloadReferences != nil {
 		in, out := &in.WorkloadReferences, &out.WorkloadReferences
-		*out = make([]v1alpha1.TypedReference, len(*in))
+		*out = make([]v1.ObjectReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -1395,6 +1469,17 @@ func (in *HealthScopeStatus) DeepCopyInto(out *HealthScopeStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
 	out.ScopeHealthCondition = in.ScopeHealthCondition
+	if in.AppHealthConditions != nil {
+		in, out := &in.AppHealthConditions, &out.AppHealthConditions
+		*out = make([]*AppHealthCondition, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(AppHealthCondition)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
 	if in.WorkloadHealthConditions != nil {
 		in, out := &in.WorkloadHealthConditions, &out.WorkloadHealthConditions
 		*out = make([]*WorkloadHealthCondition, len(*in))
@@ -1402,7 +1487,7 @@ func (in *HealthScopeStatus) DeepCopyInto(out *HealthScopeStatus) {
 			if (*in)[i] != nil {
 				in, out := &(*in)[i], &(*out)[i]
 				*out = new(WorkloadHealthCondition)
-				**out = **in
+				(*in).DeepCopyInto(*out)
 			}
 		}
 	}
@@ -1541,21 +1626,6 @@ func (in *MemoryResources) DeepCopy() *MemoryResources {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Revision) DeepCopyInto(out *Revision) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Revision.
-func (in *Revision) DeepCopy() *Revision {
-	if in == nil {
-		return nil
-	}
-	out := new(Revision)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ScopeDefinition) DeepCopyInto(out *ScopeDefinition) {
 	*out = *in
@@ -1666,16 +1736,24 @@ func (in *SecretKeySelector) DeepCopy() *SecretKeySelector {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Status) DeepCopyInto(out *Status) {
+func (in *StoreReference) DeepCopyInto(out *StoreReference) {
 	*out = *in
+	out.ObjectReference = in.ObjectReference
+	if in.Operations != nil {
+		in, out := &in.Operations, &out.Operations
+		*out = make([]DataOperation, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Status.
-func (in *Status) DeepCopy() *Status {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StoreReference.
+func (in *StoreReference) DeepCopy() *StoreReference {
 	if in == nil {
 		return nil
 	}
-	out := new(Status)
+	out := new(StoreReference)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -1701,6 +1779,7 @@ func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	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 TraitDefinition.
@@ -1767,9 +1846,14 @@ func (in *TraitDefinitionSpec) DeepCopyInto(out *TraitDefinitionSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(common.Schematic)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
-		*out = new(Status)
+		*out = new(common.Status)
 		**out = **in
 	}
 	if in.Extension != nil {
@@ -1789,6 +1873,42 @@ func (in *TraitDefinitionSpec) DeepCopy() *TraitDefinitionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TraitDefinitionStatus) DeepCopyInto(out *TraitDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.LatestRevision != nil {
+		in, out := &in.LatestRevision, &out.LatestRevision
+		*out = new(common.Revision)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitDefinitionStatus.
+func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(TraitDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TraitHealthCondition) DeepCopyInto(out *TraitHealthCondition) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitHealthCondition.
+func (in *TraitHealthCondition) DeepCopy() *TraitHealthCondition {
+	if in == nil {
+		return nil
+	}
+	out := new(TraitHealthCondition)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *UnstaifiedDependency) DeepCopyInto(out *UnstaifiedDependency) {
 	*out = *in
@@ -1857,6 +1977,7 @@ func (in *WorkloadDefinition) DeepCopyInto(out *WorkloadDefinition) {
 	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 WorkloadDefinition.
@@ -1915,16 +2036,21 @@ func (in *WorkloadDefinitionSpec) DeepCopyInto(out *WorkloadDefinitionSpec) {
 	out.Reference = in.Reference
 	if in.ChildResourceKinds != nil {
 		in, out := &in.ChildResourceKinds, &out.ChildResourceKinds
-		*out = make([]ChildResourceKind, len(*in))
+		*out = make([]common.ChildResourceKind, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
-		*out = new(Status)
+		*out = new(common.Status)
 		**out = **in
 	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(common.Schematic)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Extension != nil {
 		in, out := &in.Extension, &out.Extension
 		*out = new(runtime.RawExtension)
@@ -1942,10 +2068,37 @@ func (in *WorkloadDefinitionSpec) DeepCopy() *WorkloadDefinitionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadDefinitionStatus) DeepCopyInto(out *WorkloadDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadDefinitionStatus.
+func (in *WorkloadDefinitionStatus) DeepCopy() *WorkloadDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadHealthCondition) DeepCopyInto(out *WorkloadHealthCondition) {
 	*out = *in
 	out.TargetWorkload = in.TargetWorkload
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]*TraitHealthCondition, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(TraitHealthCondition)
+				**out = **in
+			}
+		}
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadHealthCondition.

apis/core.oam.dev/v1beta1/application_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 (
+	"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"
+)
+
+const (
+	// TypeHealthy application are believed to be determined as healthy by a health scope.
+	TypeHealthy condition.ConditionType = "Healthy"
+)
+
+// Reasons an application is or is not healthy
+const (
+	ReasonHealthy        condition.ConditionReason = "AllComponentsHealthy"
+	ReasonUnhealthy      condition.ConditionReason = "UnhealthyOrUnknownComponents"
+	ReasonHealthCheckErr condition.ConditionReason = "HealthCheckeError"
+)
+
+// AppPolicy defines a global policy for all components in the app.
+type AppPolicy struct {
+	// Name is the unique name of the policy.
+	Name string `json:"name"`
+
+	Type string `json:"type"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+}
+
+// WorkflowStep defines how to execute a workflow step.
+type WorkflowStep struct {
+	// Name is the unique name of the workflow step.
+	Name string `json:"name"`
+
+	Type string `json:"type"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+
+	DependsOn []string `json:"dependsOn,omitempty"`
+
+	Inputs common.StepInputs `json:"inputs,omitempty"`
+
+	Outputs common.StepOutputs `json:"outputs,omitempty"`
+}
+
+// Workflow defines workflow steps and other attributes
+type Workflow struct {
+	Steps []WorkflowStep `json:"steps,omitempty"`
+}
+
+// ApplicationSpec is the spec of Application
+type ApplicationSpec struct {
+	Components []common.ApplicationComponent `json:"components"`
+
+	// Policies defines the global policies for all components in the app, e.g. security, metrics, gitops,
+	// multi-cluster placement rules, etc.
+	// Policies are applied after components are rendered and before workflow steps are executed.
+	Policies []AppPolicy `json:"policies,omitempty"`
+
+	// 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.
+	Workflow *Workflow `json:"workflow,omitempty"`
+
+	// TODO(wonderflow): we should have application level scopes supported here
+}
+
+// +kubebuilder:object:root=true
+
+// Application is the Schema for the applications API
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:categories={oam},shortName=app
+// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
+// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
+// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type Application struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ApplicationSpec  `json:"spec,omitempty"`
+	Status common.AppStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ApplicationList contains a list of Application
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ApplicationList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Application `json:"items"`
+}
+
+// SetConditions set condition to application
+func (app *Application) SetConditions(c ...condition.Condition) {
+	app.Status.SetConditions(c...)
+}
+
+// GetCondition get condition by given condition type
+func (app *Application) GetCondition(t condition.ConditionType) condition.Condition {
+	return app.Status.GetCondition(t)
+}
+
+// GetComponent get the component from the application based on its workload type
+func (app *Application) GetComponent(workloadType string) *common.ApplicationComponent {
+	for _, c := range app.Spec.Components {
+		if c.Type == workloadType {
+			return &c
+		}
+	}
+	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
+}

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

@@ -0,0 +1,93 @@
+/*
+ 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"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// ApplicationRevisionSpec is the spec of ApplicationRevision
+type ApplicationRevisionSpec struct {
+	// Application records the snapshot of the created/modified Application
+	Application Application `json:"application"`
+
+	// ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
+	ComponentDefinitions map[string]ComponentDefinition `json:"componentDefinitions,omitempty"`
+
+	// WorkloadDefinitions records the snapshot of the workloadDefinitions related with the created/modified Application
+	WorkloadDefinitions map[string]WorkloadDefinition `json:"workloadDefinitions,omitempty"`
+
+	// TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
+	TraitDefinitions map[string]TraitDefinition `json:"traitDefinitions,omitempty"`
+
+	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
+	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
+
+	// PolicyDefinitions records the snapshot of the PolicyDefinitions related with the created/modified Application
+	PolicyDefinitions map[string]PolicyDefinition `json:"policyDefinitions,omitempty"`
+
+	// WorkflowStepDefinitions records the snapshot of the WorkflowStepDefinitions related with the created/modified Application
+	WorkflowStepDefinitions map[string]WorkflowStepDefinition `json:"workflowStepDefinitions,omitempty"`
+
+	// ScopeGVK records the apiVersion to GVK mapping
+	ScopeGVK map[string]metav1.GroupVersionKind `json:"scopeGVK,omitempty"`
+
+	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
+	// +deprecated
+	Components []common.RawComponent `json:"components,omitempty"`
+
+	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
+	// it will contains the whole K8s CR of trait and the reference component in it.
+	// +kubebuilder:validation:EmbeddedResource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +deprecated
+	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration,omitempty"`
+
+	// ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
+	ResourcesConfigMap corev1.LocalObjectReference `json:"resourcesConfigMap,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ApplicationRevision is the Schema for the ApplicationRevision API
+// +kubebuilder:storageversion
+// +kubebuilder:resource:categories={oam},shortName=apprev
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ApplicationRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ApplicationRevisionList contains a list of ApplicationRevision
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ApplicationRevisionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationRevision `json:"items"`
+}

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

@@ -0,0 +1,107 @@
+/*
+ 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"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// ComponentDefinitionSpec defines the desired state of ComponentDefinition
+type ComponentDefinitionSpec struct {
+	// Workload is a workload type descriptor
+	Workload common.WorkloadTypeDescriptor `json:"workload"`
+
+	// ChildResourceKinds are the list of GVK of the child resources this workload generates
+	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
+
+	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
+	// can be used by trait to create resource selectors(e.g. label selector for pods).
+	// +optional
+	RevisionLabel string `json:"revisionLabel,omitempty"`
+
+	// PodSpecPath indicates where/if this workload has K8s podSpec field
+	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
+	// +optional
+	PodSpecPath string `json:"podSpecPath,omitempty"`
+
+	// Status defines the custom health policy and status message for workload
+	// +optional
+	Status *common.Status `json:"status,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the workload
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+}
+
+// ComponentDefinitionStatus is the status of ComponentDefinition
+type ComponentDefinitionStatus 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"`
+}
+
+// +kubebuilder:object:root=true
+
+// ComponentDefinition is the Schema for the componentdefinitions API
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ComponentDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ComponentDefinitionSpec   `json:"spec,omitempty"`
+	Status ComponentDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for ComponentDefinition
+func (cd *ComponentDefinition) SetConditions(c ...condition.Condition) {
+	cd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from ComponentDefinition
+func (cd *ComponentDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return cd.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ComponentDefinitionList contains a list of ComponentDefinition
+type ComponentDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ComponentDefinition `json:"items"`
+}

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

@@ -0,0 +1,20 @@
+/*
+ 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
+
+// Hub marks this type as a conversion hub.
+func (*Application) Hub() {}

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

@@ -0,0 +1,258 @@
+/*
+ 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"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// A WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
+type WorkloadDefinitionSpec struct {
+	// Reference to the CustomResourceDefinition that defines this workload kind.
+	Reference common.DefinitionReference `json:"definitionRef"`
+
+	// ChildResourceKinds are the list of GVK of the child resources this workload generates
+	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
+
+	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
+	// can be used by trait to create resource selectors(e.g. label selector for pods).
+	// +optional
+	RevisionLabel string `json:"revisionLabel,omitempty"`
+
+	// PodSpecPath indicates where/if this workload has K8s podSpec field
+	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
+	// +optional
+	PodSpecPath string `json:"podSpecPath,omitempty"`
+
+	// Status defines the custom health policy and status message for workload
+	// +optional
+	Status *common.Status `json:"status,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the workload
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+}
+
+// WorkloadDefinitionStatus is the status of WorkloadDefinition
+type WorkloadDefinitionStatus struct {
+	condition.ConditionedStatus `json:",inline"`
+}
+
+// +kubebuilder:object:root=true
+
+// A WorkloadDefinition registers a kind of Kubernetes custom resource as a
+// valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
+// is used to validate the schema of the workload when it is embedded in an OAM
+// Component.
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
+// +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type WorkloadDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
+	Status WorkloadDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for WorkloadDefinition
+func (wd *WorkloadDefinition) SetConditions(c ...condition.Condition) {
+	wd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkloadDefinition
+func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return wd.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+
+// WorkloadDefinitionList contains a list of WorkloadDefinition.
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type WorkloadDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []WorkloadDefinition `json:"items"`
+}
+
+// A TraitDefinitionSpec defines the desired state of a TraitDefinition.
+type TraitDefinitionSpec struct {
+	// Reference to the CustomResourceDefinition that defines this trait kind.
+	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
+
+	// Revision indicates whether a trait is aware of component revision
+	// +optional
+	RevisionEnabled bool `json:"revisionEnabled,omitempty"`
+
+	// WorkloadRefPath indicates where/if a trait accepts a workloadRef object
+	// +optional
+	WorkloadRefPath string `json:"workloadRefPath,omitempty"`
+
+	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+	// +optional
+	PodDisruptive bool `json:"podDisruptive,omitempty"`
+
+	// AppliesToWorkloads specifies the list of workload kinds this trait
+	// applies to. Workload kinds are specified in kind.group/version format,
+	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
+	// all workload kinds.
+	// +optional
+	AppliesToWorkloads []string `json:"appliesToWorkloads,omitempty"`
+
+	// ConflictsWith specifies the list of traits(CRD name, Definition name, CRD group)
+	// which could not apply to the same workloads with this trait.
+	// Traits that omit this field can work with any other traits.
+	// Example rules:
+	// "service" # Trait definition name
+	// "services.k8s.io" # API resource/crd name
+	// "*.networking.k8s.io" # API group
+	// "labelSelector:foo=bar" # label selector
+	// labelSelector format: https://pkg.go.dev/k8s.io/apimachinery/pkg/labels#Parse
+	// +optional
+	ConflictsWith []string `json:"conflictsWith,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the trait
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// Status defines the custom health policy and status message for trait
+	// +optional
+	Status *common.Status `json:"status,omitempty"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+
+	// ManageWorkload defines the trait would be responsible for creating the workload
+	// +optional
+	ManageWorkload bool `json:"manageWorkload,omitempty"`
+	// SkipRevisionAffect defines the update this trait will not generate a new application Revision
+	// +optional
+	SkipRevisionAffect bool `json:"skipRevisionAffect,omitempty"`
+}
+
+// TraitDefinitionStatus is the status of TraitDefinition
+type TraitDefinitionStatus 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"`
+}
+
+// +kubebuilder:object:root=true
+
+// A TraitDefinition registers a kind of Kubernetes custom resource as a valid
+// OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
+// to validate the schema of the trait when it is embedded in an OAM
+// ApplicationConfiguration.
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
+// +kubebuilder:subresource:status
+// +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type TraitDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
+	Status TraitDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for TraitDefinition
+func (td *TraitDefinition) SetConditions(c ...condition.Condition) {
+	td.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from TraitDefinition
+func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return td.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// TraitDefinitionList contains a list of TraitDefinition.
+type TraitDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []TraitDefinition `json:"items"`
+}
+
+// A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
+type ScopeDefinitionSpec struct {
+	// Reference to the CustomResourceDefinition that defines this scope kind.
+	Reference common.DefinitionReference `json:"definitionRef"`
+
+	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
+	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
+
+	// AllowComponentOverlap specifies whether an OAM component may exist in
+	// multiple instances of this kind of scope.
+	AllowComponentOverlap bool `json:"allowComponentOverlap"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// A ScopeDefinition registers a kind of Kubernetes custom resource as a valid
+// OAM scope kind by referencing its CustomResourceDefinition. The CRD is used
+// to validate the schema of the scope when it is embedded in an OAM
+// ApplicationConfiguration.
+// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
+// +kubebuilder:storageversion
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type ScopeDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ScopeDefinitionSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ScopeDefinitionList contains a list of ScopeDefinition.
+type ScopeDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ScopeDefinition `json:"items"`
+}

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

@@ -0,0 +1,73 @@
+/*
+ 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"
+)
+
+// DefinitionRevisionSpec is the spec of DefinitionRevision
+type DefinitionRevisionSpec struct {
+	// Revision record revision number of DefinitionRevision
+	Revision int64 `json:"revision"`
+
+	// RevisionHash record the hash value of the spec of DefinitionRevision object.
+	RevisionHash string `json:"revisionHash"`
+
+	// DefinitionType
+	DefinitionType common.DefinitionType `json:"definitionType"`
+
+	// ComponentDefinition records the snapshot of the created/modified ComponentDefinition
+	ComponentDefinition ComponentDefinition `json:"componentDefinition,omitempty"`
+
+	// TraitDefinition records the snapshot of the created/modified TraitDefinition
+	TraitDefinition TraitDefinition `json:"traitDefinition,omitempty"`
+
+	// PolicyDefinition records the snapshot of the created/modified PolicyDefinition
+	PolicyDefinition PolicyDefinition `json:"policyDefinition,omitempty"`
+
+	// WorkflowStepDefinition records the snapshot of the created/modified WorkflowStepDefinition
+	WorkflowStepDefinition WorkflowStepDefinition `json:"workflowStepDefinition,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// DefinitionRevision is the Schema for the DefinitionRevision API
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=defrev
+// +kubebuilder:printcolumn:name="REVISION",type=integer,JSONPath=".spec.revision"
+// +kubebuilder:printcolumn:name="HASH",type=string,JSONPath=".spec.revisionHash"
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=".spec.definitionType"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type DefinitionRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec DefinitionRevisionSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// DefinitionRevisionList contains a list of DefinitionRevision
+type DefinitionRevisionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []DefinitionRevision `json:"items"`
+}

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

@@ -0,0 +1,22 @@
+/*
+ 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 contains resources relating to the Open Application Model.
+// See https://github.com/oam-dev/spec for more details.
+// +kubebuilder:object:generate=true
+// +groupName=core.oam.dev
+// +versionName=v1beta1
+package v1beta1

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

@@ -0,0 +1,85 @@
+/*
+ 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/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// PolicyDefinitionSpec defines the desired state of PolicyDefinition
+type PolicyDefinitionSpec struct {
+	// Reference to the CustomResourceDefinition that defines this trait kind.
+	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the policy definition
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// ManageHealthCheck means the policy will handle health checking and skip application controller
+	// built-in health checking.
+	ManageHealthCheck bool `json:"manageHealthCheck,omitempty"`
+}
+
+// PolicyDefinitionStatus is the status of PolicyDefinition
+type PolicyDefinitionStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	condition.ConditionedStatus `json:",inline"`
+
+	// LatestRevision of the component definition
+	// +optional
+	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
+}
+
+// SetConditions set condition for PolicyDefinition
+func (d *PolicyDefinition) SetConditions(c ...condition.Condition) {
+	d.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from PolicyDefinition
+func (d *PolicyDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return d.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+
+// PolicyDefinition is the Schema for the policydefinitions API
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=policy
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type PolicyDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   PolicyDefinitionSpec   `json:"spec,omitempty"`
+	Status PolicyDefinitionStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// PolicyDefinitionList contains a list of PolicyDefinition
+type PolicyDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []PolicyDefinition `json:"items"`
+}

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

@@ -0,0 +1,139 @@
+/*
+ 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 (
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+// Package type metadata.
+const (
+	Group   = "core.oam.dev"
+	Version = "v1beta1"
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: Group, Version: Version}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+// ComponentDefinition type metadata.
+var (
+	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
+	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
+	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
+	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
+)
+
+// WorkloadDefinition type metadata.
+var (
+	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
+	WorkloadDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkloadDefinitionKind}.String()
+	WorkloadDefinitionKindAPIVersion   = WorkloadDefinitionKind + "." + SchemeGroupVersion.String()
+	WorkloadDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkloadDefinitionKind)
+)
+
+// TraitDefinition type metadata.
+var (
+	TraitDefinitionKind             = reflect.TypeOf(TraitDefinition{}).Name()
+	TraitDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: TraitDefinitionKind}.String()
+	TraitDefinitionKindAPIVersion   = TraitDefinitionKind + "." + SchemeGroupVersion.String()
+	TraitDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(TraitDefinitionKind)
+)
+
+// PolicyDefinition type metadata.
+var (
+	PolicyDefinitionKind             = reflect.TypeOf(PolicyDefinition{}).Name()
+	PolicyDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: PolicyDefinitionKind}.String()
+	PolicyDefinitionKindAPIVersion   = PolicyDefinitionKind + "." + SchemeGroupVersion.String()
+	PolicyDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(PolicyDefinitionKind)
+)
+
+// WorkflowStepDefinition type metadata.
+var (
+	WorkflowStepDefinitionKind             = reflect.TypeOf(WorkflowStepDefinition{}).Name()
+	WorkflowStepDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkflowStepDefinitionKind}.String()
+	WorkflowStepDefinitionKindAPIVersion   = WorkflowStepDefinitionKind + "." + SchemeGroupVersion.String()
+	WorkflowStepDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkflowStepDefinitionKind)
+)
+
+// DefinitionRevision type metadata.
+var (
+	DefinitionRevisionKind             = reflect.TypeOf(DefinitionRevision{}).Name()
+	DefinitionRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: DefinitionRevisionKind}.String()
+	DefinitionRevisionKindAPIVersion   = DefinitionRevisionKind + "." + SchemeGroupVersion.String()
+	DefinitionRevisionGroupVersionKind = SchemeGroupVersion.WithKind(DefinitionRevisionKind)
+)
+
+// Application type metadata.
+var (
+	ApplicationKind            = reflect.TypeOf(Application{}).Name()
+	ApplicationGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationKind}.String()
+	ApplicationKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
+)
+
+// ApplicationRevision type metadata
+var (
+	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
+	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
+	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
+	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
+)
+
+// ScopeDefinition type metadata.
+var (
+	ScopeDefinitionKind             = reflect.TypeOf(ScopeDefinition{}).Name()
+	ScopeDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ScopeDefinitionKind}.String()
+	ScopeDefinitionKindAPIVersion   = ScopeDefinitionKind + "." + SchemeGroupVersion.String()
+	ScopeDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ScopeDefinitionKind)
+)
+
+// ResourceTracker type metadata.
+var (
+	ResourceTrackerKind            = reflect.TypeOf(ResourceTracker{}).Name()
+	ResourceTrackerGroupKind       = schema.GroupKind{Group: Group, Kind: ResourceTrackerKind}.String()
+	ResourceTrackerKindAPIVersion  = ResourceTrackerKind + "." + SchemeGroupVersion.String()
+	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
+)
+
+func init() {
+	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
+	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
+	SchemeBuilder.Register(&TraitDefinition{}, &TraitDefinitionList{})
+	SchemeBuilder.Register(&PolicyDefinition{}, &PolicyDefinitionList{})
+	SchemeBuilder.Register(&WorkflowStepDefinition{}, &WorkflowStepDefinitionList{})
+	SchemeBuilder.Register(&DefinitionRevision{}, &DefinitionRevisionList{})
+	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
+	SchemeBuilder.Register(&Application{}, &ApplicationList{})
+	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
+	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}

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

@@ -0,0 +1,278 @@
+/*
+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(),
+		},
+	})
+}

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

@@ -0,0 +1,184 @@
+/*
+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))
+}

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

@@ -0,0 +1,82 @@
+/*
+ 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/condition"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+)
+
+// WorkflowStepDefinitionSpec defines the desired state of WorkflowStepDefinition
+type WorkflowStepDefinitionSpec struct {
+	// Reference to the CustomResourceDefinition that defines this trait kind.
+	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the workflow step definition
+	// +optional
+	Schematic *common.Schematic `json:"schematic,omitempty"`
+}
+
+// WorkflowStepDefinitionStatus is the status of WorkflowStepDefinition
+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"`
+}
+
+// SetConditions set condition for WorkflowStepDefinition
+func (d *WorkflowStepDefinition) SetConditions(c ...condition.Condition) {
+	d.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkflowStepDefinition
+func (d *WorkflowStepDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return d.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+
+// WorkflowStepDefinition is the Schema for the workflowstepdefinitions API
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workflowstep
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type WorkflowStepDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   WorkflowStepDefinitionSpec   `json:"spec,omitempty"`
+	Status WorkflowStepDefinitionStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// WorkflowStepDefinitionList contains a list of WorkflowStepDefinition
+type WorkflowStepDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []WorkflowStepDefinition `json:"items"`
+}

apis/generate.go

@@ -1,19 +1,34 @@
+//go:build generate
 // +build generate
 
+/*
+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.
+*/
+
 // See the below link for details on what is happening here.
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 
 // NOTE(@wonderflow) We don't remove existing CRDs here, because the crd folders contain not only auto generated.
 
 // Generate deepcopy methodsets and CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../charts/vela-core/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1,generateEmbeddedObjectMeta=true output:artifacts:config=../config/crd/base
 
 // Generate legacy_support for K8s 1.12~1.15 versions CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:trivialVersions=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:generateEmbeddedObjectMeta=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
 //go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
 
-//go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml ../legacy/charts/vela-core-legacy/crds/standard.oam.dev_routes.yaml
-
 package apis
 
 import (

apis/interfaces/resourcetracker.go

@@ -0,0 +1,35 @@
+/*
+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
+}

apis/standard.oam.dev/v1alpha1/autoscaler_types.go

@@ -1,121 +0,0 @@
-/*
-
-
-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 (
-	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	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.
-
-// Protocol defines network protocols supported for things like container ports.
-type Protocol string
-
-// TriggerType defines the type of trigger
-type TriggerType string
-
-// Autoscaler is the Schema for the autoscalers API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
-type Autoscaler struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   AutoscalerSpec   `json:"spec"`
-	Status AutoscalerStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for CR status
-func (as *Autoscaler) SetConditions(c ...v1alpha1.Condition) {
-	as.Status.SetConditions(c...)
-}
-
-// GetCondition get condition from CR status
-func (as *Autoscaler) GetCondition(conditionType v1alpha1.ConditionType) v1alpha1.Condition {
-	return as.Status.GetCondition(conditionType)
-}
-
-// GetWorkloadReference get workload reference
-func (as *Autoscaler) GetWorkloadReference() v1alpha1.TypedReference {
-	return as.Spec.WorkloadReference
-}
-
-// SetWorkloadReference set workload reference
-func (as *Autoscaler) SetWorkloadReference(reference v1alpha1.TypedReference) {
-	as.Spec.WorkloadReference = reference
-}
-
-// Trigger defines the trigger of Autoscaler
-type Trigger struct {
-	// Name is the trigger name, if not set, it will be automatically generated and make it globally unique
-	Name string `json:"name,omitempty"`
-
-	// Type allows value in [cpu/memory/storage/ephemeral-storage、cron、pps、qps/rps、custom]
-	Type TriggerType `json:"type"`
-
-	// Condition set the condition when to trigger scaling
-	Condition map[string]string `json:"condition"`
-}
-
-// AutoscalerSpec defines the desired state of Autoscaler
-type AutoscalerSpec struct {
-	// MinReplicas is the minimal replicas
-	// +optional
-	MinReplicas *int32 `json:"minReplicas,omitempty"`
-
-	// MinReplicas is the maximal replicas
-	// +optional
-	MaxReplicas *int32 `json:"maxReplicas,omitempty"`
-
-	// Triggers lists all triggers
-	Triggers []Trigger `json:"triggers"`
-
-	// TargetWorkload specify the workload which is going to be scaled,
-	// it could be WorkloadReference or the child resource of it
-	TargetWorkload TargetWorkload `json:"targetWorkload,omitempty"`
-
-	// WorkloadReference marks the owner of the workload
-	WorkloadReference v1alpha1.TypedReference `json:"workloadRef,omitempty"`
-}
-
-// TargetWorkload holds the a reference to the scale target Object
-type TargetWorkload struct {
-	Name string `json:"name"`
-	// +optional
-	APIVersion string `json:"apiVersion,omitempty"`
-	// +optional
-	Kind string `json:"kind,omitempty"`
-}
-
-// AutoscalerStatus defines the observed state of Autoscaler
-type AutoscalerStatus struct {
-	v1alpha1.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// AutoscalerList contains a list of Autoscaler
-type AutoscalerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Autoscaler `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&Autoscaler{}, &AutoscalerList{})
-}

apis/standard.oam.dev/v1alpha1/groupversion_info.go

@@ -1,5 +1,5 @@
 /*
-
+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.

apis/standard.oam.dev/v1alpha1/metricstrait_types.go

@@ -1,121 +0,0 @@
-/*
-
-
-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 (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// MetricsTraitSpec defines the desired state of MetricsTrait
-type MetricsTraitSpec struct {
-	// An endpoint to be monitored by a ServiceMonitor.
-	ScrapeService ScapeServiceEndPoint `json:"scrapeService"`
-	// WorkloadReference to the workload whose metrics needs to be exposed
-	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
-}
-
-// ScapeServiceEndPoint defines a scrapeable endpoint serving Prometheus metrics.
-type ScapeServiceEndPoint struct {
-	// The format of the metrics data,
-	// The default and only supported format is "prometheus" for now
-	Format string `json:"format,omitempty"`
-	// Number or name of the port to access on the pods targeted by the service.
-	// The default is discovered automatically from podTemplate, metricTrait will create a service for the workload
-	TargetPort intstr.IntOrString `json:"port,omitempty"`
-	// Route service traffic to pods with label keys and values matching this
-	// The default is discovered automatically from podTemplate.
-	// If no podTemplate, use the labels specified here, or use the labels of the workload
-	TargetSelector map[string]string `json:"selector,omitempty"`
-	// HTTP path to scrape for metrics.
-	// default is /metrics
-	// +optional
-	Path string `json:"path,omitempty"`
-	// Scheme at which metrics should be scraped
-	// The default and only supported scheme is "http"
-	// +optional
-	Scheme string `json:"scheme,omitempty"`
-	// The default is true
-	// +optional
-	Enabled *bool `json:"enabled,omitempty"`
-}
-
-// MetricsTraitStatus defines the observed state of MetricsTrait
-type MetricsTraitStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-
-	// ServiceMonitorName managed by this trait
-	ServiceMonitorName string `json:"serviceMonitorName,omitempty"`
-
-	// Port is the real port monitoring
-	Port intstr.IntOrString `json:"port,omitempty"`
-	// SelectorLabels is the real labels selected
-	SelectorLabels map[string]string `json:"selectorLabels,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// MetricsTrait is the Schema for the metricstraits API
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type MetricsTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   MetricsTraitSpec   `json:"spec"`
-	Status MetricsTraitStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// MetricsTraitList contains a list of MetricsTrait
-type MetricsTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []MetricsTrait `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&MetricsTrait{}, &MetricsTraitList{})
-}
-
-var _ oam.Trait = &MetricsTrait{}
-
-// SetConditions for set CR condition
-func (tr *MetricsTrait) SetConditions(c ...runtimev1alpha1.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetCondition for get CR condition
-func (tr *MetricsTrait) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return tr.Status.GetCondition(c)
-}
-
-// GetWorkloadReference of this MetricsTrait.
-func (tr *MetricsTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
-	return tr.Spec.WorkloadReference
-}
-
-// SetWorkloadReference of this MetricsTrait.
-func (tr *MetricsTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
-	tr.Spec.WorkloadReference = r
-}

apis/standard.oam.dev/v1alpha1/podspecworkload_types.go

@@ -1,85 +0,0 @@
-/*
-
-
-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 (
-	cpv1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// PodSpecWorkloadSpec defines the desired state of PodSpecWorkload
-type PodSpecWorkloadSpec struct {
-	// Replicas is the desired number of replicas of the given podSpec.
-	// These are replicas in the sense that they are instantiations of the same podSpec.
-	// If unspecified, defaults to 1.
-	Replicas *int32 `json:"replicas,omitempty"`
-
-	// PodSpec describes the pods that will be created,
-	// we omit the meta part as it will be exactly the same as the PodSpecWorkload
-	PodSpec v1.PodSpec `json:"podSpec"`
-}
-
-// PodSpecWorkloadStatus defines the observed state of PodSpecWorkload
-type PodSpecWorkloadStatus struct {
-	cpv1alpha1.ConditionedStatus `json:",inline"`
-
-	// Resources managed by this workload.
-	Resources []cpv1alpha1.TypedReference `json:"resources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PodSpecWorkload is the Schema for the PodSpec API
-// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
-// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type PodSpecWorkload struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   PodSpecWorkloadSpec   `json:"spec,omitempty"`
-	Status PodSpecWorkloadStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PodSpecWorkloadList contains a list of PodSpecWorkload
-type PodSpecWorkloadList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []PodSpecWorkload `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&PodSpecWorkload{}, &PodSpecWorkloadList{})
-}
-
-var _ oam.Workload = &PodSpecWorkload{}
-
-// SetConditions set condition for this CR
-func (in *PodSpecWorkload) SetConditions(c ...cpv1alpha1.Condition) {
-	in.Status.SetConditions(c...)
-}
-
-// GetCondition set condition for this CR
-func (in *PodSpecWorkload) GetCondition(c cpv1alpha1.ConditionType) cpv1alpha1.Condition {
-	return in.Status.GetCondition(c)
-}

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

@@ -0,0 +1,35 @@
+/*
+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 (
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// Rollout type metadata
+var (
+	RolloutKind            = reflect.TypeOf(Rollout{}).Name()
+	RolloutGroupKind       = schema.GroupKind{Group: GroupName, Kind: RolloutKind}.String()
+	RolloutKindAPIVersion  = RolloutKind + "." + SchemeGroupVersion.String()
+	RolloutKindVersionKind = SchemeGroupVersion.WithKind(RolloutKind)
+)
+
+func init() {
+	SchemeBuilder.Register(&Rollout{}, &RolloutList{})
+}

apis/standard.oam.dev/v1alpha1/rollout_plan_types.go

@@ -1,8 +1,26 @@
+/*
+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 (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
 // RolloutStrategyType defines strategies for pods rollout
@@ -34,20 +52,31 @@ const (
 type RollingState string
 
 const (
-	// VerifyingState verify that the rollout setting is valid and the controller can locate both the
-	// target and the source
-	VerifyingState RollingState = "verifying"
-	// InitializingState rollout is initializing all the new resources
+	// LocatingTargetAppState indicates that the rollout is in the stage of locating target app
+	// we use this state to make sure we special handle the target app successfully only once
+	LocatingTargetAppState RollingState = "locatingTargetApp"
+	// VerifyingSpecState indicates that the rollout is in the stage of verifying the rollout settings
+	// and the controller can locate both the target and the source
+	VerifyingSpecState RollingState = "verifyingSpec"
+	// InitializingState indicates that the rollout is initializing all the new resources
 	InitializingState RollingState = "initializing"
-	// RollingInBatchesState rolling out
+	// RollingInBatchesState indicates that the rollout starts rolling
 	RollingInBatchesState RollingState = "rollingInBatches"
-	// FinalisingState finalize the rolling, possibly clean up the old resources, adjust traffic
+	// FinalisingState indicates that the rollout is finalizing, possibly clean up the old resources, adjust traffic
 	FinalisingState RollingState = "finalising"
-	// RolloutSucceedState rollout successfully completed to match the desired target state
+	// RolloutFailingState indicates that the rollout is failing
+	// one needs to finalize it before mark it as failed by cleaning up the old resources, adjust traffic
+	RolloutFailingState RollingState = "rolloutFailing"
+	// RolloutSucceedState indicates that rollout successfully completed to match the desired target state
 	RolloutSucceedState RollingState = "rolloutSucceed"
-	// RolloutFailedState rollout is failed, the target replica is not reached
-	// we can not move forward anymore
-	// we will let the client to decide when or whether to revert
+	// RolloutAbandoningState indicates that the rollout is being abandoned
+	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
+	RolloutAbandoningState RollingState = "rolloutAbandoning"
+	// RolloutDeletingState indicates that the rollout is being deleted
+	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
+	RolloutDeletingState RollingState = "RolloutDeletingState"
+	// RolloutFailedState indicates that rollout is failed, the target replica is not reached
+	// we can not move forward anymore, we will let the client to decide when or whether to revert.
 	RolloutFailedState RollingState = "rolloutFailed"
 )
 
@@ -73,8 +102,9 @@ const (
 type RolloutPlan struct {
 
 	// RolloutStrategy defines strategies for the rollout plan
+	// The default is IncreaseFirstRolloutStrategyType
 	// +optional
-	RolloutStrategy *RolloutStrategyType `json:"rolloutStrategy,omitempty"`
+	RolloutStrategy RolloutStrategyType `json:"rolloutStrategy,omitempty"`
 
 	// The size of the target resource. The default is the same
 	// as the size of the source resource.
@@ -82,12 +112,11 @@ type RolloutPlan struct {
 	TargetSize *int32 `json:"targetSize,omitempty"`
 
 	// The number of batches, default = 1
-	// mutually exclusive to RolloutBatches
 	// +optional
 	NumBatches *int32 `json:"numBatches,omitempty"`
 
 	// The exact distribution among batches.
-	// mutually exclusive to NumBatches.
+	// 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
@@ -99,7 +128,7 @@ type RolloutPlan struct {
 	// This is designed for the operators to manually rollout
 	// Default is the the number of batches which will rollout all the batches
 	// +optional
-	BatchPartition *int32 `json:"lastBatchToRollout,omitempty"`
+	BatchPartition *int32 `json:"batchPartition,omitempty"`
 
 	// Paused the rollout, default is false
 	// +optional
@@ -161,8 +190,11 @@ type RolloutWebhook struct {
 	// URL address of this webhook
 	URL string `json:"url"`
 
-	// Request timeout for this webhook
-	Timeout string `json:"timeout,omitempty"`
+	// Method the HTTP call method, default is POST
+	Method string `json:"method,omitempty"`
+
+	// ExpectedStatus contains all the expected http status code that we will accept as success
+	ExpectedStatus []int `json:"expectedStatus,omitempty"`
 
 	// Metadata (key-value pairs) for this webhook
 	// +optional
@@ -171,11 +203,14 @@ type RolloutWebhook struct {
 
 // RolloutWebhookPayload holds the info and metadata sent to webhooks
 type RolloutWebhookPayload struct {
-	// ResourceRef refers to the resource we are operating on
-	ResourceRef *runtimev1alpha1.TypedReference `json:"resourceRef"`
+	// Name of the upgrading resource
+	Name string `json:"name"`
 
-	// RolloutRef refers to the rollout that is controlling the rollout
-	RolloutRef *runtimev1alpha1.TypedReference `json:"rolloutRef"`
+	// Namespace of the upgrading resource
+	Namespace string `json:"namespace"`
+
+	// Phase of the rollout
+	Phase string `json:"phase"`
 
 	// Metadata (key-value pairs) are the extra data send to this webhook
 	Metadata map[string]string `json:"metadata,omitempty"`
@@ -195,7 +230,7 @@ type CanaryMetric struct {
 
 	// TemplateRef references a metric template object
 	// +optional
-	TemplateRef *runtimev1alpha1.TypedReference `json:"templateRef,omitempty"`
+	TemplateRef *corev1.ObjectReference `json:"templateRef,omitempty"`
 }
 
 // MetricsExpectedRange defines the range used for metrics validation
@@ -212,7 +247,15 @@ type MetricsExpectedRange struct {
 // RolloutStatus defines the observed state of a rollout plan
 type RolloutStatus struct {
 	// Conditions represents the latest available observations of a CloneSet's current state.
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	condition.ConditionedStatus `json:",inline"`
+
+	// 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
+	RolloutOriginalSize int32 `json:"rolloutOriginalSize,omitempty"`
+
+	// 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
+	RolloutTargetSize int32 `json:"rolloutTargetSize,omitempty"`
 
 	// 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
@@ -237,6 +280,6 @@ type RolloutStatus struct {
 	// UpgradedReplicas is the number of Pods upgraded by the rollout controller
 	UpgradedReplicas int32 `json:"upgradedReplicas"`
 
-	// UpgradedReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+	// UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
 	UpgradedReadyReplicas int32 `json:"upgradedReadyReplicas"`
 }

apis/standard.oam.dev/v1alpha1/rollout_state.go

@@ -1,10 +1,27 @@
+/*
+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 (
 	"fmt"
 	"time"
 
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
@@ -20,6 +37,15 @@ const (
 	// RollingRetriableFailureEvent indicates that we encountered an unexpected but retriable error
 	RollingRetriableFailureEvent RolloutEvent = "RollingRetriableFailureEvent"
 
+	// AppLocatedEvent indicates that apps are located successfully
+	AppLocatedEvent RolloutEvent = "AppLocatedEvent"
+
+	// RollingModifiedEvent indicates that the rolling target or source has changed
+	RollingModifiedEvent RolloutEvent = "RollingModifiedEvent"
+
+	// RollingDeletedEvent indicates that the rolling is being deleted
+	RollingDeletedEvent RolloutEvent = "RollingDeletedEvent"
+
 	// RollingSpecVerifiedEvent indicates that we have successfully verified that the rollout spec
 	RollingSpecVerifiedEvent RolloutEvent = "RollingSpecVerifiedEvent"
 
@@ -39,11 +65,8 @@ const (
 	// FinishedOneBatchEvent indicates that we have successfully rolled out one batch
 	FinishedOneBatchEvent RolloutEvent = "FinishedOneBatchEvent"
 
-	// BatchRolloutContinueEvent indicates that we need to continue to upgrade the pods in the batch
-	BatchRolloutContinueEvent RolloutEvent = "BatchRolloutContinueEvent"
-
-	// BatchRolloutVerifyingEvent indicates that we are waiting for the approval of resume one batch
-	BatchRolloutVerifyingEvent RolloutEvent = "BatchRolloutVerifyingEvent"
+	// RolloutOneBatchEvent indicates that we have rollout one batch
+	RolloutOneBatchEvent RolloutEvent = "RolloutOneBatchEvent"
 
 	// OneBatchAvailableEvent indicates that the batch resource is considered available
 	// this events comes after we have examine the pod readiness check and traffic shifting if needed
@@ -54,38 +77,45 @@ const (
 
 	// BatchRolloutFailedEvent indicates that we are waiting for the approval of the
 	BatchRolloutFailedEvent RolloutEvent = "BatchRolloutFailedEvent"
-
-	// WorkloadModifiedEvent indicates that the res
-	WorkloadModifiedEvent RolloutEvent = "WorkloadModifiedEvent"
 )
 
 // These are valid conditions of the rollout.
 const (
-	// RolloutSpecVerified indicates that the rollout spec matches the resource we have in the cluster
-	RolloutSpecVerified runtimev1alpha1.ConditionType = "RolloutSpecVerified"
-	// RolloutInitialized means all the needed initialization work is done
-	RolloutInitialized runtimev1alpha1.ConditionType = "Initialized"
+	// RolloutSpecVerifying indicates that the rollout just started with verification
+	RolloutSpecVerifying condition.ConditionType = "RolloutSpecVerifying"
+	// RolloutInitializing means we start to initialize the cluster
+	RolloutInitializing condition.ConditionType = "RolloutInitializing"
 	// RolloutInProgress means we are upgrading resources.
-	RolloutInProgress runtimev1alpha1.ConditionType = "Ready"
+	RolloutInProgress condition.ConditionType = "RolloutInProgress"
+	// RolloutFinalizing means the rollout is finalizing
+	RolloutFinalizing condition.ConditionType = "RolloutFinalizing"
+	// RolloutFailing means the rollout is failing
+	RolloutFailing condition.ConditionType = "RolloutFailing"
+	// RolloutAbandoning means that the rollout is being abandoned.
+	RolloutAbandoning condition.ConditionType = "RolloutAbandoning"
+	// RolloutDeleting means that the rollout is being deleted.
+	RolloutDeleting condition.ConditionType = "RolloutDeleting"
+	// RolloutFailed means that the rollout failed.
+	RolloutFailed condition.ConditionType = "RolloutFailed"
 	// RolloutSucceed means that the rollout is done.
-	RolloutSucceed runtimev1alpha1.ConditionType = "Succeed"
-	// BatchInitialized
-	BatchInitialized runtimev1alpha1.ConditionType = "BatchInitialized"
-	// BatchInRolled
-	BatchInRolled runtimev1alpha1.ConditionType = "BatchInRolled"
-	// BatchVerified
-	BatchVerified runtimev1alpha1.ConditionType = "BatchVerified"
+	RolloutSucceed condition.ConditionType = "RolloutSucceed"
+	// BatchInitializing
+	BatchInitializing condition.ConditionType = "BatchInitializing"
+	// BatchPaused
+	BatchPaused condition.ConditionType = "BatchPaused"
+	// BatchVerifying
+	BatchVerifying condition.ConditionType = "BatchVerifying"
 	// BatchRolloutFailed
-	BatchRolloutFailed runtimev1alpha1.ConditionType = "BatchRolloutFailed"
-	// BatchFinalized
-	BatchFinalized runtimev1alpha1.ConditionType = "BatchFinalized"
+	BatchRolloutFailed condition.ConditionType = "BatchRolloutFailed"
+	// BatchFinalizing
+	BatchFinalizing condition.ConditionType = "BatchFinalizing"
 	// BatchReady
-	BatchReady runtimev1alpha1.ConditionType = "BatchReady"
+	BatchReady condition.ConditionType = "BatchReady"
 )
 
 // NewPositiveCondition creates a positive condition type
-func NewPositiveCondition(condType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return runtimev1alpha1.Condition{
+func NewPositiveCondition(condType condition.ConditionType) condition.Condition {
+	return condition.Condition{
 		Type:               condType,
 		Status:             v1.ConditionTrue,
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -93,8 +123,8 @@ func NewPositiveCondition(condType runtimev1alpha1.ConditionType) runtimev1alpha
 }
 
 // NewNegativeCondition creates a false condition type
-func NewNegativeCondition(condType runtimev1alpha1.ConditionType, message string) runtimev1alpha1.Condition {
-	return runtimev1alpha1.Condition{
+func NewNegativeCondition(condType condition.ConditionType, message string) condition.Condition {
+	return condition.Condition{
 		Type:               condType,
 		Status:             v1.ConditionFalse,
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -106,25 +136,28 @@ const invalidRollingStateTransition = "the rollout state transition from `%s` st
 
 const invalidBatchRollingStateTransition = "the batch rolling state transition from `%s` state  with `%s` is invalid"
 
-func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType {
+func (r *RolloutStatus) getRolloutConditionType() condition.ConditionType {
 	// figure out which condition type should we put in the condition depends on its state
 	switch r.RollingState {
-	case VerifyingState:
-		return RolloutSpecVerified
+	case VerifyingSpecState:
+		return RolloutSpecVerifying
 
 	case InitializingState:
-		return RolloutInitialized
+		return RolloutInitializing
 
 	case RollingInBatchesState:
 		switch r.BatchRollingState {
 		case BatchInitializingState:
-			return BatchInitialized
+			return BatchInitializing
 
 		case BatchVerifyingState:
-			return BatchVerified
+			return BatchVerifying
 
 		case BatchFinalizingState:
-			return BatchFinalized
+			return BatchFinalizing
+
+		case BatchRolloutFailedState:
+			return BatchRolloutFailed
 
 		case BatchReadyState:
 			return BatchReady
@@ -134,10 +167,22 @@ func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType
 		}
 
 	case FinalisingState:
+		return RolloutFinalizing
+
+	case RolloutFailingState:
+		return RolloutFailing
+
+	case RolloutAbandoningState:
+		return RolloutAbandoning
+
+	case RolloutDeletingState:
+		return RolloutDeleting
+
+	case RolloutSucceedState:
 		return RolloutSucceed
 
 	default:
-		return RolloutSucceed
+		return RolloutFailed
 	}
 }
 
@@ -154,78 +199,171 @@ func (r *RolloutStatus) RolloutFailed(reason string) {
 	r.RollingState = RolloutFailedState
 }
 
+// RolloutFailing is a special state transition that always moves the rollout state to the failing state
+func (r *RolloutStatus) RolloutFailing(reason string) {
+	// set the condition first which depends on the state
+	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
+	r.RollingState = RolloutFailingState
+	r.BatchRollingState = BatchInitializingState
+}
+
+// ResetStatus resets the status of the rollout to start from beginning
+func (r *RolloutStatus) ResetStatus() {
+	r.NewPodTemplateIdentifier = ""
+	r.RolloutTargetSize = -1
+	r.LastAppliedPodTemplateIdentifier = ""
+	r.RollingState = LocatingTargetAppState
+	r.BatchRollingState = BatchInitializingState
+	r.CurrentBatch = 0
+	r.UpgradedReplicas = 0
+	r.UpgradedReadyReplicas = 0
+}
+
+// SetRolloutCondition sets the supplied condition, replacing any existing condition
+// of the same type unless they are identical.
+func (r *RolloutStatus) SetRolloutCondition(new condition.Condition) {
+	exists := false
+	for i, existing := range r.Conditions {
+		if existing.Type != new.Type {
+			continue
+		}
+		// we want to update the condition when the LTT changes
+		if existing.Type == new.Type &&
+			existing.Status == new.Status &&
+			existing.Reason == new.Reason &&
+			existing.Message == new.Message &&
+			existing.LastTransitionTime == new.LastTransitionTime {
+			exists = true
+			continue
+		}
+
+		r.Conditions[i] = new
+		exists = true
+	}
+	if !exists {
+		r.Conditions = append(r.Conditions, new)
+	}
+}
+
+// we can't panic since it will crash the other controllers
+func (r *RolloutStatus) illegalStateTransition(err error) {
+	r.RolloutFailed(err.Error())
+}
+
 // StateTransition is the center place to do rollout state transition
 // it returns an error if the transition is invalid
 // it changes the coming rollout state if it's valid
 func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 	rollingState := r.RollingState
 	batchRollingState := r.BatchRollingState
-	defer klog.InfoS("try to execute a rollout state transition",
-		"pre rolling state", rollingState,
-		"pre batch rolling state", batchRollingState,
-		"post rolling state", r.RollingState,
-		"post batch rolling state", r.BatchRollingState)
+	defer func() {
+		klog.InfoS("try to execute a rollout state transition",
+			"pre rolling state", rollingState,
+			"pre batch rolling state", batchRollingState,
+			"post rolling state", r.RollingState,
+			"post batch rolling state", r.BatchRollingState)
+	}()
 
-	// we have special transition for these two types of event
+	// we have special transition for these types of event since they require additional info
 	if event == RollingFailedEvent || event == RollingRetriableFailureEvent {
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		return
+	}
+	// special handle modified event here
+	if event == RollingModifiedEvent {
+		if r.RollingState == RolloutDeletingState {
+			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			return
+		}
+		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
+			r.ResetStatus()
+		} else {
+			r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
+			r.RollingState = RolloutAbandoningState
+			r.BatchRollingState = BatchInitializingState
+		}
+		return
+	}
+
+	// special handle deleted event here, it can happen at many states
+	if event == RollingDeletedEvent {
+		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
+			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			return
+		}
+		r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout is being deleted"))
+		r.RollingState = RolloutDeletingState
+		r.BatchRollingState = BatchInitializingState
+		return
+	}
+
+	// special handle appLocatedEvent event here, it only applies to one state but it's legal to happen at other states
+	if event == AppLocatedEvent {
+		if r.RollingState == LocatingTargetAppState {
+			r.RollingState = VerifyingSpecState
+		}
+		return
 	}
 
 	switch rollingState {
-	case VerifyingState:
+	case VerifyingSpecState:
 		if event == RollingSpecVerifiedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = InitializingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case InitializingState:
 		if event == RollingInitializedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RollingInBatchesState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			r.BatchRollingState = BatchInitializingState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RollingInBatchesState:
 		r.batchStateTransition(event)
 		return
 
+	case RolloutAbandoningState:
+		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
+			r.ResetStatus()
+			return
+		}
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+
+	case RolloutDeletingState:
+		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
+			r.RollingState = RolloutFailedState
+			return
+		}
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+
 	case FinalisingState:
 		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RolloutSucceedState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
-	case RolloutSucceedState:
-		if event == WorkloadModifiedEvent {
-			r.RollingState = VerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
-			return
-		}
+	case RolloutFailingState:
 		if event == RollingFinalizedEvent {
-			// no op
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
+			r.RollingState = RolloutFailedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
-	case RolloutFailedState:
-		if event == WorkloadModifiedEvent {
-			r.RollingState = VerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
-			return
-		}
-		if event == RollingFailedEvent {
-			// no op
-			return
-		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+	case RolloutSucceedState, RolloutFailedState:
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	default:
-		panic(fmt.Errorf("invalid rolling state %s", rollingState))
+		r.illegalStateTransition(fmt.Errorf("invalid rolling state %s before transition", rollingState))
 	}
 }
 
@@ -244,55 +382,49 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchInRollingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchInRollingState:
-		if event == BatchRolloutContinueEvent {
-			// no op
-			return
-		}
-		if event == BatchRolloutVerifyingEvent {
+		if event == RolloutOneBatchEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchVerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchVerifyingState:
 		if event == OneBatchAvailableEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchFinalizingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		if event == BatchRolloutVerifyingEvent {
-			// no op
-			return
-		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchFinalizingState:
 		if event == FinishedOneBatchEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchReadyState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		if event == AllBatchFinishedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			// transition out of the batch loop
+			r.BatchRollingState = BatchReadyState
 			r.RollingState = FinalisingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchReadyState:
 		if event == BatchRolloutApprovedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchInitializingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			r.CurrentBatch++
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	default:
-		panic(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
+		r.illegalStateTransition(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
 	}
 }

apis/standard.oam.dev/v1alpha1/rollout_type.go

@@ -0,0 +1,77 @@
+/*
+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 (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Rollout is the Schema for the Rollout API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam},shortName=rollout
+// +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"
+type Rollout struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RolloutSpec       `json:"spec,omitempty"`
+	Status CompRolloutStatus `json:"status,omitempty"`
+}
+
+// RolloutSpec defines how to describe an update between different compRevision
+type RolloutSpec struct {
+	// TargetRevisionName contains the name of the componentRevisionName that we need to upgrade to.
+	TargetRevisionName string `json:"targetRevisionName"`
+
+	// SourceRevisionName contains the name of the componentRevisionName  that we need to upgrade from.
+	// it can be empty only when it's the first time to deploy the application
+	SourceRevisionName string `json:"sourceRevisionName,omitempty"`
+
+	// ComponentName specify the component name
+	ComponentName string `json:"componentName"`
+
+	// RolloutPlan is the details on how to rollout the resources
+	RolloutPlan RolloutPlan `json:"rolloutPlan"`
+}
+
+// CompRolloutStatus defines the observed state of rollout
+type CompRolloutStatus struct {
+	RolloutStatus `json:",inline"`
+
+	// LastUpgradedTargetRevision contains the name of the componentRevisionName that we upgraded to
+	// We will restart the rollout if this is not the same as the spec
+	LastUpgradedTargetRevision string `json:"lastTargetRevision"`
+
+	// LastSourceRevision contains the name of the componentRevisionName that we need to upgrade from.
+	// We will restart the rollout if this is not the same as the spec
+	LastSourceRevision string `json:"LastSourceRevision,omitempty"`
+}
+
+// RolloutList contains a list of Rollout
+// +kubebuilder:object:root=true
+type RolloutList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Rollout `json:"items"`
+}

apis/standard.oam.dev/v1alpha1/rollouttrait_types.go

@@ -1,71 +0,0 @@
-package v1alpha1
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// RolloutTraitSpec defines the desired state of RolloutTrait
-type RolloutTraitSpec struct {
-	// TargetRef references a target resource that contains the newer version
-	// of the software. We assumed that new resource already exists.
-	// This is the only resource we work on if the resource is a stateful resource (cloneset/statefulset)
-	TargetRef runtimev1alpha1.TypedReference `json:"targetRef"`
-
-	// SourceRef references the list of resources that contains the older version
-	// of the software. We assume that it's the first time to deploy when we cannot find any source.
-	// +optional
-	SourceRef []runtimev1alpha1.TypedReference `json:"sourceRef,omitempty"`
-
-	// RolloutPlan is the details on how to rollout the resources
-	RolloutPlan RolloutPlan `json:"rolloutPlan"`
-}
-
-// RolloutTrait is the Schema for the RolloutTrait API
-// +kubebuilder:object:root=true
-// +genclient
-// +kubebuilder:subresource:status
-type RolloutTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   RolloutTraitSpec `json:"spec,omitempty"`
-	Status RolloutStatus    `json:"status,omitempty"`
-}
-
-// RolloutTraitList contains a list of RolloutTrait
-// +kubebuilder:object:root=true
-// +genclient
-type RolloutTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []RolloutTrait `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&RolloutTrait{}, &RolloutTraitList{})
-}
-
-var _ oam.Trait = &RolloutTrait{}
-
-// SetConditions for set CR condition
-func (tr *RolloutTrait) SetConditions(c ...runtimev1alpha1.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetCondition for get CR condition
-func (tr *RolloutTrait) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return tr.Status.GetCondition(c)
-}
-
-// GetWorkloadReference of this MetricsTrait.
-func (tr *RolloutTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
-	return tr.Spec.TargetRef
-}
-
-// SetWorkloadReference of this MetricsTrait.
-func (tr *RolloutTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
-	tr.Spec.TargetRef = r
-}