fix flaky test (#1841)

* add application component name duplication check in webhook

* Helm test will not clean up the test data, and the application test of the component with the same name created failed during e2e.

* fix the problems encountered during the test:

* ignore the parsing failure caused by the existing application without definition when checking;

* after the addition is successful, the resources left by the helm test are automatically cleaned up;

Co-authored-by: chwetion <chwetion@foxmail.com>

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

.github/workflows/check-docs.yml

@@ -14,6 +14,11 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12.x'
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Clean md files
+        run: python ./hack/website/format.py markdown ./docs/en
       - name: Test Build
         env:
           VERSION: ${{ github.ref }}

.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/e2e-test.yml

@@ -0,0 +1,109 @@
+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: Wait for e2e preparation ready
+        run: |
+          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/components)" != "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: Stop kubevela, get profile
+        run: make end-e2e
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: /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,9 +13,8 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.14'
+  GO_VERSION: '1.16'
   GOLANGCI_VERSION: 'v1.38'
-  DOCKER_BUILDX_VERSION: 'v0.4.2'
   KIND_VERSION: 'v0.7.0'
 
 jobs:
@@ -30,64 +29,17 @@ jobs:
         uses: fkirc/skip-duplicate-actions@v3.3.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.png", "**.jpg"]'
+          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 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 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:
     runs-on: ubuntu-20.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go
         uses: actions/setup-go@v1
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -123,71 +75,17 @@ jobs:
       - name: Clean up testdata
         run: make compatibility-testdata-cleanup
 
-  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
-          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/components)" != "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
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -200,8 +98,11 @@ 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
@@ -268,14 +169,16 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
+      - name: Set up Go 1.16
+        uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: ${{ env.GO_VERSION }}
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
       - name: Run cross-build
         run: make cross-build
       - name: Run compress binary
-        run: make compress
+        run: make compress
+      - name: Run make reviewable
+        run: make reviewable

.github/workflows/registry.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login docker.io
         uses: docker/login-action@v1
         with:
@@ -128,3 +128,22 @@ jobs:
           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-docs.yaml

@@ -14,6 +14,11 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12.x'
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Clean md files
+        run: python ./hack/website/format.py markdown ./docs/en
       - name: Sync to kubevela.io Repo
         env:
           SSH_DEPLOY_KEY: ${{ secrets.GH_PAGES_DEPLOY }}

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
       VELA_VERSION: ${{ github.ref }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.16
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -34,52 +34,111 @@ jobs:
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Upload Linux amd64 tar.gz
+      - name: Upload Vela Linux amd64 tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-linux-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Linux amd64 zip
+      - name: Upload Vela Linux amd64 zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-amd64.zip
+          asset_path: ./_bin/vela/vela-linux-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload MacOS tar.gz
+      - name: Upload Vela MacOS tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-darwin-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload MacOS zip
+      - name: Upload Vela MacOS zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-darwin-amd64.zip
+          asset_path: ./_bin/vela/vela-darwin-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Windows tar.gz
+      - name: Upload Vela Windows tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-windows-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Windows zip
+      - name: Upload Vela Windows zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-windows-amd64.zip
+          asset_path: ./_bin/vela/vela-windows-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
           asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
       - name: Upload Checksums
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
           asset_path: ./_bin/sha256sums.txt
           asset_name: sha256sums.txt
-          asset_content_type: text/plain
+          asset_content_type: text/plain
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.7"
+      - name: Clean md files
+        run: python ./hack/website/format.py markdown ./docs/en
+      - name: Sync release to kubevela.io Repo
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.GH_PAGES_DEPLOY }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
+          COMMIT_ID: ${{ github.sha }}
+        run: |
+          bash ./hack/website/release.sh
+      - name: Update kubectl plugin version in krew-index
+        uses: rajatjindal/krew-release-bot@v0.0.38

.github/workflows/sync-api.yml

@@ -0,0 +1,36 @@
+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.14
+        uses: actions/setup-go@v1
+        env:
+          GO_VERSION: '1.14'
+          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/sync.sh

.github/workflows/timed-task.yml

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

.github/workflows/unit-test.yml

@@ -0,0 +1,81 @@
+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: 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

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

CONTRIBUTING.md

@@ -3,147 +3,62 @@
 ## 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
 
-## Development
+You can contribute to KubeVela in several ways. Here are some examples:
 
-### Prerequisites
+* Contribute to the KubeVela codebase.
+* 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.
 
-1. Golang version 1.13+
-2. Kubernetes version v1.16+ with `~/.kube/config` configured.
-3. ginkgo 1.14.0+ (just for [E2E test](./CONTRIBUTING.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.
+For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
 
-We also recommend you to learn about KubeVela's [design](https://kubevela.io/docs/concepts) before dive into its code.
+### Report bugs
 
-### Build
+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.
 
-* Clone this project
+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.
 
-```shell script
-git clone git@github.com:oam-dev/kubevela.git
-```
+Follow the issue template and add additional information that will help us replicate the problem.
 
-KubeVela includes two parts, `vela core` and `vela cli`.
+#### Security issues
 
-- 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`).
+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.
 
-For local development, we probably need to build both of them.
+### Suggest enhancements
 
-* Build 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).
 
-```shell script
-make
-```
+### Triage issues
 
-After the vela cli built successfully, `make` command will create `vela` binary to `bin/` under the project.
+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.
 
-* Configure `vela` binary to System PATH
+Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
 
-```shell script
-export PATH=$PATH:/your/path/to/project/kubevela/bin
-```
+### Answering questions
 
-Then you can use `vela` command directly.
+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).
 
-* Build Vela Core
+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
-make manager
-```
+### Your first contribution
 
-* Run Vela Core
+Unsure where to begin contributing to KubeVela? Start by browsing issues labeled `good first issue` or `help wanted`.
 
-Firstly make sure your cluster has CRDs, below is the command that can help install all CRDs.
+- [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 core-install
-```
+If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
 
-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/docs/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
-```
-
-### Contribute Docs
-
-Please read [the documentation](https://github.com/oam-dev/kubevela/tree/master/docs/README.md) before contributing to the docs.
-
-- Build docs
-
-```shell script
-make docs-build
-```
-
-- Local development and preview
-
-```shell script
-make docs-start
-```
-
-## 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,5 +1,5 @@
 # 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
@@ -19,24 +19,26 @@ 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 ubuntu as base image for convenience.
+# 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_IMAGE=gcr.io/distroless/static:nonroot` to overwrite
+# Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE:-ubuntu:latest}
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN ln -s /usr/bin/* /usr/sbin/ && apt-get update -y \
-  && apt-get install --no-install-recommends -y ca-certificates \
-  && apt-get clean && rm -rf /var/log/*log /var/lib/apt/lists/* /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old
+RUN apk add --no-cache ca-certificates bash
 
 WORKDIR /
 
 ARG TARGETARCH
-COPY --from=builder /workspace/manager-${TARGETARCH} /manager
+COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager
 
-ENTRYPOINT ["/manager"]
+COPY entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["manager"]

Dockerfile.e2e

@@ -0,0 +1,48 @@
+# Build the manager binary
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-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/ 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 ;\
+     go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .
+
+# 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 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 [commands.json](https://github.com/oam-dev/kubevela/blob/main/.github/commands.json).
+
+* Add /duplicate `#<issue number>`  to have KubeVela label & close issue with an appropriate message.
+* Add `bot/question` and the bot will close it with an appropriate message.
+
+[Read more on bot actions](https://github.com/oam-dev/kubevela/blob/main/.github/bot.md)

Makefile

@@ -3,10 +3,11 @@ 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)"
+VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
+VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
+LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
 
+GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
 GOX         = go run github.com/mitchellh/gox
 TARGETS     := darwin/amd64 linux/amd64 windows/amd64
 DIST_DIRS   := find * -type d -exec
@@ -34,6 +35,10 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+# Image URL to use all building/pushing image targets
+VELA_CORE_IMAGE      ?= vela-core:latest
+VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
+
 all: build
 
 # Run tests
@@ -42,17 +47,15 @@ test: vet lint staticcheck
 	go test -race -covermode=atomic ./references/apiserver/... ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
 	@$(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} references/cmd/cli/main.go
-	git checkout references/cmd/cli/fake/chart_source.go
+# 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} references/cmd/cli/main.go
-	git checkout references/cmd/cli/fake/chart_source.go
+	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
+
+kubectl-vela:
+	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
 
 dashboard-build:
 	cd references/dashboard && npm install && cd ..
@@ -60,23 +63,17 @@ dashboard-build:
 doc-gen:
 	rm -r docs/en/cli/*
 	go run hack/docgen/gen.go
-	go run hack/references/generate.go
 
+PWD := $(shell pwd)
 docs-build:
-ifneq ($(wildcard git-page),)
-	rm -rf git-page
-endif
-	sh ./hack/website/test-build.sh
+	docker run -it -v $(PWD)/docs/sidebars.js:/workspace/kubevela.io/sidebars.js \
+	 -v $(PWD)/docs/en:/workspace/kubevela.io/docs \
+	 oamdev/vela-webtool:v1 -t build
 
 docs-start:
-ifeq ($(wildcard git-page),)
-	git clone --single-branch --depth 1 https://github.com/oam-dev/kubevela.io.git git-page
-endif
-	rm -r git-page/docs && rm -r git-page/resources
-	rm git-page/sidebars.js
-	cat docs/sidebars.js > git-page/sidebars.js
-	cp -R docs/en git-page/docs && cp -R docs/resources git-page/resources
-	cd git-page && yarn install && yarn start
+	docker run -it -p 3000:3000 -v $(PWD)/docs/sidebars.js:/workspace/kubevela.io/sidebars.js \
+	 -v $(PWD)/docs/en:/workspace/kubevela.io/docs \
+	 oamdev/vela-webtool:v1 -t start
 
 api-gen:
 	swag init -g references/apiserver/route.go --output references/apiserver/docs
@@ -87,19 +84,27 @@ 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)' ./references/cmd/cli/
+	rm -rf _bin
+	go get github.com/mitchellh/gox@v0.4.0
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/vela/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/kubectl-vela/{{.OS}}-{{.Arch}}/kubectl-vela" -osarch='$(TARGETS)' ./cmd/plugin
 
 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 {} \; && \
+		cd _bin/vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
 		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
 		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
-		sha256sum vela-* > sha256sums.txt \
+		cd ../kubectl-vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
+		cd .. && \
+		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
 	)
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
@@ -109,8 +114,9 @@ run: fmt vet
 # 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/internal/cue/*
+	$(CUE) fmt ./vela-templates/registry/cue/*
 
 # Run go vet against code
 vet:
@@ -120,7 +126,7 @@ staticcheck: staticchecktool
 	$(STATICCHECK) ./...
 
 lint: golangci
-	$(GOLANGCILINT) run  ./...
+	$(GOLANGCILINT) run ./...
 
 reviewable: manifests fmt vet lint staticcheck
 	go mod tidy
@@ -133,16 +139,17 @@ check-diff: reviewable
 
 # Build the docker image
 docker-build:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) . -t ${IMG}
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
 
 # Push the docker image
 docker-push:
-	docker push ${IMG}
+	docker push $(VELA_CORE_IMAGE)
 
 e2e-setup:
 	helm install --create-namespace -n flux-system helm-flux http://oam.dev/catalog/helm-flux2-0.1.0.tgz
 	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.7.0/kruise-chart.tgz
-	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
+	sh ./hack/e2e/modify_charts.sh
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
 	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
@@ -179,25 +186,25 @@ e2e-cleanup:
 
 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 docker images -q $(VELA_CORE_TEST_IMAGE)),)
+	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif
 
+end-e2e:
+	sh ./hack/e2e/end_e2e.sh
+
 # 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; }
-
-# Image URL to use all building/pushing image targets
-IMG ?= vela-core:latest
+	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; }
 
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
 
-# Build manager binary
+# Build vela core manager 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
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 core-run: fmt vet manifests
@@ -218,12 +225,12 @@ core-uninstall: manifests
 	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: kustomize
+manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
 	# 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
 	mv config/crd/base/* charts/vela-core/crds
-	./hack/vela-templates/gen_definitions.sh
+	./vela-templates/gen_definitions.sh
 	./hack/crd/cleanup.sh
 
 GOLANGCILINT_VERSION ?= v1.31.0

README.md

@@ -8,55 +8,53 @@
 [![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)
 
-![alt](docs/resources/KubeVela-03.png)
+![alt](docs/en/resources/KubeVela-03.png)
 
 *Make shipping applications more enjoyable.*
 
 # KubeVela
 
-KubeVela is a modern application engine that adapts to your application's needs, not the other way around.
-
-## Community
-
-- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel
-- Gitter: [Discussion](https://gitter.im/oam-dev/community)
-- Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs)
-
-## What problems does it solve?
-
-Traditional Platform-as-a-Service (PaaS) system enables easy application deployments and everything just works, but this happiness disappears when your application outgrows the capabilities of your platform.
-
-KubeVela is a modern application engine whose capabilities are actually Infrastructure-as-Code (IaC) components coded by you or come from the ecosystem. Think of it as a *Heroku* which is fully programmable to serve your needs as you grow and expand.
-
-As a plus, KubeVela leverages [Kubernetes Control Loop](https://kubernetes.io/docs/concepts/architecture/controller/) to enforce all those abstractions so they will never leave *configuration drift* (i.e. the running instances are not in line with the expected configuration) in your clusters.
-
-## Getting Started
-
-- [Installation](https://kubevela.io/docs/install)
-- [Quick start](https://kubevela.io/docs/quick-start)
-- [How it works](https://kubevela.io/docs/concepts)
+KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
 
 ## Features
 
-- **Zero-restriction deployment** - design and express platform capabilities with [CUE](https://cuelang.org/) or [Helm](https://helm.sh) per needs of your application, and let Kubernetes controller guarantee the deployment determinism. GUI forms are automatically generated for capabilities so even your dashboard are fully extensible.
-- **Generic progressive rollout framework** - built-in rollout framework and strategies to upgrade your microservice regardless of its workload type (e.g. stateless, stateful, or even custom operators etc).
-- **Multi-cluster multi-revision application deployment** - built-in model to deploy or rollout your apps across hybrid infrastructures, with Service Mesh for traffic shifting. 
-- **Simple and native** - KubeVela is a just simple Kubernetes custom controller, all its capabilities are defined as [Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) so they naturally work with any CI/CD or GitOps tools that works with Kubernetes.
+**Application Centric** - KubeVela introduces declarative yet higher level API (known as [OAM](https://oam.dev/)) to model a full deployment of microservices across hybrid environments in consistent approach. No infrastructure level concerns, simply deploy.
+
+**Natively Extensible** - KubeVela backend is implemented with [CUE](https://cuelang.org/). Whenever your needs grow, KubeVela's capabilities can naturally expand in a IaC-style approach. No restrictions, simply programming.
+
+**Runtime Agnostic** - KubeVela relies on Kubernetes as control plane but it's adaptable to any runtime infrastructures. It can deploy and manage diverse workload types including container, cloud functions, databases, or even EC2 instances across hybrid environments.
+
+## Getting Started
+
+- [Introduction](https://kubevela.io/docs)
+- [Installation](https://kubevela.io/docs/install)
+- [Deploy an Application](https://kubevela.io/docs/application)
 
 ## Documentation
 
-Visit the [KubeVela documentation site](https://kubevela.io/) to find *Installation Instruction*, *Platform Builder Guide* and *Developer Experience Guide*.
+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*)
+- 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) |
+| 🎤  Talks | - [KubeVela - The Modern App Delivery System in Alibaba](https://docs.google.com/presentation/d/1CWCLcsKpDQB3bBDTfdv2BZ8ilGGJv2E8L-iOA5HMrV0/edit?usp=sharing) <br> - [Cloud-Native Apps With Open Application Model (OAM) And KubeVela](https://www.youtube.com/watch?v=2CBu6sOTtwk)  |
 | 🌎 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
 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/core.oam.dev/common/types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package common
 
 import (
-	v1alpha12 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
@@ -84,7 +84,7 @@ type Schematic struct {
 
 	HELM *Helm `json:"helm,omitempty"`
 
-	// TODO(wonderflow): support HCL(terraform)here.
+	Terraform *Terraform `json:"terraform,omitempty"`
 }
 
 // A Helm represents resources used by a Helm module
@@ -98,6 +98,17 @@ type Helm struct {
 	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
+	Type string `json:"type,omitempty"`
+}
+
 // A WorkloadTypeDescriptor refer to a Workload Type
 type WorkloadTypeDescriptor struct {
 	// Type ref to a WorkloadDefinition via name
@@ -152,6 +163,8 @@ const (
 	ApplicationRollingOut ApplicationPhase = "rollingOut"
 	// ApplicationRendering means the app is rendering
 	ApplicationRendering ApplicationPhase = "rendering"
+	// ApplicationRunningWorkflow means the app is running workflow
+	ApplicationRunningWorkflow ApplicationPhase = "runningWorkflow"
 	// 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
@@ -160,10 +173,13 @@ const (
 
 // 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"`
+	Name string `json:"name"`
+	// 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             []runtimev1alpha1.TypedReference `json:"scopes,omitempty"`
 }
 
 // ApplicationTraitStatus records the trait health status
@@ -189,24 +205,82 @@ type RawComponent struct {
 	Raw runtime.RawExtension `json:"raw"`
 }
 
+// WorkflowStepStatus record the status of a workflow step
+type WorkflowStepStatus struct {
+	Name        string                         `json:"name,omitempty"`
+	Type        string                         `json:"type,omitempty"`
+	Phase       WorkflowStepPhase              `json:"phase,omitempty"`
+	ResourceRef runtimev1alpha1.TypedReference `json:"resourceRef,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
-	v1alpha1.RolloutStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+
+	Rollout AppRolloutStatus `json:"rollout,omitempty"`
 
 	Phase ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
-	Components []v1alpha12.TypedReference `json:"components,omitempty"`
+	Components []runtimev1alpha1.TypedReference `json:"components,omitempty"`
 
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`
 
 	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *v1alpha12.TypedReference `json:"resourceTracker,omitempty"`
+	ResourceTracker *runtimev1alpha1.TypedReference `json:"resourceTracker,omitempty"`
+
+	// Workflow record the status of workflow steps
+	Workflow []WorkflowStepStatus `json:"workflow,omitempty"`
 
 	// LatestRevision of the application configuration it generates
 	// +optional
 	LatestRevision *Revision `json:"latestRevision,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 make the controller stop the workflow and report error in `message`.
+	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
+	// WorkflowStepPhaseStopped will make the controller stop the workflow.
+	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
+	// 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"
+)
+
+// 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"`
+}

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

@@ -25,9 +25,26 @@ import (
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppStatus) DeepCopyInto(out *AppStatus) {
+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)
+	in.Rollout.DeepCopyInto(&out.Rollout)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1alpha1.TypedReference, len(*in))
@@ -45,6 +62,11 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 		*out = new(v1alpha1.TypedReference)
 		**out = **in
 	}
+	if in.Workflow != nil {
+		in, out := &in.Workflow, &out.Workflow
+		*out = make([]WorkflowStepStatus, len(*in))
+		copy(*out, *in)
+	}
 	if in.LatestRevision != nil {
 		in, out := &in.LatestRevision, &out.LatestRevision
 		*out = new(Revision)
@@ -65,11 +87,17 @@ func (in *AppStatus) DeepCopy() *AppStatus {
 // 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([]v1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponentStatus.
@@ -268,6 +296,11 @@ func (in *Schematic) DeepCopyInto(out *Schematic) {
 		*out = new(Helm)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.Terraform != nil {
+		in, out := &in.Terraform, &out.Terraform
+		*out = new(Terraform)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schematic.
@@ -295,6 +328,37 @@ func (in *Status) DeepCopy() *Status {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Terraform) DeepCopyInto(out *Terraform) {
+	*out = *in
+}
+
+// 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 *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
+	*out = *in
+	out.ResourceRef = in.ResourceRef
+}
+
+// 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 *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
 	*out = *in

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.

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

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

@@ -62,6 +62,9 @@ type ComponentDefinitionStatus struct {
 	runtimev1alpha1.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
@@ -71,7 +74,6 @@ type ComponentDefinitionStatus struct {
 // +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"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

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.

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.

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.
@@ -71,7 +71,6 @@ type WorkloadDefinitionStatus struct {
 // Component.
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
 // +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -155,6 +154,9 @@ type TraitDefinitionStatus struct {
 	runtimev1alpha1.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
@@ -167,7 +169,6 @@ type TraitDefinitionStatus struct {
 // +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"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

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.

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.

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.

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

@@ -22,9 +22,10 @@ package v1alpha2
 
 import (
 	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	"k8s.io/apimachinery/pkg/runtime"
+
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	standard_oam_devv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -782,6 +783,11 @@ func (in *ComponentDefinitionSpec) DeepCopy() *ComponentDefinitionSpec {
 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.
@@ -2067,6 +2073,11 @@ func (in *TraitDefinitionSpec) DeepCopy() *TraitDefinitionSpec {
 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.

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

@@ -50,10 +50,43 @@ type ApplicationComponent struct {
 	Scopes map[string]string `json:"scopes,omitempty"`
 }
 
+// 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"`
+}
+
 // ApplicationSpec is the spec of Application
 type ApplicationSpec struct {
 	Components []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 []WorkflowStep `json:"workflow,omitempty"`
+
 	// TODO(wonderflow): we should have application level scopes supported here
 
 	// RolloutPlan is the details on how to rollout the resources

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

@@ -17,6 +17,7 @@
 package v1beta1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -50,6 +51,9 @@ type ApplicationRevisionSpec struct {
 	// +kubebuilder:validation:EmbeddedResource
 	// +kubebuilder:pruning:PreserveUnknownFields
 	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
+
+	// ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
+	ResourcesConfigMap corev1.LocalObjectReference `json:"resourcesConfigMap,omitempty"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
@@ -48,19 +49,6 @@ type AppRolloutSpec struct {
 	RevertOnDelete bool `json:"revertOnDelete,omitempty"`
 }
 
-// AppRolloutStatus defines the observed state of AppRollout
-type AppRolloutStatus struct {
-	v1alpha1.RolloutStatus `json:",inline"`
-
-	// LastUpgradedTargetAppRevision contains the name of the app that we upgraded to
-	// We will restart the rollout if this is not the same as the spec
-	LastUpgradedTargetAppRevision string `json:"lastTargetAppRevision"`
-
-	// LastSourceAppRevision contains the name of the app that we need to upgrade from.
-	// We will restart the rollout if this is not the same as the spec
-	LastSourceAppRevision string `json:"LastSourceAppRevision,omitempty"`
-}
-
 // AppRollout is the Schema for the AppRollout API
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories={oam},shortName=approllout
@@ -76,8 +64,8 @@ type AppRollout struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AppRolloutSpec   `json:"spec,omitempty"`
-	Status AppRolloutStatus `json:"status,omitempty"`
+	Spec   AppRolloutSpec          `json:"spec,omitempty"`
+	Status common.AppRolloutStatus `json:"status,omitempty"`
 }
 
 // AppRolloutList contains a list of AppRollout

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

@@ -62,6 +62,9 @@ type ComponentDefinitionStatus struct {
 	runtimev1alpha1.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
@@ -72,7 +75,6 @@ type ComponentDefinitionStatus struct {
 // +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"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

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

@@ -72,7 +72,6 @@ type WorkloadDefinitionStatus struct {
 // +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"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -156,6 +155,9 @@ type TraitDefinitionStatus struct {
 	runtimev1alpha1.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
@@ -169,7 +171,6 @@ type TraitDefinitionStatus struct {
 // +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"
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

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

@@ -0,0 +1,70 @@
+/*
+ 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=comprev
+// +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"
+type DefinitionRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec DefinitionRevisionSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// 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/policy_definition.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 v1beta1
+
+import (
+	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"
+)
+
+// 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"`
+}
+
+// PolicyDefinitionStatus is the status of PolicyDefinition
+type PolicyDefinitionStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	runtimev1alpha1.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 ...runtimev1alpha1.Condition) {
+	d.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from PolicyDefinition
+func (d *PolicyDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.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
+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
+
+// 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

@@ -61,6 +61,30 @@ var (
 	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()
@@ -121,6 +145,9 @@ 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(&AppRollout{}, &AppRolloutList{})

apis/core.oam.dev/v1beta1/workflow_step_definition.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 v1beta1
+
+import (
+	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"
+)
+
+// 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
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+
+	// LatestRevision of the component definition
+	// +optional
+	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
+}
+
+// SetConditions set condition for WorkflowStepDefinition
+func (d *WorkflowStepDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
+	d.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkflowStepDefinition
+func (d *WorkflowStepDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.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
+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
+
+// WorkflowStepDefinitionList contains a list of WorkflowStepDefinition
+type WorkflowStepDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []WorkflowStepDefinition `json:"items"`
+}

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

@@ -21,9 +21,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	"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"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -135,6 +136,22 @@ func (in *AppDeploymentStatus) DeepCopy() *AppDeploymentStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppPolicy) DeepCopyInto(out *AppPolicy) {
+	*out = *in
+	in.Properties.DeepCopyInto(&out.Properties)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppPolicy.
+func (in *AppPolicy) DeepCopy() *AppPolicy {
+	if in == nil {
+		return nil
+	}
+	out := new(AppPolicy)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppRevision) DeepCopyInto(out *AppRevision) {
 	*out = *in
@@ -237,22 +254,6 @@ func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Application) DeepCopyInto(out *Application) {
 	*out = *in
@@ -440,6 +441,7 @@ func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 		}
 	}
 	in.ApplicationConfiguration.DeepCopyInto(&out.ApplicationConfiguration)
+	out.ResourcesConfigMap = in.ResourcesConfigMap
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
@@ -462,6 +464,20 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.Policies != nil {
+		in, out := &in.Policies, &out.Policies
+		*out = make([]AppPolicy, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Workflow != nil {
+		in, out := &in.Workflow, &out.Workflow
+		*out = make([]WorkflowStep, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	if in.RolloutPlan != nil {
 		in, out := &in.RolloutPlan, &out.RolloutPlan
 		*out = new(v1alpha1.RolloutPlan)
@@ -744,6 +760,11 @@ func (in *ComponentDefinitionSpec) DeepCopy() *ComponentDefinitionSpec {
 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.
@@ -756,6 +777,83 @@ func (in *ComponentDefinitionStatus) DeepCopy() *ComponentDefinitionStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DefinitionRevision) DeepCopyInto(out *DefinitionRevision) {
+	*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 DefinitionRevision.
+func (in *DefinitionRevision) DeepCopy() *DefinitionRevision {
+	if in == nil {
+		return nil
+	}
+	out := new(DefinitionRevision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DefinitionRevision) 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 *DefinitionRevisionList) DeepCopyInto(out *DefinitionRevisionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]DefinitionRevision, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionRevisionList.
+func (in *DefinitionRevisionList) DeepCopy() *DefinitionRevisionList {
+	if in == nil {
+		return nil
+	}
+	out := new(DefinitionRevisionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DefinitionRevisionList) 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 *DefinitionRevisionSpec) DeepCopyInto(out *DefinitionRevisionSpec) {
+	*out = *in
+	in.ComponentDefinition.DeepCopyInto(&out.ComponentDefinition)
+	in.TraitDefinition.DeepCopyInto(&out.TraitDefinition)
+	in.PolicyDefinition.DeepCopyInto(&out.PolicyDefinition)
+	in.WorkflowStepDefinition.DeepCopyInto(&out.WorkflowStepDefinition)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionRevisionSpec.
+func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(DefinitionRevisionSpec)
+	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
@@ -857,6 +955,107 @@ func (in *PlacementStatus) DeepCopy() *PlacementStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PolicyDefinition) DeepCopyInto(out *PolicyDefinition) {
+	*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 PolicyDefinition.
+func (in *PolicyDefinition) DeepCopy() *PolicyDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(PolicyDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *PolicyDefinition) 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 *PolicyDefinitionList) DeepCopyInto(out *PolicyDefinitionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]PolicyDefinition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyDefinitionList.
+func (in *PolicyDefinitionList) DeepCopy() *PolicyDefinitionList {
+	if in == nil {
+		return nil
+	}
+	out := new(PolicyDefinitionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *PolicyDefinitionList) 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 *PolicyDefinitionSpec) DeepCopyInto(out *PolicyDefinitionSpec) {
+	*out = *in
+	out.Reference = in.Reference
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(common.Schematic)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyDefinitionSpec.
+func (in *PolicyDefinitionSpec) DeepCopy() *PolicyDefinitionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PolicyDefinitionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PolicyDefinitionStatus) DeepCopyInto(out *PolicyDefinitionStatus) {
+	*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 PolicyDefinitionStatus.
+func (in *PolicyDefinitionStatus) DeepCopy() *PolicyDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PolicyDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTracker) DeepCopyInto(out *ResourceTracker) {
 	*out = *in
@@ -1150,6 +1349,11 @@ func (in *TraitDefinitionSpec) DeepCopy() *TraitDefinitionSpec {
 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.
@@ -1207,6 +1411,123 @@ func (in *WeightedTarget) DeepCopy() *WeightedTarget {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
+	*out = *in
+	in.Properties.DeepCopyInto(&out.Properties)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStep.
+func (in *WorkflowStep) DeepCopy() *WorkflowStep {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStep)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepDefinition) DeepCopyInto(out *WorkflowStepDefinition) {
+	*out = *in
+	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 WorkflowStepDefinition.
+func (in *WorkflowStepDefinition) DeepCopy() *WorkflowStepDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *WorkflowStepDefinition) 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 *WorkflowStepDefinitionList) DeepCopyInto(out *WorkflowStepDefinitionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]WorkflowStepDefinition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepDefinitionList.
+func (in *WorkflowStepDefinitionList) DeepCopy() *WorkflowStepDefinitionList {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepDefinitionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *WorkflowStepDefinitionList) 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 *WorkflowStepDefinitionSpec) DeepCopyInto(out *WorkflowStepDefinitionSpec) {
+	*out = *in
+	out.Reference = in.Reference
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(common.Schematic)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepDefinitionSpec.
+func (in *WorkflowStepDefinitionSpec) DeepCopy() *WorkflowStepDefinitionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepDefinitionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepDefinitionStatus) DeepCopyInto(out *WorkflowStepDefinitionStatus) {
+	*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 WorkflowStepDefinitionStatus.
+func (in *WorkflowStepDefinitionStatus) DeepCopy() *WorkflowStepDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadDefinition) DeepCopyInto(out *WorkloadDefinition) {
 	*out = *in

apis/generate.go

@@ -25,7 +25,7 @@ limitations under the License.
 //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=../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 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

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

@@ -242,7 +242,11 @@ func (r *RolloutStatus) SetRolloutCondition(new runtimev1alpha1.Condition) {
 	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
@@ -261,13 +265,18 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 
 	// 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 if r.RollingState != RolloutDeletingState {
+		} else {
 			r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
 			r.RollingState = RolloutAbandoningState
 			r.BatchRollingState = BatchInitializingState
@@ -278,7 +287,8 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 	// special handle deleted event here, it can happen at many states
 	if event == RollingDeletedEvent {
 		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
-			panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			return
 		}
 		r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout is being deleted"))
 		r.RollingState = RolloutDeletingState
@@ -301,7 +311,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = InitializingState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case InitializingState:
 		if event == RollingInitializedEvent {
@@ -310,7 +320,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchInitializingState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RollingInBatchesState:
 		r.batchStateTransition(event)
@@ -322,7 +332,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.ResetStatus()
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RolloutDeletingState:
 		if event == RollingFinalizedEvent {
@@ -330,7 +340,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = RolloutFailedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case FinalisingState:
 		if event == RollingFinalizedEvent {
@@ -338,7 +348,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = RolloutSucceedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RolloutFailingState:
 		if event == RollingFinalizedEvent {
@@ -346,13 +356,13 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = RolloutFailedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RolloutSucceedState, RolloutFailedState:
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		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))
 	}
 }
 
@@ -371,7 +381,7 @@ 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 == RolloutOneBatchEvent {
@@ -379,7 +389,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchVerifyingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchVerifyingState:
 		if event == OneBatchAvailableEvent {
@@ -387,7 +397,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchFinalizingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchFinalizingState:
 		if event == FinishedOneBatchEvent {
@@ -402,7 +412,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.RollingState = FinalisingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchReadyState:
 		if event == BatchRolloutApprovedEvent {
@@ -411,9 +421,9 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			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/types/capability.go

@@ -22,6 +22,9 @@ import (
 	"cuelang.org/go/cue"
 	"github.com/google/go-cmp/cmp"
 	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Source record the source of Capability
@@ -38,15 +41,16 @@ type CRDInfo struct {
 
 // Capability defines the content of a capability
 type Capability struct {
-	Name           string      `json:"name"`
-	Type           CapType     `json:"type"`
-	CueTemplate    string      `json:"template,omitempty"`
-	CueTemplateURI string      `json:"templateURI,omitempty"`
-	Parameters     []Parameter `json:"parameters,omitempty"`
-	CrdName        string      `json:"crdName,omitempty"`
-	Center         string      `json:"center,omitempty"`
-	Status         string      `json:"status,omitempty"`
-	Description    string      `json:"description,omitempty"`
+	Name           string             `json:"name"`
+	Type           CapType            `json:"type"`
+	CueTemplate    string             `json:"template,omitempty"`
+	CueTemplateURI string             `json:"templateURI,omitempty"`
+	Parameters     []Parameter        `json:"parameters,omitempty"`
+	CrdName        string             `json:"crdName,omitempty"`
+	Center         string             `json:"center,omitempty"`
+	Status         string             `json:"status,omitempty"`
+	Description    string             `json:"description,omitempty"`
+	Category       CapabilityCategory `json:"category,omitempty"`
 
 	// trait only
 	AppliesTo []string `json:"appliesTo,omitempty"`
@@ -58,6 +62,13 @@ type Capability struct {
 	Source  *Source       `json:"source,omitempty"`
 	Install *Installation `json:"install,omitempty"`
 	CrdInfo *CRDInfo      `json:"crdInfo,omitempty"`
+
+	// Terraform
+	TerraformConfiguration string `json:"terraformConfiguration,omitempty"`
+
+	// KubeTemplate
+	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`
+	KubeParameter []common.KubeParameter `json:"kubeparameter,omitempty"`
 }
 
 // Chart defines all necessary information to install a whole chart
@@ -88,6 +99,10 @@ const (
 	TypeTrait CapType = "trait"
 	// TypeScope represent OAM Scope
 	TypeScope CapType = "scope"
+	// TypeWorkflowStep represent OAM Workflow
+	TypeWorkflowStep CapType = "workflowstep"
+	// TypePolicy represent OAM Policy
+	TypePolicy CapType = "policy"
 )
 
 // CapabilityConfigMapNamePrefix is the prefix for capability ConfigMap name
@@ -119,8 +134,10 @@ type Parameter struct {
 	Required bool        `json:"required,omitempty"`
 	Default  interface{} `json:"default,omitempty"`
 	Usage    string      `json:"usage,omitempty"`
+	Ignore   bool        `json:"ignore,omitempty"`
 	Type     cue.Kind    `json:"type,omitempty"`
 	Alias    string      `json:"alias,omitempty"`
+	JSONType string      `json:"jsonType,omitempty"`
 }
 
 // SetFlagBy set cli flag from Parameter

apis/types/componentmanifest.go

@@ -0,0 +1,37 @@
+/*
+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 types
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+// ComponentManifest contains resources rendered from an application component.
+type ComponentManifest struct {
+	Name             string
+	RevisionName     string
+	RevisionHash     string
+	StandardWorkload *unstructured.Unstructured
+	Traits           []*unstructured.Unstructured
+	Scopes           []*corev1.ObjectReference
+
+	// PackagedWorkloadResources contain all the workload related resources. It could be a Helm
+	// Release, Git Repo or anything that can package and run a workload.
+	PackagedWorkloadResources []*unstructured.Unstructured
+	PackagedTraitResources    map[string][]*unstructured.Unstructured
+}

apis/types/event.go

@@ -0,0 +1,55 @@
+/*
+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 types
+
+// reason for Application
+const (
+	ReasonParsed      = "Parsed"
+	ReasonRendered    = "Rendered"
+	ReasonRevisoned   = "Revisioned"
+	ReasonApplied     = "Applied"
+	ReasonHealthCheck = "HealthChecked"
+	ReasonDeployed    = "Deployed"
+	ReasonRollout     = "Rollout"
+
+	ReasonFailedParse       = "FailedParse"
+	ReasonFailedRender      = "FailedRender"
+	ReasonFailedRevision    = "FailedRevision"
+	ReasonFailedWorkflow    = "FailedWorkflow"
+	ReasonFailedApply       = "FailedApply"
+	ReasonFailedHealthCheck = "FailedHealthCheck"
+	ReasonFailedGC          = "FailedGC"
+	ReasonFailedRollout     = "FailedRollout"
+)
+
+// event message for Application
+const (
+	MessageParsed      = "Parsed successfully"
+	MessageRendered    = "Rendered successfully"
+	MessageRevisioned  = "Revisioned successfully"
+	MessageApplied     = "Applied successfully"
+	MessageHealthCheck = "Health checked healthy"
+	MessageDeployed    = "Deployed successfully"
+	MessageRollout     = "Rollout successfully"
+
+	MessageFailedParse       = "fail to parse application, err: %v"
+	MessageFailedRender      = "fail to render application, err: %v"
+	MessageFailedRevision    = "fail to handle application revision, err: %v"
+	MessageFailedApply       = "fail to apply component, err: %v"
+	MessageFailedHealthCheck = "fail to health check, err: %v"
+	MessageFailedGC          = "fail to garbage collection, err: %v"
+)

apis/types/types.go

@@ -29,6 +29,8 @@ const (
 	DefaultEnvName = "default"
 	// DefaultAppNamespace defines the default K8s namespace for Apps created by KubeVela
 	DefaultAppNamespace = "default"
+	// AutoDetectWorkloadDefinition defines the default workload type for ComponentDefinition which doesn't specify a workload
+	AutoDetectWorkloadDefinition = "autodetects.core.oam.dev"
 )
 
 const (
@@ -64,4 +66,6 @@ const (
 	TypeCap = "Managing Capabilities"
 	// TypeSystem defines one category
 	TypeSystem = "System"
+	// TypePlugin defines one category used in Kubectl Plugin
+	TypePlugin = "Plugin Command"
 )

apis/types/workflow.go

@@ -14,8 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fake
+package types
 
-// ChartSource is a base64-encoded, gzipped tarball of the default Helm chart(charts/vela-core).
-// Its value is initialized at build time. This whole file will be rewrite at that time, please don't change this file.
-var ChartSource string
+import (
+	corev1 "k8s.io/api/core/v1"
+)
+
+// WorkflowContext is the workflow context to pass into workflow objects.
+type WorkflowContext struct {
+	AppName           string                      `json:"appName,omitempty"`
+	AppRevision       string                      `json:"appRevision,omitempty"`
+	WorkflowIndex     int                         `json:"workflowIndex"`
+	ResourceConfigMap corev1.LocalObjectReference `json:"resourceConfigMap,omitempty"`
+}

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

@@ -313,9 +313,6 @@ spec:
                   status:
                     description: AppStatus defines the observed state of Application
                     properties:
-                      batchRollingState:
-                        description: BatchRollingState only meaningful when the Status is rolling
-                        type: string
                       components:
                         description: Components record the related Components created by Application Controller
                         items:
@@ -367,13 +364,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      currentBatch:
-                        description: The current batch the rollout is working on/blocked it starts from 0
-                        format: int32
-                        type: integer
-                      lastAppliedPodTemplateIdentifier:
-                        description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                        type: string
                       latestRevision:
                         description: LatestRevision of the application configuration it generates
                         properties:
@@ -409,17 +399,82 @@ spec:
                         - kind
                         - name
                         type: object
-                      rollingState:
-                        description: RollingState is the Rollout State
-                        type: string
-                      rolloutOriginalSize:
-                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                        format: int32
-                        type: integer
-                      rolloutTargetSize:
-                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                        format: int32
-                        type: integer
+                      rollout:
+                        description: AppRolloutStatus defines the observed state of AppRollout
+                        properties:
+                          LastSourceAppRevision:
+                            description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                            type: string
+                          batchRollingState:
+                            description: BatchRollingState only meaningful when the Status is rolling
+                            type: string
+                          conditions:
+                            description: Conditions of the resource.
+                            items:
+                              description: A Condition that may apply to a resource.
+                              properties:
+                                lastTransitionTime:
+                                  description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: A Message containing details about this condition's last transition from one status to another, if any.
+                                  type: string
+                                reason:
+                                  description: A Reason for this condition's last transition from one status to another.
+                                  type: string
+                                status:
+                                  description: Status of this condition; is it currently True, False, or Unknown?
+                                  type: string
+                                type:
+                                  description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                                  type: string
+                              required:
+                              - lastTransitionTime
+                              - reason
+                              - status
+                              - type
+                              type: object
+                            type: array
+                          currentBatch:
+                            description: The current batch the rollout is working on/blocked it starts from 0
+                            format: int32
+                            type: integer
+                          lastAppliedPodTemplateIdentifier:
+                            description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                            type: string
+                          lastTargetAppRevision:
+                            description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                            type: string
+                          rollingState:
+                            description: RollingState is the Rollout State
+                            type: string
+                          rolloutOriginalSize:
+                            description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                            format: int32
+                            type: integer
+                          rolloutTargetSize:
+                            description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                            format: int32
+                            type: integer
+                          targetGeneration:
+                            description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                            type: string
+                          upgradedReadyReplicas:
+                            description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                            format: int32
+                            type: integer
+                          upgradedReplicas:
+                            description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                            format: int32
+                            type: integer
+                        required:
+                        - currentBatch
+                        - lastTargetAppRevision
+                        - rollingState
+                        - upgradedReadyReplicas
+                        - upgradedReplicas
+                        type: object
                       services:
                         description: Services record the status of the application services
                         items:
@@ -431,6 +486,28 @@ spec:
                               type: string
                             name:
                               type: string
+                            scopes:
+                              items:
+                                description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                                properties:
+                                  apiVersion:
+                                    description: APIVersion of the referenced object.
+                                    type: string
+                                  kind:
+                                    description: Kind of the referenced object.
+                                    type: string
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  uid:
+                                    description: UID of the referenced object.
+                                    type: string
+                                required:
+                                - apiVersion
+                                - kind
+                                - name
+                                type: object
+                              type: array
                             traits:
                               items:
                                 description: ApplicationTraitStatus records the trait health status
@@ -446,6 +523,17 @@ spec:
                                 - type
                                 type: object
                               type: array
+                            workloadDefinition:
+                              description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              type: object
                           required:
                           - healthy
                           - name
@@ -454,22 +542,40 @@ spec:
                       status:
                         description: ApplicationPhase is a label for the condition of a application at the current time
                         type: string
-                      targetGeneration:
-                        description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                        type: string
-                      upgradedReadyReplicas:
-                        description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                        format: int32
-                        type: integer
-                      upgradedReplicas:
-                        description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                        format: int32
-                        type: integer
-                    required:
-                    - currentBatch
-                    - rollingState
-                    - upgradedReadyReplicas
-                    - upgradedReplicas
+                      workflow:
+                        description: Workflow record the status of workflow steps
+                        items:
+                          description: WorkflowStepStatus record the status of a workflow step
+                          properties:
+                            name:
+                              type: string
+                            phase:
+                              description: WorkflowStepPhase describes the phase of a workflow step.
+                              type: string
+                            resourceRef:
+                              description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                              properties:
+                                apiVersion:
+                                  description: APIVersion of the referenced object.
+                                  type: string
+                                kind:
+                                  description: Kind of the referenced object.
+                                  type: string
+                                name:
+                                  description: Name of the referenced object.
+                                  type: string
+                                uid:
+                                  description: UID of the referenced object.
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              - name
+                              type: object
+                            type:
+                              type: string
+                          type: object
+                        type: array
                     type: object
                 type: object
               applicationConfiguration:
@@ -593,6 +699,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for workload
@@ -659,6 +781,21 @@ spec:
                         configMapRef:
                           description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                           type: string
+                        latestRevision:
+                          description: LatestRevision of the component definition
+                          properties:
+                            name:
+                              type: string
+                            revision:
+                              format: int64
+                              type: integer
+                            revisionHash:
+                              description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                              type: string
+                          required:
+                          - name
+                          - revision
+                          type: object
                       type: object
                   type: object
                 description: ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
@@ -836,6 +973,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for trait
@@ -885,6 +1038,21 @@ spec:
                         configMapRef:
                           description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                           type: string
+                        latestRevision:
+                          description: LatestRevision of the trait definition
+                          properties:
+                            name:
+                              type: string
+                            revision:
+                              format: int64
+                              type: integer
+                            revisionHash:
+                              description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                              type: string
+                          required:
+                          - name
+                          - revision
+                          type: object
                       type: object
                   type: object
                 description: TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
@@ -1017,6 +1185,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for workload
@@ -1144,6 +1328,24 @@ spec:
                           - type
                           type: object
                         type: array
+                      policies:
+                        description: 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.
+                        items:
+                          description: AppPolicy defines a global policy for all components in the app.
+                          properties:
+                            name:
+                              description: Name is the unique name of the policy.
+                              type: string
+                            properties:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
+                            type:
+                              type: string
+                          required:
+                          - name
+                          - type
+                          type: object
+                        type: array
                       rolloutPlan:
                         description: RolloutPlan is the details on how to rollout the resources The controller simply replace the old resources with the new one if there is no rollout plan involved
                         properties:
@@ -1362,15 +1564,30 @@ spec:
                             format: int32
                             type: integer
                         type: object
+                      workflow:
+                        description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
+                        items:
+                          description: WorkflowStep defines how to execute a workflow step.
+                          properties:
+                            name:
+                              description: Name is the unique name of the workflow step.
+                              type: string
+                            properties:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
+                            type:
+                              type: string
+                          required:
+                          - name
+                          - type
+                          type: object
+                        type: array
                     required:
                     - components
                     type: object
                   status:
                     description: AppStatus defines the observed state of Application
                     properties:
-                      batchRollingState:
-                        description: BatchRollingState only meaningful when the Status is rolling
-                        type: string
                       components:
                         description: Components record the related Components created by Application Controller
                         items:
@@ -1422,13 +1639,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      currentBatch:
-                        description: The current batch the rollout is working on/blocked it starts from 0
-                        format: int32
-                        type: integer
-                      lastAppliedPodTemplateIdentifier:
-                        description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                        type: string
                       latestRevision:
                         description: LatestRevision of the application configuration it generates
                         properties:
@@ -1464,17 +1674,82 @@ spec:
                         - kind
                         - name
                         type: object
-                      rollingState:
-                        description: RollingState is the Rollout State
-                        type: string
-                      rolloutOriginalSize:
-                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                        format: int32
-                        type: integer
-                      rolloutTargetSize:
-                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                        format: int32
-                        type: integer
+                      rollout:
+                        description: AppRolloutStatus defines the observed state of AppRollout
+                        properties:
+                          LastSourceAppRevision:
+                            description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                            type: string
+                          batchRollingState:
+                            description: BatchRollingState only meaningful when the Status is rolling
+                            type: string
+                          conditions:
+                            description: Conditions of the resource.
+                            items:
+                              description: A Condition that may apply to a resource.
+                              properties:
+                                lastTransitionTime:
+                                  description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: A Message containing details about this condition's last transition from one status to another, if any.
+                                  type: string
+                                reason:
+                                  description: A Reason for this condition's last transition from one status to another.
+                                  type: string
+                                status:
+                                  description: Status of this condition; is it currently True, False, or Unknown?
+                                  type: string
+                                type:
+                                  description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                                  type: string
+                              required:
+                              - lastTransitionTime
+                              - reason
+                              - status
+                              - type
+                              type: object
+                            type: array
+                          currentBatch:
+                            description: The current batch the rollout is working on/blocked it starts from 0
+                            format: int32
+                            type: integer
+                          lastAppliedPodTemplateIdentifier:
+                            description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                            type: string
+                          lastTargetAppRevision:
+                            description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                            type: string
+                          rollingState:
+                            description: RollingState is the Rollout State
+                            type: string
+                          rolloutOriginalSize:
+                            description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                            format: int32
+                            type: integer
+                          rolloutTargetSize:
+                            description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                            format: int32
+                            type: integer
+                          targetGeneration:
+                            description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                            type: string
+                          upgradedReadyReplicas:
+                            description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                            format: int32
+                            type: integer
+                          upgradedReplicas:
+                            description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                            format: int32
+                            type: integer
+                        required:
+                        - currentBatch
+                        - lastTargetAppRevision
+                        - rollingState
+                        - upgradedReadyReplicas
+                        - upgradedReplicas
+                        type: object
                       services:
                         description: Services record the status of the application services
                         items:
@@ -1486,6 +1761,28 @@ spec:
                               type: string
                             name:
                               type: string
+                            scopes:
+                              items:
+                                description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                                properties:
+                                  apiVersion:
+                                    description: APIVersion of the referenced object.
+                                    type: string
+                                  kind:
+                                    description: Kind of the referenced object.
+                                    type: string
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  uid:
+                                    description: UID of the referenced object.
+                                    type: string
+                                required:
+                                - apiVersion
+                                - kind
+                                - name
+                                type: object
+                              type: array
                             traits:
                               items:
                                 description: ApplicationTraitStatus records the trait health status
@@ -1501,6 +1798,17 @@ spec:
                                 - type
                                 type: object
                               type: array
+                            workloadDefinition:
+                              description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              type: object
                           required:
                           - healthy
                           - name
@@ -1509,22 +1817,40 @@ spec:
                       status:
                         description: ApplicationPhase is a label for the condition of a application at the current time
                         type: string
-                      targetGeneration:
-                        description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                        type: string
-                      upgradedReadyReplicas:
-                        description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                        format: int32
-                        type: integer
-                      upgradedReplicas:
-                        description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                        format: int32
-                        type: integer
-                    required:
-                    - currentBatch
-                    - rollingState
-                    - upgradedReadyReplicas
-                    - upgradedReplicas
+                      workflow:
+                        description: Workflow record the status of workflow steps
+                        items:
+                          description: WorkflowStepStatus record the status of a workflow step
+                          properties:
+                            name:
+                              type: string
+                            phase:
+                              description: WorkflowStepPhase describes the phase of a workflow step.
+                              type: string
+                            resourceRef:
+                              description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                              properties:
+                                apiVersion:
+                                  description: APIVersion of the referenced object.
+                                  type: string
+                                kind:
+                                  description: Kind of the referenced object.
+                                  type: string
+                                name:
+                                  description: Name of the referenced object.
+                                  type: string
+                                uid:
+                                  description: UID of the referenced object.
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              - name
+                              type: object
+                            type:
+                              type: string
+                          type: object
+                        type: array
                     type: object
                 type: object
               applicationConfiguration:
@@ -1648,6 +1974,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for workload
@@ -1714,6 +2056,21 @@ spec:
                         configMapRef:
                           description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                           type: string
+                        latestRevision:
+                          description: LatestRevision of the component definition
+                          properties:
+                            name:
+                              type: string
+                            revision:
+                              format: int64
+                              type: integer
+                            revisionHash:
+                              description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                              type: string
+                          required:
+                          - name
+                          - revision
+                          type: object
                       type: object
                   type: object
                 description: ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
@@ -1731,6 +2088,13 @@ spec:
                   - raw
                   type: object
                 type: array
+              resourcesConfigMap:
+                description: ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
+                properties:
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                    type: string
+                type: object
               scopeDefinitions:
                 additionalProperties:
                   description: 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.
@@ -1892,6 +2256,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for trait
@@ -1941,6 +2321,21 @@ spec:
                         configMapRef:
                           description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                           type: string
+                        latestRevision:
+                          description: LatestRevision of the component definition
+                          properties:
+                            name:
+                              type: string
+                            revision:
+                              format: int64
+                              type: integer
+                            revisionHash:
+                              description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                              type: string
+                          required:
+                          - name
+                          - revision
+                          type: object
                       type: object
                   type: object
                 description: TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
@@ -2073,6 +2468,22 @@ spec:
                               required:
                               - template
                               type: object
+                            terraform:
+                              description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                              properties:
+                                configuration:
+                                  description: Configuration is Terraform Configuration
+                                  type: string
+                                type:
+                                  default: hcl
+                                  description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                  enum:
+                                  - hcl
+                                  - json
+                                  type: string
+                              required:
+                              - configuration
+                              type: object
                           type: object
                         status:
                           description: Status defines the custom health policy and status message for workload

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

@@ -325,9 +325,6 @@ spec:
           status:
             description: AppStatus defines the observed state of Application
             properties:
-              batchRollingState:
-                description: BatchRollingState only meaningful when the Status is rolling
-                type: string
               components:
                 description: Components record the related Components created by Application Controller
                 items:
@@ -379,13 +376,6 @@ spec:
                   - type
                   type: object
                 type: array
-              currentBatch:
-                description: The current batch the rollout is working on/blocked it starts from 0
-                format: int32
-                type: integer
-              lastAppliedPodTemplateIdentifier:
-                description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                type: string
               latestRevision:
                 description: LatestRevision of the application configuration it generates
                 properties:
@@ -421,17 +411,82 @@ spec:
                 - kind
                 - name
                 type: object
-              rollingState:
-                description: RollingState is the Rollout State
-                type: string
-              rolloutOriginalSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              rolloutTargetSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
+              rollout:
+                description: AppRolloutStatus defines the observed state of AppRollout
+                properties:
+                  LastSourceAppRevision:
+                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                    type: string
+                  batchRollingState:
+                    description: BatchRollingState only meaningful when the Status is rolling
+                    type: string
+                  conditions:
+                    description: Conditions of the resource.
+                    items:
+                      description: A Condition that may apply to a resource.
+                      properties:
+                        lastTransitionTime:
+                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                          format: date-time
+                          type: string
+                        message:
+                          description: A Message containing details about this condition's last transition from one status to another, if any.
+                          type: string
+                        reason:
+                          description: A Reason for this condition's last transition from one status to another.
+                          type: string
+                        status:
+                          description: Status of this condition; is it currently True, False, or Unknown?
+                          type: string
+                        type:
+                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                          type: string
+                      required:
+                      - lastTransitionTime
+                      - reason
+                      - status
+                      - type
+                      type: object
+                    type: array
+                  currentBatch:
+                    description: The current batch the rollout is working on/blocked it starts from 0
+                    format: int32
+                    type: integer
+                  lastAppliedPodTemplateIdentifier:
+                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                    type: string
+                  lastTargetAppRevision:
+                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                    type: string
+                  rollingState:
+                    description: RollingState is the Rollout State
+                    type: string
+                  rolloutOriginalSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  rolloutTargetSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  targetGeneration:
+                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                    type: string
+                  upgradedReadyReplicas:
+                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                    format: int32
+                    type: integer
+                  upgradedReplicas:
+                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                    format: int32
+                    type: integer
+                required:
+                - currentBatch
+                - lastTargetAppRevision
+                - rollingState
+                - upgradedReadyReplicas
+                - upgradedReplicas
+                type: object
               services:
                 description: Services record the status of the application services
                 items:
@@ -443,6 +498,28 @@ spec:
                       type: string
                     name:
                       type: string
+                    scopes:
+                      items:
+                        description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                        properties:
+                          apiVersion:
+                            description: APIVersion of the referenced object.
+                            type: string
+                          kind:
+                            description: Kind of the referenced object.
+                            type: string
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          uid:
+                            description: UID of the referenced object.
+                            type: string
+                        required:
+                        - apiVersion
+                        - kind
+                        - name
+                        type: object
+                      type: array
                     traits:
                       items:
                         description: ApplicationTraitStatus records the trait health status
@@ -458,6 +535,17 @@ spec:
                         - type
                         type: object
                       type: array
+                    workloadDefinition:
+                      description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                      properties:
+                        apiVersion:
+                          type: string
+                        kind:
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      type: object
                   required:
                   - healthy
                   - name
@@ -466,22 +554,40 @@ spec:
               status:
                 description: ApplicationPhase is a label for the condition of a application at the current time
                 type: string
-              targetGeneration:
-                description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                type: string
-              upgradedReadyReplicas:
-                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                format: int32
-                type: integer
-              upgradedReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                format: int32
-                type: integer
-            required:
-            - currentBatch
-            - rollingState
-            - upgradedReadyReplicas
-            - upgradedReplicas
+              workflow:
+                description: Workflow record the status of workflow steps
+                items:
+                  description: WorkflowStepStatus record the status of a workflow step
+                  properties:
+                    name:
+                      type: string
+                    phase:
+                      description: WorkflowStepPhase describes the phase of a workflow step.
+                      type: string
+                    resourceRef:
+                      description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                      properties:
+                        apiVersion:
+                          description: APIVersion of the referenced object.
+                          type: string
+                        kind:
+                          description: Kind of the referenced object.
+                          type: string
+                        name:
+                          description: Name of the referenced object.
+                          type: string
+                        uid:
+                          description: UID of the referenced object.
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      - name
+                      type: object
+                    type:
+                      type: string
+                  type: object
+                type: array
             type: object
         type: object
     served: true
@@ -559,6 +665,24 @@ spec:
                   - type
                   type: object
                 type: array
+              policies:
+                description: 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.
+                items:
+                  description: AppPolicy defines a global policy for all components in the app.
+                  properties:
+                    name:
+                      description: Name is the unique name of the policy.
+                      type: string
+                    properties:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    type:
+                      type: string
+                  required:
+                  - name
+                  - type
+                  type: object
+                type: array
               rolloutPlan:
                 description: RolloutPlan is the details on how to rollout the resources The controller simply replace the old resources with the new one if there is no rollout plan involved
                 properties:
@@ -777,15 +901,30 @@ spec:
                     format: int32
                     type: integer
                 type: object
+              workflow:
+                description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
+                items:
+                  description: WorkflowStep defines how to execute a workflow step.
+                  properties:
+                    name:
+                      description: Name is the unique name of the workflow step.
+                      type: string
+                    properties:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    type:
+                      type: string
+                  required:
+                  - name
+                  - type
+                  type: object
+                type: array
             required:
             - components
             type: object
           status:
             description: AppStatus defines the observed state of Application
             properties:
-              batchRollingState:
-                description: BatchRollingState only meaningful when the Status is rolling
-                type: string
               components:
                 description: Components record the related Components created by Application Controller
                 items:
@@ -837,13 +976,6 @@ spec:
                   - type
                   type: object
                 type: array
-              currentBatch:
-                description: The current batch the rollout is working on/blocked it starts from 0
-                format: int32
-                type: integer
-              lastAppliedPodTemplateIdentifier:
-                description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                type: string
               latestRevision:
                 description: LatestRevision of the application configuration it generates
                 properties:
@@ -879,17 +1011,82 @@ spec:
                 - kind
                 - name
                 type: object
-              rollingState:
-                description: RollingState is the Rollout State
-                type: string
-              rolloutOriginalSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              rolloutTargetSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
+              rollout:
+                description: AppRolloutStatus defines the observed state of AppRollout
+                properties:
+                  LastSourceAppRevision:
+                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                    type: string
+                  batchRollingState:
+                    description: BatchRollingState only meaningful when the Status is rolling
+                    type: string
+                  conditions:
+                    description: Conditions of the resource.
+                    items:
+                      description: A Condition that may apply to a resource.
+                      properties:
+                        lastTransitionTime:
+                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                          format: date-time
+                          type: string
+                        message:
+                          description: A Message containing details about this condition's last transition from one status to another, if any.
+                          type: string
+                        reason:
+                          description: A Reason for this condition's last transition from one status to another.
+                          type: string
+                        status:
+                          description: Status of this condition; is it currently True, False, or Unknown?
+                          type: string
+                        type:
+                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                          type: string
+                      required:
+                      - lastTransitionTime
+                      - reason
+                      - status
+                      - type
+                      type: object
+                    type: array
+                  currentBatch:
+                    description: The current batch the rollout is working on/blocked it starts from 0
+                    format: int32
+                    type: integer
+                  lastAppliedPodTemplateIdentifier:
+                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                    type: string
+                  lastTargetAppRevision:
+                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
+                    type: string
+                  rollingState:
+                    description: RollingState is the Rollout State
+                    type: string
+                  rolloutOriginalSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  rolloutTargetSize:
+                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                    format: int32
+                    type: integer
+                  targetGeneration:
+                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                    type: string
+                  upgradedReadyReplicas:
+                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                    format: int32
+                    type: integer
+                  upgradedReplicas:
+                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                    format: int32
+                    type: integer
+                required:
+                - currentBatch
+                - lastTargetAppRevision
+                - rollingState
+                - upgradedReadyReplicas
+                - upgradedReplicas
+                type: object
               services:
                 description: Services record the status of the application services
                 items:
@@ -901,6 +1098,28 @@ spec:
                       type: string
                     name:
                       type: string
+                    scopes:
+                      items:
+                        description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                        properties:
+                          apiVersion:
+                            description: APIVersion of the referenced object.
+                            type: string
+                          kind:
+                            description: Kind of the referenced object.
+                            type: string
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          uid:
+                            description: UID of the referenced object.
+                            type: string
+                        required:
+                        - apiVersion
+                        - kind
+                        - name
+                        type: object
+                      type: array
                     traits:
                       items:
                         description: ApplicationTraitStatus records the trait health status
@@ -916,6 +1135,17 @@ spec:
                         - type
                         type: object
                       type: array
+                    workloadDefinition:
+                      description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                      properties:
+                        apiVersion:
+                          type: string
+                        kind:
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      type: object
                   required:
                   - healthy
                   - name
@@ -924,22 +1154,40 @@ spec:
               status:
                 description: ApplicationPhase is a label for the condition of a application at the current time
                 type: string
-              targetGeneration:
-                description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                type: string
-              upgradedReadyReplicas:
-                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                format: int32
-                type: integer
-              upgradedReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                format: int32
-                type: integer
-            required:
-            - currentBatch
-            - rollingState
-            - upgradedReadyReplicas
-            - upgradedReplicas
+              workflow:
+                description: Workflow record the status of workflow steps
+                items:
+                  description: WorkflowStepStatus record the status of a workflow step
+                  properties:
+                    name:
+                      type: string
+                    phase:
+                      description: WorkflowStepPhase describes the phase of a workflow step.
+                      type: string
+                    resourceRef:
+                      description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
+                      properties:
+                        apiVersion:
+                          description: APIVersion of the referenced object.
+                          type: string
+                        kind:
+                          description: Kind of the referenced object.
+                          type: string
+                        name:
+                          description: Name of the referenced object.
+                          type: string
+                        uid:
+                          description: UID of the referenced object.
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      - name
+                      type: object
+                    type:
+                      type: string
+                  type: object
+                type: array
             type: object
         type: object
     served: true

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

@@ -26,9 +26,6 @@ spec:
     - jsonPath: .metadata.annotations.definition\.oam\.dev/description
       name: DESCRIPTION
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -146,6 +143,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for workload
@@ -212,6 +225,21 @@ spec:
               configMapRef:
                 description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                 type: string
+              latestRevision:
+                description: LatestRevision of the component definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
             type: object
         type: object
     served: true
@@ -225,9 +253,6 @@ spec:
     - jsonPath: .metadata.annotations.definition\.oam\.dev/description
       name: DESCRIPTION
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -345,6 +370,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for workload
@@ -411,6 +452,21 @@ spec:
               configMapRef:
                 description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                 type: string
+              latestRevision:
+                description: LatestRevision of the component definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
             type: object
         type: object
     served: true

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

@@ -0,0 +1,813 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  name: definitionrevisions.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: DefinitionRevision
+    listKind: DefinitionRevisionList
+    plural: definitionrevisions
+    shortNames:
+    - comprev
+    singular: definitionrevision
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.revision
+      name: REVISION
+      type: integer
+    - jsonPath: .spec.revisionHash
+      name: HASH
+      type: string
+    - jsonPath: .spec.definitionType
+      name: TYPE
+      type: string
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: DefinitionRevision is the Schema for the DefinitionRevision API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DefinitionRevisionSpec is the spec of DefinitionRevision
+            properties:
+              componentDefinition:
+                description: ComponentDefinition records the snapshot of the created/modified ComponentDefinition
+                properties:
+                  apiVersion:
+                    description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                    type: string
+                  kind:
+                    description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  metadata:
+                    type: object
+                  spec:
+                    description: ComponentDefinitionSpec defines the desired state of ComponentDefinition
+                    properties:
+                      childResourceKinds:
+                        description: ChildResourceKinds are the list of GVK of the child resources this workload generates
+                        items:
+                          description: A ChildResourceKind defines a child Kubernetes resource kind with a selector
+                          properties:
+                            apiVersion:
+                              description: APIVersion of the child resource
+                              type: string
+                            kind:
+                              description: Kind of the child resource
+                              type: string
+                            selector:
+                              additionalProperties:
+                                type: string
+                              description: Selector to select the child resources that the workload wants to expose to traits
+                              type: object
+                          required:
+                          - apiVersion
+                          - kind
+                          type: object
+                        type: array
+                      extension:
+                        description: Extension is used for extension needs by OAM platform builders
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      podSpecPath:
+                        description: 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.
+                        type: string
+                      revisionLabel:
+                        description: 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).
+                        type: string
+                      schematic:
+                        description: Schematic defines the data format and template of the encapsulation of the workload
+                        properties:
+                          cue:
+                            description: CUE defines the encapsulation in CUE format
+                            properties:
+                              template:
+                                description: 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.
+                                type: string
+                            required:
+                            - template
+                            type: object
+                          helm:
+                            description: A Helm represents resources used by a Helm module
+                            properties:
+                              release:
+                                description: Release records a Helm release used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              repository:
+                                description: HelmRelease records a Helm repository used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - release
+                            - repository
+                            type: object
+                          kube:
+                            description: Kube defines the encapsulation in raw Kubernetes resource format
+                            properties:
+                              parameters:
+                                description: Parameters defines configurable parameters
+                                items:
+                                  description: A KubeParameter defines a configurable parameter of a component.
+                                  properties:
+                                    description:
+                                      description: Description of this parameter.
+                                      type: string
+                                    fieldPaths:
+                                      description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: Name of this parameter
+                                      type: string
+                                    required:
+                                      default: false
+                                      description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                                      type: boolean
+                                    type:
+                                      description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                                      enum:
+                                      - string
+                                      - number
+                                      - boolean
+                                      type: string
+                                  required:
+                                  - fieldPaths
+                                  - name
+                                  - type
+                                  type: object
+                                type: array
+                              template:
+                                description: Template defines the raw Kubernetes resource
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - template
+                            type: object
+                          terraform:
+                            description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                            properties:
+                              configuration:
+                                description: Configuration is Terraform Configuration
+                                type: string
+                              type:
+                                default: hcl
+                                description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                enum:
+                                - hcl
+                                - json
+                                type: string
+                            required:
+                            - configuration
+                            type: object
+                        type: object
+                      status:
+                        description: Status defines the custom health policy and status message for workload
+                        properties:
+                          customStatus:
+                            description: CustomStatus defines the custom status message that could display to user
+                            type: string
+                          healthPolicy:
+                            description: HealthPolicy defines the health check policy for the abstraction
+                            type: string
+                        type: object
+                      workload:
+                        description: Workload is a workload type descriptor
+                        properties:
+                          definition:
+                            description: Definition mutually exclusive to workload.type, a embedded WorkloadDefinition
+                            properties:
+                              apiVersion:
+                                type: string
+                              kind:
+                                type: string
+                            required:
+                            - apiVersion
+                            - kind
+                            type: object
+                          type:
+                            description: Type ref to a WorkloadDefinition via name
+                            type: string
+                        type: object
+                    required:
+                    - workload
+                    type: object
+                  status:
+                    description: ComponentDefinitionStatus is the status of ComponentDefinition
+                    properties:
+                      conditions:
+                        description: Conditions of the resource.
+                        items:
+                          description: A Condition that may apply to a resource.
+                          properties:
+                            lastTransitionTime:
+                              description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                              format: date-time
+                              type: string
+                            message:
+                              description: A Message containing details about this condition's last transition from one status to another, if any.
+                              type: string
+                            reason:
+                              description: A Reason for this condition's last transition from one status to another.
+                              type: string
+                            status:
+                              description: Status of this condition; is it currently True, False, or Unknown?
+                              type: string
+                            type:
+                              description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                              type: string
+                          required:
+                          - lastTransitionTime
+                          - reason
+                          - status
+                          - type
+                          type: object
+                        type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+                        type: string
+                      latestRevision:
+                        description: LatestRevision of the component definition
+                        properties:
+                          name:
+                            type: string
+                          revision:
+                            format: int64
+                            type: integer
+                          revisionHash:
+                            description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                            type: string
+                        required:
+                        - name
+                        - revision
+                        type: object
+                    type: object
+                type: object
+              definitionType:
+                description: DefinitionType
+                enum:
+                - Component
+                - Trait
+                - Policy
+                - WorkflowStep
+                type: string
+              policyDefinition:
+                description: PolicyDefinition records the snapshot of the created/modified PolicyDefinition
+                properties:
+                  apiVersion:
+                    description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                    type: string
+                  kind:
+                    description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  metadata:
+                    type: object
+                  spec:
+                    description: PolicyDefinitionSpec defines the desired state of PolicyDefinition
+                    properties:
+                      definitionRef:
+                        description: Reference to the CustomResourceDefinition that defines this trait kind.
+                        properties:
+                          name:
+                            description: Name of the referenced CustomResourceDefinition.
+                            type: string
+                          version:
+                            description: Version indicate which version should be used if CRD has multiple versions by default it will use the first one if not specified
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      schematic:
+                        description: Schematic defines the data format and template of the encapsulation of the policy definition
+                        properties:
+                          cue:
+                            description: CUE defines the encapsulation in CUE format
+                            properties:
+                              template:
+                                description: 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.
+                                type: string
+                            required:
+                            - template
+                            type: object
+                          helm:
+                            description: A Helm represents resources used by a Helm module
+                            properties:
+                              release:
+                                description: Release records a Helm release used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              repository:
+                                description: HelmRelease records a Helm repository used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - release
+                            - repository
+                            type: object
+                          kube:
+                            description: Kube defines the encapsulation in raw Kubernetes resource format
+                            properties:
+                              parameters:
+                                description: Parameters defines configurable parameters
+                                items:
+                                  description: A KubeParameter defines a configurable parameter of a component.
+                                  properties:
+                                    description:
+                                      description: Description of this parameter.
+                                      type: string
+                                    fieldPaths:
+                                      description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: Name of this parameter
+                                      type: string
+                                    required:
+                                      default: false
+                                      description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                                      type: boolean
+                                    type:
+                                      description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                                      enum:
+                                      - string
+                                      - number
+                                      - boolean
+                                      type: string
+                                  required:
+                                  - fieldPaths
+                                  - name
+                                  - type
+                                  type: object
+                                type: array
+                              template:
+                                description: Template defines the raw Kubernetes resource
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - template
+                            type: object
+                          terraform:
+                            description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                            properties:
+                              configuration:
+                                description: Configuration is Terraform Configuration
+                                type: string
+                              type:
+                                default: hcl
+                                description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                enum:
+                                - hcl
+                                - json
+                                type: string
+                            required:
+                            - configuration
+                            type: object
+                        type: object
+                    type: object
+                  status:
+                    description: PolicyDefinitionStatus is the status of PolicyDefinition
+                    properties:
+                      conditions:
+                        description: Conditions of the resource.
+                        items:
+                          description: A Condition that may apply to a resource.
+                          properties:
+                            lastTransitionTime:
+                              description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                              format: date-time
+                              type: string
+                            message:
+                              description: A Message containing details about this condition's last transition from one status to another, if any.
+                              type: string
+                            reason:
+                              description: A Reason for this condition's last transition from one status to another.
+                              type: string
+                            status:
+                              description: Status of this condition; is it currently True, False, or Unknown?
+                              type: string
+                            type:
+                              description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                              type: string
+                          required:
+                          - lastTransitionTime
+                          - reason
+                          - status
+                          - type
+                          type: object
+                        type: array
+                      latestRevision:
+                        description: LatestRevision of the component definition
+                        properties:
+                          name:
+                            type: string
+                          revision:
+                            format: int64
+                            type: integer
+                          revisionHash:
+                            description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                            type: string
+                        required:
+                        - name
+                        - revision
+                        type: object
+                    type: object
+                type: object
+              revision:
+                description: Revision record revision number of DefinitionRevision
+                format: int64
+                type: integer
+              revisionHash:
+                description: RevisionHash record the hash value of the spec of DefinitionRevision object.
+                type: string
+              traitDefinition:
+                description: TraitDefinition records the snapshot of the created/modified TraitDefinition
+                properties:
+                  apiVersion:
+                    description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                    type: string
+                  kind:
+                    description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  metadata:
+                    type: object
+                  spec:
+                    description: A TraitDefinitionSpec defines the desired state of a TraitDefinition.
+                    properties:
+                      appliesToWorkloads:
+                        description: 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.
+                        items:
+                          type: string
+                        type: array
+                      conflictsWith:
+                        description: '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'
+                        items:
+                          type: string
+                        type: array
+                      definitionRef:
+                        description: Reference to the CustomResourceDefinition that defines this trait kind.
+                        properties:
+                          name:
+                            description: Name of the referenced CustomResourceDefinition.
+                            type: string
+                          version:
+                            description: Version indicate which version should be used if CRD has multiple versions by default it will use the first one if not specified
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      extension:
+                        description: Extension is used for extension needs by OAM platform builders
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      podDisruptive:
+                        description: PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+                        type: boolean
+                      revisionEnabled:
+                        description: Revision indicates whether a trait is aware of component revision
+                        type: boolean
+                      schematic:
+                        description: Schematic defines the data format and template of the encapsulation of the trait
+                        properties:
+                          cue:
+                            description: CUE defines the encapsulation in CUE format
+                            properties:
+                              template:
+                                description: 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.
+                                type: string
+                            required:
+                            - template
+                            type: object
+                          helm:
+                            description: A Helm represents resources used by a Helm module
+                            properties:
+                              release:
+                                description: Release records a Helm release used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              repository:
+                                description: HelmRelease records a Helm repository used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - release
+                            - repository
+                            type: object
+                          kube:
+                            description: Kube defines the encapsulation in raw Kubernetes resource format
+                            properties:
+                              parameters:
+                                description: Parameters defines configurable parameters
+                                items:
+                                  description: A KubeParameter defines a configurable parameter of a component.
+                                  properties:
+                                    description:
+                                      description: Description of this parameter.
+                                      type: string
+                                    fieldPaths:
+                                      description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: Name of this parameter
+                                      type: string
+                                    required:
+                                      default: false
+                                      description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                                      type: boolean
+                                    type:
+                                      description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                                      enum:
+                                      - string
+                                      - number
+                                      - boolean
+                                      type: string
+                                  required:
+                                  - fieldPaths
+                                  - name
+                                  - type
+                                  type: object
+                                type: array
+                              template:
+                                description: Template defines the raw Kubernetes resource
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - template
+                            type: object
+                          terraform:
+                            description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                            properties:
+                              configuration:
+                                description: Configuration is Terraform Configuration
+                                type: string
+                              type:
+                                default: hcl
+                                description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                enum:
+                                - hcl
+                                - json
+                                type: string
+                            required:
+                            - configuration
+                            type: object
+                        type: object
+                      status:
+                        description: Status defines the custom health policy and status message for trait
+                        properties:
+                          customStatus:
+                            description: CustomStatus defines the custom status message that could display to user
+                            type: string
+                          healthPolicy:
+                            description: HealthPolicy defines the health check policy for the abstraction
+                            type: string
+                        type: object
+                      workloadRefPath:
+                        description: WorkloadRefPath indicates where/if a trait accepts a workloadRef object
+                        type: string
+                    type: object
+                  status:
+                    description: TraitDefinitionStatus is the status of TraitDefinition
+                    properties:
+                      conditions:
+                        description: Conditions of the resource.
+                        items:
+                          description: A Condition that may apply to a resource.
+                          properties:
+                            lastTransitionTime:
+                              description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                              format: date-time
+                              type: string
+                            message:
+                              description: A Message containing details about this condition's last transition from one status to another, if any.
+                              type: string
+                            reason:
+                              description: A Reason for this condition's last transition from one status to another.
+                              type: string
+                            status:
+                              description: Status of this condition; is it currently True, False, or Unknown?
+                              type: string
+                            type:
+                              description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                              type: string
+                          required:
+                          - lastTransitionTime
+                          - reason
+                          - status
+                          - type
+                          type: object
+                        type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+                        type: string
+                      latestRevision:
+                        description: LatestRevision of the component definition
+                        properties:
+                          name:
+                            type: string
+                          revision:
+                            format: int64
+                            type: integer
+                          revisionHash:
+                            description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                            type: string
+                        required:
+                        - name
+                        - revision
+                        type: object
+                    type: object
+                type: object
+              workflowStepDefinition:
+                description: WorkflowStepDefinition records the snapshot of the created/modified WorkflowStepDefinition
+                properties:
+                  apiVersion:
+                    description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                    type: string
+                  kind:
+                    description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  metadata:
+                    type: object
+                  spec:
+                    description: WorkflowStepDefinitionSpec defines the desired state of WorkflowStepDefinition
+                    properties:
+                      definitionRef:
+                        description: Reference to the CustomResourceDefinition that defines this trait kind.
+                        properties:
+                          name:
+                            description: Name of the referenced CustomResourceDefinition.
+                            type: string
+                          version:
+                            description: Version indicate which version should be used if CRD has multiple versions by default it will use the first one if not specified
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      schematic:
+                        description: Schematic defines the data format and template of the encapsulation of the workflow step definition
+                        properties:
+                          cue:
+                            description: CUE defines the encapsulation in CUE format
+                            properties:
+                              template:
+                                description: 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.
+                                type: string
+                            required:
+                            - template
+                            type: object
+                          helm:
+                            description: A Helm represents resources used by a Helm module
+                            properties:
+                              release:
+                                description: Release records a Helm release used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              repository:
+                                description: HelmRelease records a Helm repository used by a Helm module workload.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - release
+                            - repository
+                            type: object
+                          kube:
+                            description: Kube defines the encapsulation in raw Kubernetes resource format
+                            properties:
+                              parameters:
+                                description: Parameters defines configurable parameters
+                                items:
+                                  description: A KubeParameter defines a configurable parameter of a component.
+                                  properties:
+                                    description:
+                                      description: Description of this parameter.
+                                      type: string
+                                    fieldPaths:
+                                      description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: Name of this parameter
+                                      type: string
+                                    required:
+                                      default: false
+                                      description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                                      type: boolean
+                                    type:
+                                      description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                                      enum:
+                                      - string
+                                      - number
+                                      - boolean
+                                      type: string
+                                  required:
+                                  - fieldPaths
+                                  - name
+                                  - type
+                                  type: object
+                                type: array
+                              template:
+                                description: Template defines the raw Kubernetes resource
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - template
+                            type: object
+                          terraform:
+                            description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                            properties:
+                              configuration:
+                                description: Configuration is Terraform Configuration
+                                type: string
+                              type:
+                                default: hcl
+                                description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                                enum:
+                                - hcl
+                                - json
+                                type: string
+                            required:
+                            - configuration
+                            type: object
+                        type: object
+                    type: object
+                  status:
+                    description: WorkflowStepDefinitionStatus is the status of WorkflowStepDefinition
+                    properties:
+                      conditions:
+                        description: Conditions of the resource.
+                        items:
+                          description: A Condition that may apply to a resource.
+                          properties:
+                            lastTransitionTime:
+                              description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                              format: date-time
+                              type: string
+                            message:
+                              description: A Message containing details about this condition's last transition from one status to another, if any.
+                              type: string
+                            reason:
+                              description: A Reason for this condition's last transition from one status to another.
+                              type: string
+                            status:
+                              description: Status of this condition; is it currently True, False, or Unknown?
+                              type: string
+                            type:
+                              description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                              type: string
+                          required:
+                          - lastTransitionTime
+                          - reason
+                          - status
+                          - type
+                          type: object
+                        type: array
+                      latestRevision:
+                        description: LatestRevision of the component definition
+                        properties:
+                          name:
+                            type: string
+                          revision:
+                            format: int64
+                            type: integer
+                          revisionHash:
+                            description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                            type: string
+                        required:
+                        - name
+                        - revision
+                        type: object
+                    type: object
+                type: object
+            required:
+            - definitionType
+            - revision
+            - revisionHash
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -0,0 +1,195 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  name: policydefinitions.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: PolicyDefinition
+    listKind: PolicyDefinitionList
+    plural: policydefinitions
+    shortNames:
+    - policy
+    singular: policydefinition
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: PolicyDefinition is the Schema for the policydefinitions API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PolicyDefinitionSpec defines the desired state of PolicyDefinition
+            properties:
+              definitionRef:
+                description: Reference to the CustomResourceDefinition that defines this trait kind.
+                properties:
+                  name:
+                    description: Name of the referenced CustomResourceDefinition.
+                    type: string
+                  version:
+                    description: Version indicate which version should be used if CRD has multiple versions by default it will use the first one if not specified
+                    type: string
+                required:
+                - name
+                type: object
+              schematic:
+                description: Schematic defines the data format and template of the encapsulation of the policy definition
+                properties:
+                  cue:
+                    description: CUE defines the encapsulation in CUE format
+                    properties:
+                      template:
+                        description: 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.
+                        type: string
+                    required:
+                    - template
+                    type: object
+                  helm:
+                    description: A Helm represents resources used by a Helm module
+                    properties:
+                      release:
+                        description: Release records a Helm release used by a Helm module workload.
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      repository:
+                        description: HelmRelease records a Helm repository used by a Helm module workload.
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                    required:
+                    - release
+                    - repository
+                    type: object
+                  kube:
+                    description: Kube defines the encapsulation in raw Kubernetes resource format
+                    properties:
+                      parameters:
+                        description: Parameters defines configurable parameters
+                        items:
+                          description: A KubeParameter defines a configurable parameter of a component.
+                          properties:
+                            description:
+                              description: Description of this parameter.
+                              type: string
+                            fieldPaths:
+                              description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: Name of this parameter
+                              type: string
+                            required:
+                              default: false
+                              description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                              type: boolean
+                            type:
+                              description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                              enum:
+                              - string
+                              - number
+                              - boolean
+                              type: string
+                          required:
+                          - fieldPaths
+                          - name
+                          - type
+                          type: object
+                        type: array
+                      template:
+                        description: Template defines the raw Kubernetes resource
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                    required:
+                    - template
+                    type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
+                type: object
+            type: object
+          status:
+            description: PolicyDefinitionStatus is the status of PolicyDefinition
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True, False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              latestRevision:
+                description: LatestRevision of the component definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -26,9 +26,6 @@ spec:
     - jsonPath: .metadata.annotations.definition\.oam\.dev/description
       name: DESCRIPTION
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -147,6 +144,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for trait
@@ -196,6 +209,21 @@ spec:
               configMapRef:
                 description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                 type: string
+              latestRevision:
+                description: LatestRevision of the trait definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
             type: object
         type: object
     served: true
@@ -209,9 +237,6 @@ spec:
     - jsonPath: .metadata.annotations.definition\.oam\.dev/description
       name: DESCRIPTION
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -330,6 +355,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for trait
@@ -379,6 +420,21 @@ spec:
               configMapRef:
                 description: ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
                 type: string
+              latestRevision:
+                description: LatestRevision of the component definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
             type: object
         type: object
     served: true

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

@@ -0,0 +1,195 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  name: workflowstepdefinitions.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: WorkflowStepDefinition
+    listKind: WorkflowStepDefinitionList
+    plural: workflowstepdefinitions
+    shortNames:
+    - workflowstep
+    singular: workflowstepdefinition
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: WorkflowStepDefinition is the Schema for the workflowstepdefinitions API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: WorkflowStepDefinitionSpec defines the desired state of WorkflowStepDefinition
+            properties:
+              definitionRef:
+                description: Reference to the CustomResourceDefinition that defines this trait kind.
+                properties:
+                  name:
+                    description: Name of the referenced CustomResourceDefinition.
+                    type: string
+                  version:
+                    description: Version indicate which version should be used if CRD has multiple versions by default it will use the first one if not specified
+                    type: string
+                required:
+                - name
+                type: object
+              schematic:
+                description: Schematic defines the data format and template of the encapsulation of the workflow step definition
+                properties:
+                  cue:
+                    description: CUE defines the encapsulation in CUE format
+                    properties:
+                      template:
+                        description: 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.
+                        type: string
+                    required:
+                    - template
+                    type: object
+                  helm:
+                    description: A Helm represents resources used by a Helm module
+                    properties:
+                      release:
+                        description: Release records a Helm release used by a Helm module workload.
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      repository:
+                        description: HelmRelease records a Helm repository used by a Helm module workload.
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                    required:
+                    - release
+                    - repository
+                    type: object
+                  kube:
+                    description: Kube defines the encapsulation in raw Kubernetes resource format
+                    properties:
+                      parameters:
+                        description: Parameters defines configurable parameters
+                        items:
+                          description: A KubeParameter defines a configurable parameter of a component.
+                          properties:
+                            description:
+                              description: Description of this parameter.
+                              type: string
+                            fieldPaths:
+                              description: "FieldPaths specifies an array of fields within this workload that will be overwritten by the value of this parameter. \tAll fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'."
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: Name of this parameter
+                              type: string
+                            required:
+                              default: false
+                              description: Required specifies whether or not a value for this parameter must be supplied when authoring an Application.
+                              type: boolean
+                            type:
+                              description: 'ValueType indicates the type of the parameter value, and only supports basic data types: string, number, boolean.'
+                              enum:
+                              - string
+                              - number
+                              - boolean
+                              type: string
+                          required:
+                          - fieldPaths
+                          - name
+                          - type
+                          type: object
+                        type: array
+                      template:
+                        description: Template defines the raw Kubernetes resource
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                    required:
+                    - template
+                    type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
+                type: object
+            type: object
+          status:
+            description: WorkflowStepDefinitionStatus is the status of WorkflowStepDefinition
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True, False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              latestRevision:
+                description: LatestRevision of the component definition
+                properties:
+                  name:
+                    type: string
+                  revision:
+                    format: int64
+                    type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
+                required:
+                - name
+                - revision
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -23,9 +23,6 @@ spec:
     - jsonPath: .spec.definitionRef.name
       name: DEFINITION-NAME
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -155,6 +152,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for workload
@@ -212,9 +225,6 @@ spec:
     - jsonPath: .metadata.annotations.definition\.oam\.dev/description
       name: DESCRIPTION
       type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -344,6 +354,22 @@ spec:
                     required:
                     - template
                     type: object
+                  terraform:
+                    description: Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
+                    properties:
+                      configuration:
+                        description: Configuration is Terraform Configuration
+                        type: string
+                      type:
+                        default: hcl
+                        description: Type specifies which Terraform configuration it is, HCL or JSON syntax
+                        enum:
+                        - hcl
+                        - json
+                        type: string
+                    required:
+                    - configuration
+                    type: object
                 type: object
               status:
                 description: Status defines the custom health policy and status message for workload

charts/vela-core/templates/admission-webhooks/mutatingWebhookConfiguration.yaml

@@ -72,7 +72,7 @@ webhooks:
     {{- if .Values.admissionWebhooks.patch.enabled  }}
     failurePolicy: Ignore
     {{- else }}
-    failurePolicy: Fails
+    failurePolicy: Fail
     {{- end }}
     name: mutating.core.oam-dev.v1alpha2.components
     sideEffects: None
@@ -99,7 +99,7 @@ webhooks:
     {{- if .Values.admissionWebhooks.patch.enabled  }}
     failurePolicy: Ignore
     {{- else }}
-    failurePolicy: Fails
+    failurePolicy: Fail
     {{- end }}
     name: mcontainerized.kb.io
     sideEffects: None
@@ -115,5 +115,30 @@ webhooks:
           - UPDATE
         resources:
           - podspecworkloads
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /mutating-core-oam-dev-v1beta1-componentdefinitions
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: Fail
+    {{- end }}
+    name: mutating.core.oam-dev.v1beta1.componentdefinitions
+    sideEffects: None
+    admissionReviewVersions:
+      - v1beta1
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1beta1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - componentdefinitions
 
 {{- end -}}

charts/vela-core/templates/admission-webhooks/validatingWebhookConfiguration.yaml

@@ -116,8 +116,6 @@ webhooks:
         resources:
           - traitdefinitions
         scope: Cluster
-    admissionReviewVersions:
-      - v1beta1
     timeoutSeconds: 5
   - clientConfig:
       caBundle: Cg==
@@ -140,5 +138,55 @@ webhooks:
           - UPDATE
         resources:
           - podspecworkloads
-
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validating-core-oam-dev-v1beta1-applications
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
+    {{- end }}
+    name: validating.core.oam.dev.v1beta1.applications
+    admissionReviewVersions:
+      - v1beta1
+    sideEffects: None
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1beta1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - applications
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validating-core-oam-dev-v1beta1-componentdefinitions
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: Fail
+    {{- end }}
+    name: validating.core.oam-dev.v1beta1.componentdefinitions
+    sideEffects: None
+    admissionReviewVersions:
+      - v1beta1
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1beta1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - componentdefinitions
+          
 {{- end -}}

charts/vela-core/templates/definitions/autodetect.yaml

@@ -0,0 +1,10 @@
+apiVersion: core.oam.dev/v1beta1
+kind: WorkloadDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "autodetects.core.oam.dev is the default workload type of ComponentDefinition"
+  name: autodetects.core.oam.dev
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  definitionRef:
+    name: autodetects.core.oam.dev

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

@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Add annotations for your Workload."
+  name: annotations
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  podDisruptive: true
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	spec: template: metadata: annotations: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        }
+        parameter: [string]: string
+        

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

@@ -0,0 +1,50 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Automatically scale the component based on CPU usage."
+  name: cpuscaler
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  schematic:
+    cue:
+      template: |
+        outputs: cpuscaler: {
+        	apiVersion: "autoscaling/v2beta2"
+        	kind:       "HorizontalPodAutoscaler"
+        	metadata: name: context.name
+        	spec: {
+        		scaleTargetRef: {
+        			apiVersion: "apps/v1"
+        			kind:       "Deployment"
+        			name:       context.name
+        		}
+        		minReplicas: parameter.min
+        		maxReplicas: parameter.max
+        		metrics: [{
+        			type: "Resource"
+        			resource: {
+        				name: "cpu"
+        				target: {
+        					type:               "Utilization"
+        					averageUtilization: parameter.cpuUtil
+        				}
+        			}
+        		}]
+        	}
+        }
+        parameter: {
+        
+        	// +usage=Specify the minimal number of replicas to which the autoscaler can scale down
+        	min: *1 | int
+        
+        	// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up
+        	max: *10 | int
+        
+        	// +usage=Specify the average cpu utilization, for example, 50 means the CPU usage is 50%
+        	cpuUtil: *50 | int
+        }
+        

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

@@ -0,0 +1,36 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Expose port to enable web traffic for your component."
+  name: expose
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: service: {
+        	apiVersion: "v1"
+        	kind:       "Service"
+        	metadata:
+        		name: context.name
+        	spec: {
+        		selector:
+        			"app.oam.dev/component": context.name
+        		ports: [
+        			for p in parameter.port {
+        				port:       p
+        				targetPort: p
+        			},
+        		]
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the exposion ports
+        	port: [...int]
+        }
+        

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

@@ -3,33 +3,32 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: "Configures K8s ingress and service to enable web traffic for your service.
-    Please use route trait in cap center for advanced usage."
+    definition.oam.dev/description: "Enable public web traffic for the component."
   name: ingress
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   status:
     customStatus: |-
-      if len(context.outputs.ingress.status.loadBalancer.ingress) > 0 {
-      	message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + context.outputs.ingress.status.loadBalancer.ingress[0].ip
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
+        message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
       }
-      if len(context.outputs.ingress.status.loadBalancer.ingress) == 0 {
-      	message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+      if len(igs) > 0 {
+        if igs[0].ip != _|_ {
+          message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+        }
+        if igs[0].ip == _|_ {
+          message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+        }
       }
     healthPolicy: |
       isHealth: len(context.outputs.service.spec.clusterIP) > 0
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
   podDisruptive: false
   schematic:
     cue:
       template: |
-        parameter: {
-        	domain: string
-        	http: [string]: int
-        }
-        
         // trait template can have multiple outputs in one trait
         outputs: service: {
         	apiVersion: "v1"
@@ -72,3 +71,11 @@ spec:
         	}
         }
         
+        parameter: {
+        	// +usage=Specify the domain you want to expose
+        	domain: string
+        
+        	// +usage=Specify the mapping relationship between the http path and the workload port
+        	http: [string]: int
+        }
+        

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

@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Add labels for your Workload."
+  name: labels
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  podDisruptive: true
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	spec: template: metadata: labels: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        }
+        parameter: [string]: string
+        

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

@@ -0,0 +1,23 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Manually scale the component."
+  name: scaler
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        patch: {
+        	spec: replicas: parameter.replicas
+        }
+        parameter: {
+        	// +usage=Specify the number of workload
+        	replicas: *1 | int
+        }
+        

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

@@ -0,0 +1,46 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Binding secrets of cloud resources to component env"
+  name: service-binding
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  schematic:
+    cue:
+      template: |
+        patch: {
+        	spec: template: spec: {
+        		// +patchKey=name
+        		containers: [{
+        			name: context.name
+        			// +patchKey=name
+        			env: [
+        				for envName, v in parameter.envMappings {
+        					name: envName
+        					valueFrom: {
+        						secretKeyRef: {
+        							name: v.secret
+        							if v["key"] != _|_ {
+        								key: v.key
+        							}
+        							if v["key"] == _|_ {
+        								key: envName
+        							}
+        						}
+        					}
+        				},
+        			]
+        		}]
+        	}
+        }
+        
+        parameter: {
+        	// +usage=The mapping of environment variables to secret
+        	envMappings: [string]: [string]: string
+        }
+        

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

@@ -0,0 +1,50 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Inject a sidecar container to the component."
+  name: sidecar
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - deployments.apps
+  podDisruptive: true
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	// +patchKey=name
+        	spec: template: spec: containers: [{
+        		name:  parameter.name
+        		image: parameter.image
+        		if parameter.cmd != _|_ {
+        			command: parameter.cmd
+        		}
+        		if parameter["volumes"] != _|_ {
+        			volumeMounts: [ for v in parameter.volumes {
+        				{
+        					mountPath: v.path
+        					name:      v.name
+        				}
+        			}]
+        		}
+        	}]
+        }
+        parameter: {
+        	// +usage=Specify the name of sidecar container
+        	name: string
+        
+        	// +usage=Specify the image of sidecar container
+        	image: string
+        
+        	// +usage=Specify the commands run in the sidecar
+        	cmd?: [...string]
+        
+        	// +usage=Specify the shared volume path
+        	volumes?: [...{
+        		name: string
+        		path: string
+        	}]
+        }
+        

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

@@ -29,12 +29,79 @@ spec:
         				if parameter["cmd"] != _|_ {
         					command: parameter.cmd
         				}
+        
+        				if parameter["env"] != _|_ {
+        					env: parameter.env
+        				}
+        
+        				if parameter["cpu"] != _|_ {
+        					resources: {
+        						limits:
+        							cpu: parameter.cpu
+        						requests:
+        							cpu: parameter.cpu
+        					}
+        				}
+        
+        				if parameter["memory"] != _|_ {
+        					resources: {
+        						limits:
+        							memory: parameter.memory
+        						requests:
+        							memory: parameter.memory
+        					}
+        				}
+        
+        				if parameter["volumes"] != _|_ {
+        					volumeMounts: [ for v in parameter.volumes {
+        						{
+        							mountPath: v.mountPath
+        							name:      v.name
+        						}}]
+        				}
         			}]
+        
+        		if parameter["volumes"] != _|_ {
+        			volumes: [ for v in parameter.volumes {
+        				{
+        					name: v.name
+        					if v.type == "pvc" {
+        						persistentVolumeClaim: {
+        							claimName: v.claimName
+        						}
+        					}
+        					if v.type == "configMap" {
+        						configMap: {
+        							defaultMode: v.defaultMode
+        							name:        v.cmName
+        							if v.items != _|_ {
+        								items: v.items
+        							}
+        						}
+        					}
+        					if v.type == "secret" {
+        						secret: {
+        							defaultMode: v.defaultMode
+        							secretName:  v.secretName
+        							if v.items != _|_ {
+        								items: v.items
+        							}
+        						}
+        					}
+        					if v.type == "emptyDir" {
+        						emptyDir: {
+        							medium: v.medium
+        						}
+        					}
+        				}}]
         		}
+        
         	}
         }
+        }
+        
         parameter: {
-        	// +usage=specify number of tasks to run in parallel
+        	// +usage=Specify number of tasks to run in parallel
         	// +short=c
         	count: *1 | int
         
@@ -47,5 +114,109 @@ spec:
         
         	// +usage=Commands to run in the container
         	cmd?: [...string]
+        
+        	// +usage=Define arguments by using environment variables
+        	env?: [...{
+        		// +usage=Environment variable name
+        		name: string
+        		// +usage=The value of the environment variable
+        		value?: string
+        		// +usage=Specifies a source the value of this var should come from
+        		valueFrom?: {
+        			// +usage=Selects a key of a secret in the pod's namespace
+        			secretKeyRef: {
+        				// +usage=The name of the secret in the pod's namespace to select from
+        				name: string
+        				// +usage=The key of the secret to select from. Must be a valid secret key
+        				key: string
+        			}
+        		}
+        	}]
+        
+        	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
+        	cpu?: string
+        
+        	// +usage=Specifies the attributes of the memory resource required for the container.
+        	memory?: string
+        
+        	// +usage=Declare volumes and volumeMounts
+        	volumes?: [...{
+        		name:      string
+        		mountPath: string
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		if type == "pvc" {
+        			claimName: string
+        		}
+        		if type == "configMap" {
+        			defaultMode: *420 | int
+        			cmName:      string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "secret" {
+        			defaultMode: *420 | int
+        			secretName:  string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "emptyDir" {
+        			medium: *"" | "Memory"
+        		}
+        	}]
+        
+        	// +usage=Instructions for assessing whether the container is alive.
+        	livenessProbe?: #HealthProbe
+        
+        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
+        	readinessProbe?: #HealthProbe
+        }
+        
+        #HealthProbe: {
+        
+        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
+        	exec?: {
+        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
+        		command: [...string]
+        	}
+        
+        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
+        	httpGet?: {
+        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
+        		path: string
+        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
+        		port: int
+        		httpHeaders?: [...{
+        			name:  string
+        			value: string
+        		}]
+        	}
+        
+        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
+        	tcpSocket?: {
+        		// +usage=The TCP socket within the container that should be probed to assess container health.
+        		port: int
+        	}
+        
+        	// +usage=Number of seconds after the container is started before the first probe is initiated.
+        	initialDelaySeconds: *0 | int
+        
+        	// +usage=How often, in seconds, to execute the probe.
+        	periodSeconds: *10 | int
+        
+        	// +usage=Number of seconds after which the probe times out.
+        	timeoutSeconds: *1 | int
+        
+        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
+        	successThreshold: *1 | int
+        
+        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
+        	failureThreshold: *3 | int
         }
         

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

@@ -37,6 +37,9 @@ spec:
         				containers: [{
         					name:  context.name
         					image: parameter.image
+        					ports: [{
+        						containerPort: parameter.port
+        					}]
         
         					if parameter["cmd"] != _|_ {
         						command: parameter.cmd
@@ -50,10 +53,6 @@ spec:
         						env: context.config
         					}
         
-        					ports: [{
-        						containerPort: parameter.port
-        					}]
-        
         					if parameter["cpu"] != _|_ {
         						resources: {
         							limits:
@@ -62,22 +61,88 @@ spec:
         								cpu: parameter.cpu
         						}
         					}
+        
+        					if parameter["memory"] != _|_ {
+        						resources: {
+        							limits:
+        								memory: parameter.memory
+        							requests:
+        								memory: parameter.memory
+        						}
+        					}
+        
+        					if parameter["volumes"] != _|_ {
+        						volumeMounts: [ for v in parameter.volumes {
+        							{
+        								mountPath: v.mountPath
+        								name:      v.name
+        							}}]
+        					}
+        
+        					if parameter["livenessProbe"] != _|_ {
+        						livenessProbe: parameter.livenessProbe
+        					}
+        
+        					if parameter["readinessProbe"] != _|_ {
+        						readinessProbe: parameter.readinessProbe
+        					}
+        
         				}]
-        		}
+        
+        			if parameter["volumes"] != _|_ {
+        				volumes: [ for v in parameter.volumes {
+        					{
+        						name: v.name
+        						if v.type == "pvc" {
+        							persistentVolumeClaim: {
+        								claimName: v.claimName
+        							}
+        						}
+        						if v.type == "configMap" {
+        							configMap: {
+        								defaultMode: v.defaultMode
+        								name:        v.cmName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "secret" {
+        							secret: {
+        								defaultMode: v.defaultMode
+        								secretName:  v.secretName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "emptyDir" {
+        							emptyDir: {
+        								medium: v.medium
+        							}
+        						}
+        					}}]
+        			}
         		}
         	}
         }
+        }
         parameter: {
         	// +usage=Which image would you like to use for your service
         	// +short=i
         	image: string
         
-        	// +usage=Commands to run in the container
-        	cmd?: [...string]
-        
         	// +usage=Which port do you want customer traffic sent to
         	// +short=p
         	port: *80 | int
+        
+        	// +ignore
+        	// +usage=If addRevisionLabel is true, the appRevision label will be added to the underlying pods
+        	addRevisionLabel: *false | bool
+        
+        	// +usage=Commands to run in the container
+        	cmd?: [...string]
+        
         	// +usage=Define arguments by using environment variables
         	env?: [...{
         		// +usage=Environment variable name
@@ -95,10 +160,91 @@ spec:
         			}
         		}
         	}]
+        
         	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
         	cpu?: string
         
-        	// If addRevisionLabel is true, the appRevision label will be added to the underlying pods 
-        	addRevisionLabel: *false | bool
+        	// +usage=Specifies the attributes of the memory resource required for the container.
+        	memory?: string
+        
+        	// +usage=Declare volumes and volumeMounts
+        	volumes?: [...{
+        		name:      string
+        		mountPath: string
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		if type == "pvc" {
+        			claimName: string
+        		}
+        		if type == "configMap" {
+        			defaultMode: *420 | int
+        			cmName:      string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "secret" {
+        			defaultMode: *420 | int
+        			secretName:  string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "emptyDir" {
+        			medium: *"" | "Memory"
+        		}
+        	}]
+        
+        	// +usage=Instructions for assessing whether the container is alive.
+        	livenessProbe?: #HealthProbe
+        
+        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
+        	readinessProbe?: #HealthProbe
+        }
+        
+        #HealthProbe: {
+        
+        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
+        	exec?: {
+        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
+        		command: [...string]
+        	}
+        
+        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
+        	httpGet?: {
+        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
+        		path: string
+        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
+        		port: int
+        		httpHeaders?: [...{
+        			name:  string
+        			value: string
+        		}]
+        	}
+        
+        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
+        	tcpSocket?: {
+        		// +usage=The TCP socket within the container that should be probed to assess container health.
+        		port: int
+        	}
+        
+        	// +usage=Number of seconds after the container is started before the first probe is initiated.
+        	initialDelaySeconds: *0 | int
+        
+        	// +usage=How often, in seconds, to execute the probe.
+        	periodSeconds: *10 | int
+        
+        	// +usage=Number of seconds after which the probe times out.
+        	timeoutSeconds: *1 | int
+        
+        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
+        	successThreshold: *1 | int
+        
+        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
+        	failureThreshold: *3 | int
         }
         

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

@@ -35,17 +35,196 @@ spec:
         					if parameter["cmd"] != _|_ {
         						command: parameter.cmd
         					}
+        
+        					if parameter["env"] != _|_ {
+        						env: parameter.env
+        					}
+        
+        					if parameter["cpu"] != _|_ {
+        						resources: {
+        							limits:
+        								cpu: parameter.cpu
+        							requests:
+        								cpu: parameter.cpu
+        						}
+        					}
+        
+        					if parameter["memory"] != _|_ {
+        						resources: {
+        							limits:
+        								memory: parameter.memory
+        							requests:
+        								memory: parameter.memory
+        						}
+        					}
+        
+        					if parameter["volumes"] != _|_ {
+        						volumeMounts: [ for v in parameter.volumes {
+        							{
+        								mountPath: v.mountPath
+        								name:      v.name
+        							}}]
+        					}
+        
+        					if parameter["livenessProbe"] != _|_ {
+        						livenessProbe: parameter.livenessProbe
+        					}
+        
+        					if parameter["readinessProbe"] != _|_ {
+        						readinessProbe: parameter.readinessProbe
+        					}
+        
         				}]
+        
+        			if parameter["volumes"] != _|_ {
+        				volumes: [ for v in parameter.volumes {
+        					{
+        						name: v.name
+        						if v.type == "pvc" {
+        							persistentVolumeClaim: {
+        								claimName: v.claimName
+        							}
+        						}
+        						if v.type == "configMap" {
+        							configMap: {
+        								defaultMode: v.defaultMode
+        								name:        v.cmName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "secret" {
+        							secret: {
+        								defaultMode: v.defaultMode
+        								secretName:  v.secretName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "emptyDir" {
+        							emptyDir: {
+        								medium: v.medium
+        							}
+        						}
+        					}}]
         			}
         		}
         	}
         }
+        }
         
         parameter: {
         	// +usage=Which image would you like to use for your service
         	// +short=i
         	image: string
+        
         	// +usage=Commands to run in the container
         	cmd?: [...string]
+        
+        	// +usage=Define arguments by using environment variables
+        	env?: [...{
+        		// +usage=Environment variable name
+        		name: string
+        		// +usage=The value of the environment variable
+        		value?: string
+        		// +usage=Specifies a source the value of this var should come from
+        		valueFrom?: {
+        			// +usage=Selects a key of a secret in the pod's namespace
+        			secretKeyRef: {
+        				// +usage=The name of the secret in the pod's namespace to select from
+        				name: string
+        				// +usage=The key of the secret to select from. Must be a valid secret key
+        				key: string
+        			}
+        		}
+        	}]
+        
+        	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
+        	cpu?: string
+        
+        	// +usage=Specifies the attributes of the memory resource required for the container.
+        	memory?: string
+        
+        	// +usage=Declare volumes and volumeMounts
+        	volumes?: [...{
+        		name:      string
+        		mountPath: string
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		if type == "pvc" {
+        			claimName: string
+        		}
+        		if type == "configMap" {
+        			defaultMode: *420 | int
+        			cmName:      string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "secret" {
+        			defaultMode: *420 | int
+        			secretName:  string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "emptyDir" {
+        			medium: *"" | "Memory"
+        		}
+        	}]
+        
+        	// +usage=Instructions for assessing whether the container is alive.
+        	livenessProbe?: #HealthProbe
+        
+        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
+        	readinessProbe?: #HealthProbe
+        }
+        
+        #HealthProbe: {
+        
+        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
+        	exec?: {
+        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
+        		command: [...string]
+        	}
+        
+        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
+        	httpGet?: {
+        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
+        		path: string
+        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
+        		port: int
+        		httpHeaders?: [...{
+        			name:  string
+        			value: string
+        		}]
+        	}
+        
+        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
+        	tcpSocket?: {
+        		// +usage=The TCP socket within the container that should be probed to assess container health.
+        		port: int
+        	}
+        
+        	// +usage=Number of seconds after the container is started before the first probe is initiated.
+        	initialDelaySeconds: *0 | int
+        
+        	// +usage=How often, in seconds, to execute the probe.
+        	periodSeconds: *10 | int
+        
+        	// +usage=Number of seconds after which the probe times out.
+        	timeoutSeconds: *1 | int
+        
+        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
+        	successThreshold: *1 | int
+        
+        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
+        	failureThreshold: *3 | int
         }
         

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

@@ -107,10 +107,18 @@ spec:
           args:
             - "--metrics-addr=:8080"
             - "--enable-leader-election"
+            {{ if ne .Values.logFilePath "" }}
+            - "--log-file-path={{ .Values.logFilePath }}"
+            - "--log-file-max-size={{ .Values.logFileMaxSize }}"
+            {{ end }}
+            {{ if .Values.logDebug }}
+            - "--log-debug=true"
+            {{ end }}
             {{ if .Values.admissionWebhooks.enabled }}
             - "--use-webhook=true"
             - "--webhook-port={{ .Values.webhookService.port }}"
             - "--webhook-cert-dir={{ .Values.admissionWebhooks.certificate.mountPath }}"
+            - "--autogen-workload-definition={{ .Values.admissionWebhooks.autoGenWorkloadDefinition }}"
             {{ end }}
             {{ if not .Values.useAppConfig }}
             - "--app-config-installed=false"
@@ -121,6 +129,8 @@ spec:
             - "--disable-caps={{ .Values.disableCaps }}"
             {{ end }}
             - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
+            - "--application-revision-limit={{ .Values.applicationRevisionLimit }}"
+            - "--definition-revision-limit={{ .Values.definitionRevisionLimit }}"
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
@@ -168,4 +178,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
     {{- toYaml . | nindent 8 }}
-  {{- end }}
+  {{- end }}

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

@@ -0,0 +1,62 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  annotations:
+    helm.sh/hook: test-success
+    helm.sh/hook-delete-policy: hook-succeeded
+  name: helm-test-vela-app
+spec:
+  components:
+    - name: helm-test-express-server
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+        port: 8000
+      traits:
+        - type: ingress
+          properties:
+            domain: testsvc.example.com
+            http:
+              "/": 8000
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-application-test"
+  annotations:
+    "helm.sh/hook": test
+    helm.sh/hook-delete-policy: hook-succeeded
+spec:
+  serviceAccountName: kubevela-vela-core
+  containers:
+    - name: {{ .Release.Name }}-application-test
+      image: alpine/k8s:1.18.2
+      imagePullPolicy: IfNotPresent
+      command:
+        - /bin/bash
+        - -ec
+        - |
+
+          set -e
+
+          echo "Waiting application is ready..."
+
+          echo "waiting for application being Applied"
+          kubectl -n vela-system wait --for=condition=Applied application helm-test-vela-app --timeout=3m
+          echo "application being Applied"
+
+          # wait for deploy being created
+          echo "waiting for deployment being available"
+          kubectl -n vela-system wait --for=condition=available deploy helm-test-express-server --timeout 3m
+          echo "deployment being available"
+
+          # wait for ingress being created
+          while ! [ `kubectl -n vela-system get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
+            echo "waiting for ingress being created"
+            sleep 1
+          done
+
+
+
+          echo "Application and its components are created"
+  restartPolicy: Never

charts/vela-core/values.yaml

@@ -77,6 +77,27 @@ admissionWebhooks:
     tolerations: []
   certManager:
     enabled: false
+  # If autoGenWorkloadDefinition is true, webhook will auto generated workloadDefinition which componentDefinition refers to
+  autoGenWorkloadDefinition: true
 
+#Enable debug logs for development purpose
+logDebug: false
+
+#If non-empty, write log files in this path
+logFilePath: ""
+
+#Defines the maximum size a log file can grow to. Unit is megabytes.
+#If the value is 0, the maximum file size is unlimited.
+logFileMaxSize: 1024
 
 systemDefinitionNamespace: vela-system
+
+applicationRevisionLimit: 10
+
+definitionRevisionLimit: 20
+
+# concurrentReconciles is the concurrent reconcile number of the controller
+concurrentReconciles: 4
+
+# dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready
+dependCheckWait: 30s

cmd/core/main.go

@@ -22,28 +22,21 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"os/signal"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 
-	"github.com/crossplane/crossplane-runtime/pkg/logging"
-	injectorcontroller "github.com/oam-dev/trait-injector/controllers"
-	"github.com/oam-dev/trait-injector/pkg/injector"
-	"github.com/oam-dev/trait-injector/pkg/plugin"
-	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack.v2"
+	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	standardcontroller "github.com/oam-dev/kubevela/pkg/controller"
+	commonconfig "github.com/oam-dev/kubevela/pkg/controller/common"
 	oamcontroller "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev"
 	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
-	"github.com/oam-dev/kubevela/pkg/dsl/definition"
+	"github.com/oam-dev/kubevela/pkg/cue/packages"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
 	"github.com/oam-dev/kubevela/pkg/utils/common"
@@ -58,7 +51,6 @@ const (
 )
 
 var (
-	setupLog           = ctrl.Log.WithName(kubevelaName)
 	scheme             = common.Scheme
 	waitSecretTimeout  = 90 * time.Second
 	waitSecretInterval = 2 * time.Second
@@ -66,11 +58,11 @@ var (
 
 func main() {
 	var metricsAddr, logFilePath, leaderElectionNamespace string
-	var enableLeaderElection, logCompress, logDebug bool
-	var logRetainDate int
+	var enableLeaderElection, logDebug bool
+	var logFileMaxSize uint64
 	var certDir string
 	var webhookPort int
-	var useWebhook, useTraitInjector bool
+	var useWebhook bool
 	var controllerArgs oamcontroller.Args
 	var healthAddr string
 	var disableCaps string
@@ -79,7 +71,6 @@ func main() {
 	var applyOnceOnly string
 
 	flag.BoolVar(&useWebhook, "use-webhook", false, "Enable Admission Webhook")
-	flag.BoolVar(&useTraitInjector, "use-trait-injector", false, "Enable TraitInjector")
 	flag.StringVar(&certDir, "webhook-cert-dir", "/k8s-webhook-server/serving-certs", "Admission webhook cert/key dir.")
 	flag.IntVar(&webhookPort, "webhook-port", 9443, "admission webhook listen address")
 	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
@@ -88,15 +79,19 @@ func main() {
 	flag.StringVar(&leaderElectionNamespace, "leader-election-namespace", "",
 		"Determines the namespace in which the leader election configmap will be created.")
 	flag.StringVar(&logFilePath, "log-file-path", "", "The file to write logs to.")
-	flag.IntVar(&logRetainDate, "log-retain-date", 7, "The number of days of logs history to retain.")
-	flag.BoolVar(&logCompress, "log-compress", true, "Enable compression on the rotated logs.")
+	flag.Uint64Var(&logFileMaxSize, "log-file-max-size", 1024, "Defines the maximum size a log file can grow to, Unit is megabytes.")
 	flag.BoolVar(&logDebug, "log-debug", false, "Enable debug logs for development purpose")
 	flag.IntVar(&controllerArgs.RevisionLimit, "revision-limit", 50,
 		"RevisionLimit is the maximum number of revisions that will be maintained. The default value is 50.")
+	flag.IntVar(&controllerArgs.AppRevisionLimit, "application-revision-limit", 10,
+		"application-revision-limit is the maximum number of application useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 10.")
+	flag.IntVar(&controllerArgs.DefRevisionLimit, "definition-revision-limit", 20,
+		"definition-revision-limit is the maximum number of component/trait definition useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 20.")
 	flag.StringVar(&controllerArgs.CustomRevisionHookURL, "custom-revision-hook-url", "",
 		"custom-revision-hook-url is a webhook url which will let KubeVela core to call with applicationConfiguration and component info and return a customized component revision")
 	flag.BoolVar(&controllerArgs.ApplicationConfigurationInstalled, "app-config-installed", true,
 		"app-config-installed indicates if applicationConfiguration CRD is installed")
+	flag.BoolVar(&controllerArgs.AutoGenWorkloadDefinition, "autogen-workload-definition", true, "Automatic generated workloadDefinition which componentDefinition refers to.")
 	flag.StringVar(&healthAddr, "health-addr", ":9440", "The address the health endpoint binds to.")
 	flag.StringVar(&applyOnceOnly, "apply-once-only", "false",
 		"For the purpose of some production environment that workload or trait should not be affected if no spec change, available options: on, off, force.")
@@ -105,29 +100,26 @@ func main() {
 	flag.DurationVar(&syncPeriod, "informer-re-sync-interval", 60*time.Minute,
 		"controller shared informer lister full re-sync period")
 	flag.StringVar(&oam.SystemDefinitonNamespace, "system-definition-namespace", "vela-system", "define the namespace of the system-level definition")
-	flag.Parse()
+	flag.IntVar(&controllerArgs.ConcurrentReconciles, "concurrent-reconciles", 4, "concurrent-reconciles is the concurrent reconcile number of the controller. The default value is 4")
+	flag.DurationVar(&controllerArgs.DependCheckWait, "depend-check-wait", 30*time.Second, "depend-check-wait is the time to wait for ApplicationConfiguration's dependent-resource ready."+
+		"The default value is 30s, which means if dependent resources were not prepared, the ApplicationConfiguration would be reconciled after 30s.")
 
+	flag.Parse()
 	// setup logging
-	var w io.Writer
-	if len(logFilePath) > 0 {
-		w = zapcore.AddSync(&lumberjack.Logger{
-			Filename: logFilePath,
-			MaxAge:   logRetainDate, // days
-			Compress: logCompress,
-		})
-	} else {
-		w = os.Stdout
+	klog.InitFlags(nil)
+	if logDebug {
+		_ = flag.Set("v", strconv.Itoa(int(commonconfig.LogDebug)))
 	}
 
-	logger := zap.New(func(o *zap.Options) {
-		o.Development = logDebug
-		o.DestWritter = w
-	})
-	ctrl.SetLogger(logger)
+	if logFilePath != "" {
+		_ = flag.Set("logtostderr", "false")
+		_ = flag.Set("log_file", logFilePath)
+		_ = flag.Set("log_file_max_size", strconv.FormatUint(logFileMaxSize, 10))
+	}
 
-	setupLog.Info(fmt.Sprintf("KubeVela Version: %s, GIT Revision: %s.", version.VelaVersion, version.GitRevision))
-	setupLog.Info(fmt.Sprintf("Disable Capabilities: %s.", disableCaps))
-	setupLog.Info(fmt.Sprintf("core init with definition namespace %s", oam.SystemDefinitonNamespace))
+	klog.InfoS("KubeVela information", "version", version.VelaVersion, "revision", version.GitRevision)
+	klog.InfoS("Disable capabilities", "name", disableCaps)
+	klog.InfoS("Vela-Core init", "definition namespace", oam.SystemDefinitonNamespace)
 
 	restConfig := ctrl.GetConfigOrDie()
 	restConfig.UserAgent = kubevelaName + "/" + version.GitRevision
@@ -144,109 +136,96 @@ func main() {
 		SyncPeriod:              &syncPeriod,
 	})
 	if err != nil {
-		setupLog.Error(err, "unable to create a controller manager")
+		klog.ErrorS(err, "Unable to create a controller manager")
 		os.Exit(1)
 	}
 
 	if err := registerHealthChecks(mgr); err != nil {
-		setupLog.Error(err, "unable to register ready/health checks")
+		klog.ErrorS(err, "Unable to register ready/health checks")
 		os.Exit(1)
 	}
 
 	if err := utils.CheckDisabledCapabilities(disableCaps); err != nil {
-		setupLog.Error(err, "unable to get enabled capabilities")
+		klog.ErrorS(err, "Unable to get enabled capabilities")
 		os.Exit(1)
 	}
 
 	switch strings.ToLower(applyOnceOnly) {
 	case "", "false", string(oamcontroller.ApplyOnceOnlyOff):
 		controllerArgs.ApplyMode = oamcontroller.ApplyOnceOnlyOff
-		setupLog.Info("ApplyOnceOnly is disabled")
+		klog.Info("ApplyOnceOnly is disabled")
 	case "true", string(oamcontroller.ApplyOnceOnlyOn):
 		controllerArgs.ApplyMode = oamcontroller.ApplyOnceOnlyOn
-		setupLog.Info("ApplyOnceOnly is enabled, that means workload or trait only apply once if no spec change even they are changed by others")
+		klog.Info("ApplyOnceOnly is enabled, that means workload or trait only apply once if no spec change even they are changed by others")
 	case string(oamcontroller.ApplyOnceOnlyForce):
 		controllerArgs.ApplyMode = oamcontroller.ApplyOnceOnlyForce
-		setupLog.Info("ApplyOnceOnlyForce is enabled, that means workload or trait only apply once if no spec change even they are changed or deleted by others")
+		klog.Info("ApplyOnceOnlyForce is enabled, that means workload or trait only apply once if no spec change even they are changed or deleted by others")
 	default:
-		setupLog.Error(fmt.Errorf("invalid apply-once-only value: %s", applyOnceOnly),
-			"unable to setup the vela core controller",
-			"valid apply-once-only value:", "on/off/force, by default it's off")
+		klog.ErrorS(fmt.Errorf("invalid apply-once-only value: %s", applyOnceOnly),
+			"Unable to setup the vela core controller",
+			"apply-once-only", "on/off/force, by default it's off")
 		os.Exit(1)
 	}
 
 	dm, err := discoverymapper.New(mgr.GetConfig())
 	if err != nil {
-		setupLog.Error(err, "failed to create CRD discovery client")
+		klog.ErrorS(err, "Failed to create CRD discovery client")
 		os.Exit(1)
 	}
 	controllerArgs.DiscoveryMapper = dm
-	pd, err := definition.NewPackageDiscover(mgr.GetConfig())
+	pd, err := packages.NewPackageDiscover(mgr.GetConfig())
 	if err != nil {
-		setupLog.Error(err, "failed to create CRD discovery for CUE package client")
-		os.Exit(1)
+		klog.Error(err, "Failed to create CRD discovery for CUE package client")
+		if !packages.IsCUEParseErr(err) {
+			os.Exit(1)
+		}
 	}
 	controllerArgs.PackageDiscover = pd
 
 	if useWebhook {
-		setupLog.Info("vela webhook enabled, will serving at :" + strconv.Itoa(webhookPort))
+		klog.InfoS("Enable webhook", "server port", strconv.Itoa(webhookPort))
 		oamwebhook.Register(mgr, controllerArgs)
 		velawebhook.Register(mgr, disableCaps)
 		if err := waitWebhookSecretVolume(certDir, waitSecretTimeout, waitSecretInterval); err != nil {
-			setupLog.Error(err, "unable to get webhook secret")
+			klog.ErrorS(err, "Unable to get webhook secret")
 			os.Exit(1)
 		}
 	}
 
-	if err = oamv1alpha2.Setup(mgr, controllerArgs, logging.NewLogrLogger(setupLog)); err != nil {
-		setupLog.Error(err, "unable to setup the oam core controller")
+	if err = oamv1alpha2.Setup(mgr, controllerArgs); err != nil {
+		klog.ErrorS(err, "Unable to setup the oam core controller")
 		os.Exit(1)
 	}
 
 	if err = standardcontroller.Setup(mgr, disableCaps); err != nil {
-		setupLog.Error(err, "unable to setup the vela core controller")
+		klog.ErrorS(err, "Unable to setup the vela core controller")
 		os.Exit(1)
 	}
 	if driver := os.Getenv(system.StorageDriverEnv); len(driver) == 0 {
 		// first use system environment,
 		err := os.Setenv(system.StorageDriverEnv, storageDriver)
 		if err != nil {
-			setupLog.Error(err, "unable to setup the vela core controller")
+			klog.ErrorS(err, "Unable to setup the vela core controller")
 			os.Exit(1)
 		}
 	}
-	setupLog.Info("use storage driver", "storageDriver", os.Getenv(system.StorageDriverEnv))
+	klog.InfoS("Use storage driver", "storageDriver", os.Getenv(system.StorageDriverEnv))
 
-	if useTraitInjector {
-		// register all service injectors
-		plugin.RegisterTargetInjectors(injector.Defaults()...)
+	klog.Info("Start the vela controller manager")
 
-		tiWebhook := &injectorcontroller.ServiceBindingReconciler{
-			Client:   mgr.GetClient(),
-			Log:      ctrl.Log.WithName("controllers").WithName("ServiceBinding"),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("servicebinding"),
-		}
-		if err = (tiWebhook).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "ServiceBinding")
-			os.Exit(1)
-		}
-		// this has hard coded requirement "./ssl/service-injector.pem", "./ssl/service-injector.key"
-		go tiWebhook.ServeAdmission()
-	}
-
-	setupLog.Info("starting the vela controller manager")
-
-	if err := mgr.Start(makeSignalHandler()); err != nil {
-		setupLog.Error(err, "problem running manager")
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		klog.ErrorS(err, "Failed to run manager")
 		os.Exit(1)
 	}
-	setupLog.Info("program safely stops...")
+	if logFilePath != "" {
+		klog.Flush()
+	}
+	klog.Info("Safely stops Program...")
 }
 
 // registerHealthChecks is used to create readiness&liveness probes
 func registerHealthChecks(mgr ctrl.Manager) error {
-	setupLog.Info("creating readiness/health check")
+	klog.Info("Create readiness/health check")
 	if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
 		return err
 	}
@@ -265,8 +244,8 @@ func waitWebhookSecretVolume(certDir string, timeout, interval time.Duration) er
 		if time.Since(start) > timeout {
 			return fmt.Errorf("getting webhook secret timeout after %s", timeout.String())
 		}
-		setupLog.Info(fmt.Sprintf("waiting webhook secret, time consumed: %d/%d seconds ...",
-			int64(time.Since(start).Seconds()), int64(timeout.Seconds())))
+		klog.InfoS("Wait webhook secret", "time consumed(second)", int64(time.Since(start).Seconds()),
+			"timeout(second)", int64(timeout.Seconds()))
 		if _, err := os.Stat(certDir); !os.IsNotExist(err) {
 			ready := func() bool {
 				f, err := os.Open(filepath.Clean(certDir))
@@ -288,8 +267,8 @@ func waitWebhookSecretVolume(certDir string, timeout, interval time.Duration) er
 					return nil
 				})
 				if err == nil {
-					setupLog.Info(fmt.Sprintf("webhook secret is ready (time consumed: %d seconds)",
-						int64(time.Since(start).Seconds())))
+					klog.InfoS("Webhook secret is ready", "time consumed(second)",
+						int64(time.Since(start).Seconds()))
 					return true
 				}
 				return false
@@ -300,21 +279,3 @@ func waitWebhookSecretVolume(certDir string, timeout, interval time.Duration) er
 		}
 	}
 }
-
-func makeSignalHandler() (stopCh <-chan struct{}) {
-	stop := make(chan struct{})
-	c := make(chan os.Signal, 2)
-
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-
-	go func() {
-		<-c
-		close(stop)
-
-		// second signal. Exit directly.
-		<-c
-		os.Exit(1)
-	}()
-
-	return stop
-}

cmd/core/main_e2e_test.go

@@ -0,0 +1,64 @@
+/*
+Copyright 2021 The KubeVela Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"strings"
+	"syscall"
+	"testing"
+)
+
+func TestE2EMain(t *testing.T) {
+	fmt.Println("this is e2e test")
+	var (
+		args []string
+		run  bool
+	)
+
+	for _, arg := range os.Args {
+		switch {
+		case strings.HasPrefix(arg, "__DEVEL__E2E"):
+			run = true
+		case strings.HasPrefix(arg, "-test"):
+		default:
+			args = append(args, arg)
+		}
+	}
+
+	if !run {
+		return
+	}
+
+	waitCh := make(chan int, 1)
+
+	//args=append(args, "leader-election-namespace='someNS'")
+	os.Args = args
+	go func() {
+		main()
+		close(waitCh)
+	}()
+
+	signalCh := make(chan os.Signal, 1)
+	signal.Notify(signalCh, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGHUP)
+	select {
+	case <-signalCh:
+	case <-waitCh:
+	}
+	fmt.Println("exit test e2e main")
+}

cmd/plugin/main.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 main
+
+import (
+	"math/rand"
+	"os"
+	"time"
+
+	"github.com/oam-dev/kubevela/pkg/plugin/cli"
+)
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	command := cli.NewCommand()
+
+	if err := command.Execute(); err != nil {
+		os.Exit(1)
+	}
+}

codecov.yml

@@ -2,5 +2,7 @@ coverage:
   status:
     project:
       default:
-        threshold: 0.5%
-    patch: off
+        threshold: 0.1%
+    patch:
+      default:
+        target: 70%

contribute/README.md

@@ -0,0 +1,8 @@
+# Contribute
+
+This directory contains guides for contributors to the KubeVela project.
+
+* [Create a pull request](./create-pull-request.md)
+* [Developer guide](./developer-guide.md)
+* [Triage issues](./triage-issues.md)
+* [Code conventions](./coding-conventions.md)

contribute/coding-conventions.md

@@ -0,0 +1,162 @@
+# KubeVela code conventions
+
+- Bash
+
+  - https://google.github.io/styleguide/shell.xml
+
+  - Ensure that build, release, test, and cluster-management scripts run on
+    macOS
+
+- Go
+
+  - [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
+
+  - [Effective Go](https://golang.org/doc/effective_go.html)
+
+  - Know and avoid [Go landmines](https://gist.github.com/lavalamp/4bd23295a9f32706a48f)
+
+  - Comment your code.
+    - [Go's commenting conventions](http://blog.golang.org/godoc-documenting-go-code)
+    - If reviewers ask questions about why the code is the way it is, that's a
+      sign that comments might be helpful.
+
+  - Command-line flags should use dashes, not underscores
+
+  - Naming
+    - Please consider package name when selecting an interface name, and avoid
+      redundancy.
+
+      - e.g.: `storage.Interface` is better than `storage.StorageInterface`.
+
+    - Do not use uppercase characters, underscores, or dashes in package
+      names.
+    - Please consider parent directory name when choosing a package name.
+
+      - so pkg/controllers/autoscaler/foo.go should say `package autoscaler`
+        not `package autoscalercontroller`.
+      - Unless there's a good reason, the `package foo` line should match
+        the name of the directory in which the .go file exists.
+      - Importers can use a different name if they need to disambiguate.
+
+    - Locks should be called `lock` and should never be embedded (always `lock
+      sync.Mutex`). When multiple locks are present, give each lock a distinct name
+      following Go conventions - `stateLock`, `mapLock` etc.
+
+- KubeVela also follows the Kubernetes conventions
+
+  - [API changes](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api_changes.md)
+
+  - [API conventions](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md)
+  
+## Testing conventions
+
+- All new packages and most new significant functionality must come with unit
+  tests
+
+- Table-driven tests are preferred for testing multiple scenarios/inputs; for
+  example, see [TestNamespaceAuthorization](https://git.k8s.io/kubernetes/test/integration/auth/auth_test.go)
+  
+- Unit tests must pass on macOS and Windows platforms - if you use Linux
+  specific features, your test case must either be skipped on windows or compiled
+  out (skipped is better when running Linux specific commands, compiled out is
+  required when your code does not compile on Windows).
+
+- Avoid relying on Docker hub (e.g. pull from Docker hub). Use gcr.io instead.
+
+- Avoid waiting for a short amount of time (or without waiting) and expect an
+  asynchronous thing to happen (e.g. wait for 1 seconds and expect a Pod to be
+  running). Wait and retry instead.
+
+- Significant features should come with integration (test/integration) and/or
+  end-to-end (e2e/) tests. TOOD(@wonderflow): add detail test guides.
+  - Including new vela cli commands and major features of existing commands
+
+
+## Directory and file conventions
+
+- Avoid package sprawl. Find an appropriate subdirectory for new packages.
+  - Libraries with no more appropriate home belong in new package
+    subdirectories of pkg/util
+
+- Avoid general utility packages. Packages called "util" are suspect. Instead,
+  derive a name that describes your desired function. For example, the utility
+  functions dealing with waiting for operations are in the "wait" package and
+  include functionality like Poll. So the full name is wait.Poll
+
+- All filenames should be lowercase
+
+- Go source files and directories use underscores, not dashes
+  - Package directories should generally avoid using separators as much as
+    possible (when packages are multiple words, they usually should be in nested
+    subdirectories).
+
+- Document directories and filenames should use dashes rather than underscores
+
+- Contrived examples that illustrate system features belong in
+  /docs/user-guide or /docs/admin, depending on whether it is a feature primarily
+  intended for users that deploy applications or cluster administrators,
+  respectively. Actual application examples belong in /examples.
+  - Examples should also illustrate [best practices for configuration and using the system](https://kubernetes.io/docs/concepts/configuration/overview/)
+
+- Third-party code
+
+  - Go code for normal third-party dependencies is managed using
+    [go modules](https://github.com/golang/go/wiki/Modules)
+
+  - Other third-party code belongs in `/third_party`
+    - forked third party Go code goes in `/third_party/forked`
+    - forked _golang stdlib_ code goes in `/third_party/forked/golang`
+
+  - Third-party code must include licenses
+
+  - This includes modified third-party code and excerpts, as well
+  
+## Logging Conventions
+
+### Structured logging
+
+We recommend using `klog.InfoS` to structure the log. The `msg` argument need start from a capital letter.
+and name arguments should always use lowerCamelCase.
+
+```golang
+// func InfoS(msg string, keysAndValues ...interface{})
+klog.InfoS("Reconcile traitDefinition", "traitDefinition", klog.KRef(req.Namespace, req.Name))
+// output:
+// I0605 10:10:57.308074   22276 traitdefinition_controller.go:59] "Reconcile traitDefinition" traitDefinition="vela-system/expose"
+```
+
+### Use `klog.KObj` and `klog.KRef` for Kubernetes objects
+
+`klog.KObj` and `klog.KRef` can unify the output of kubernetes object.
+
+```golang
+// KObj is used to create ObjectRef when logging information about Kubernetes objects
+klog.InfoS("Start to reconcile", "appDeployment", klog.KObj(appDeployment))
+// KRef is used to create ObjectRef when logging information about Kubernetes objects without access to metav1.Object
+klog.InfoS("Reconcile application", "application", klog.KRef(req.Namespace, req.Name))
+```
+
+### Logging Level
+
+[This file](https://github.com/oam-dev/kubevela/blob/master/pkg/controller/common/logs.go) contains KubeVela's log level,
+you can set the log level by `klog.V(level)`.
+
+```golang
+// you can use klog.V(common.LogDebug) to print debug log
+klog.V(common.LogDebug).InfoS("Successfully applied components", "workloads", len(workloads))
+```
+
+Looking for more details in [Structured Logging Guide](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md#structured-logging-in-kubernetes).
+
+
+## Linting and formatting
+
+To ensure consistency across the Go codebase, we require all code to pass a number of linter checks.
+
+To run all linters, use the `reviewable` Makefile target:
+
+```shell script
+make reviewable
+```
+
+The command will clean code along with some lint checks. Please remember to check in all changes after that.

contribute/create-pull-request.md

@@ -0,0 +1,86 @@
+# Create a pull request
+
+We're excited that you're considering making a contribution to the KubeVela project!
+This document guides you through the process of creating a [pull request](https://help.github.com/en/articles/about-pull-requests/).
+
+## Before you begin
+
+We know you're excited to create your first pull request. Before we get started, read these resources first:
+
+- Learn how to start [Contributing to KubeVela](/CONTRIBUTING.md).
+- Make sure your code follows the relevant [style guides](/contribute/style-guides).
+
+## Your first pull request
+
+If this is your first time contributing to an open-source project on GitHub, make sure you read about [Creating a pull request](https://help.github.com/en/articles/creating-a-pull-request).
+
+To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines:
+
+- Title and description matches the implementation.
+- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines).
+- The pull request closes one related issue.
+- The pull request contains necessary tests that verify the intended behavior.
+- If your pull request has conflicts, rebase your branch onto the main branch.
+
+If the pull request fixes a bug:
+
+- The pull request description must include `Closes #<issue number>` or `Fixes #<issue number>`.
+- To avoid regressions, the pull request should include tests that replicate the fixed bug.
+
+Please refer to the [code conventions](/contribute/coding-conventions.md) for better code style and conventions.
+
+## Code review
+
+Once you've created a pull request, the next step is to have someone review your change.
+A review is a learning opportunity for both the reviewer and the author of the pull request.
+
+If you think a specific person needs to review your pull request, then you can tag them in the description or in a comment.
+Tag a user by typing the `@` symbol followed by their GitHub username.
+
+We recommend that you read [How to do a code review](https://google.github.io/eng-practices/review/reviewer/) to learn more about code reviews.
+
+## Formatting guidelines
+
+A well-written pull request minimizes the time to get your change accepted.
+These guidelines help you write good commit messages and descriptions for your pull requests.
+
+### Commit message format
+
+KubeVela uses the guidelines for commit messages outlined in [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/), with the following additions:
+
+- Subject line must begin with the _area_ of the commit.
+- A footer in the form of an optional [keyword and issue reference](https://help.github.com/en/articles/closing-issues-using-keywords).
+
+#### Area
+
+The area should use upper camel case, e.g. UpperCamelCase.
+
+Prefer using one of the following areas:
+
+- **Application:** Changes to the application controller.
+- **Component:** Changes to the component related code or definition controller.
+- **Trait:** Changes to the trait related code or definition controller.
+- **CUE:** Changes to the CUE related logic.
+- **Docs:** Changes to documentation.
+- **AppConfig:** Changes to AppConfig related code.
+
+**Examples**
+
+- `Application: Support workflow in application controller`
+- `CUE: Fix patch parse issues`
+- `Docs: Changed url to URL in all documentation files`
+
+### Pull request titles
+
+The KubeVela team _squashes_ all commits into one when we accept a pull request.
+The title of the pull request becomes the subject line of the squashed commit message.
+We still encourage contributors to write informative commit messages, as they become a part of the Git commit body.
+
+We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.
+
+Make sure that the title for your pull request uses the same format as the subject line in the commit message.
+
+### Pass all the CI checks
+
+Before merge, All test CI should pass green.
+The `codecov/project` should also pass. This means the coverage should not drop. See [Codecov commit status](https://docs.codecov.io/docs/commit-status#project-status).

contribute/developer-guide.md

@@ -0,0 +1,145 @@
+# Developer guide
+
+This guide helps you get started developing KubeVela.
+
+## Prerequisites
+
+1. Golang version 1.16+
+2. Kubernetes version v1.18+ with `~/.kube/config` configured.
+3. ginkgo 1.14.0+ (just for [E2E test](./developer-guide.md#e2e-test))
+4. golangci-lint 1.38.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.
+5. kubebuilder v2.3.0+
+
+<details>
+  <summary>Install Kubebuilder manually</summary>
+
+linux:
+```
+wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_linux_amd64.tar.gz
+tar -zxvf  kubebuilder_2.3.1_linux_amd64.tar.gz
+mkdir -p /usr/local/kubebuilder/bin
+sudo mv kubebuilder_2.3.1_linux_amd64/bin/* /usr/local/kubebuilder/bin
+```
+
+macOS:
+```
+wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_darwin_amd64.tar.gz
+tar -zxvf  kubebuilder_2.3.1_darwin_amd64.tar.gz
+mkdir -p /usr/local/kubebuilder/bin
+sudo mv kubebuilder_2.3.1_darwin_amd64/bin/* /usr/local/kubebuilder/bin
+```
+
+</details>
+
+You may also be interested with KubeVela's [design](https://github.com/oam-dev/kubevela/tree/master/design/vela-core) before diving into its code.
+
+## Build
+
+* Clone this project
+
+```shell script
+git clone git@github.com:oam-dev/kubevela.git
+```
+
+KubeVela includes two parts, `vela core` and `vela cli`.
+
+- 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`).
+
+For local development, we probably need to build both of them.
+
+* Build Vela CLI
+
+```shell script
+make
+```
+
+After the vela cli built successfully, `make` command will create `vela` binary to `bin/` under the project.
+
+* Configure `vela` binary to System PATH
+
+```shell script
+export PATH=$PATH:/your/path/to/project/kubevela/bin
+```
+
+Then you can use `vela` command directly.
+
+* Build Vela Core
+
+```shell script
+make manager
+```
+
+* 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/docs/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
+```
+
+## Contribute Docs
+
+Please read [the documentation](https://github.com/oam-dev/kubevela/tree/master/docs/README.md) before contributing to the docs.
+
+- Build docs
+
+```shell script
+make docs-build
+```
+
+- Local development and preview
+
+```shell script
+make docs-start
+```
+
+## Next steps
+
+* Read our [code conventions](coding-conventions.md)
+* Learn how to [Create a pull request](create-pull-request.md)

contribute/triage-issues.md

@@ -0,0 +1,40 @@
+# Triage issues
+
+Triage helps ensure that 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.
+
+This document gives you some ideas on what you can do to help. For more information, read more about [how the core KubeVela team triage issues](/ISSUE_TRIAGE.md).
+
+## Improve issues
+
+Improve issues by suggesting improvements to the title and description. If you think an issue has formatting issues,
+bad language, or grammatical errors, post a comment to let the author and maintainers know.
+
+## Report resolved issues
+
+If you think an issue has been resolved, or is no longer relevant, suggest us to close it.
+Add a comment on the issue, where you explain the reason it should be closed.
+Make sure to include any related issues and pull requests.
+
+## Investigate issues
+
+Investigate issues that we haven't been able to reproduce yet.
+In some cases, there are many combinations of usage that make it difficult for us to reproduce certain issues.
+Help us by adding more information.
+
+## Vote on issues
+
+Use [GitHub reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments)
+to let us know what's important to you. Vote on bugs if you've experienced the same problem. **Don't vote, or react, by commenting on the issue.**
+
+Read more about [how we prioritize issues](/ISSUE_TRIAGE.md#4-prioritization-of-issues).
+
+## Report duplicates
+
+If you find two issues that describe the same thing, add a comment in one of the issues, with a reference (`#<issue number>`) to the other.
+Explain why you think the issue is duplicated.

design/api/vela-controller-params-reference.md

@@ -0,0 +1,27 @@
+# KubeVela Controller Parameters Reference
+
+|          parameter          |  type  |              default              |                           describe                           |
+| :-------------------------: | :----: | :-------------------------------: | :----------------------------------------------------------: |
+|         use-webhook         |  bool  |               false               |                   Enable Admission Webhook                   |
+|      webhook-cert-dir       | string | /k8s-webhook-server/serving-certs |               Admission webhook cert/key dir.                |
+|        webhook-port         |  int   |               9443                |               Admission webhook listen address               |
+|        metrics-addr         | string |               :8080               |          The address the metric endpoint binds to.           |
+|   enable-leader-election    |  bool  |               false               | Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager. |
+|  leader-election-namespace  | string |                ""                 | Determines the namespace in which the leader election configmap will be created. |
+|        log-file-path        | string |                ""                 |                  The file to write logs to.                  |
+|      log-file-max-size      |  int   |               1024                | Defines the maximum size a log file can grow to, Unit is megabytes. |
+|          log-debug          |  bool  |               false               |          Enable debug logs for development purpose           |
+|       revision-limit        |  int   |                50                 | revision-limit is the maximum number of revisions that will be maintained. The default value is 50. |
+| application-revision-limit  |  int   |                10                 | application-revision-limit is the maximum number of application useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 10. |
+|  definition-revision-limit  |  int   |                20                 | definition-revision-limit is the maximum number of component/trait definition useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 20. |
+|  custom-revision-hook-url   | string |                ""                 | custom-revision-hook-url is a webhook url which will let KubeVela core to call with applicationConfiguration and component info and return a customized component revision |
+|    app-config-installed     |  bool  |               true                | app-config-installed indicates if applicationConfiguration CRD is installed |
+| autogen-workload-definition |  bool  |               true                | Automatic generated workloadDefinition which componentDefinition refers to |
+|         health-addr         | string |               :9440               |          The address the health endpoint binds to.           |
+|       apply-once-only       | string |               false               | For the purpose of some production environment that workload or trait should not be affected if no spec change, available options: on, off, force. |
+|        disable-caps         | string |                ""                 |           To be disabled builtin capability list.            |
+|       storage-driver        | string |               Local               |         Application file save to the storage driver          |
+|  informer-re-sync-interval  |  time  |                2h                 |    controller shared informer lister full re-sync period     |
+| system-definition-namespace | string |            vela-system            |     define the namespace of the system-level definition      |
+|    concurrent-reconciles    |  int   |                 4                 | concurrent-reconciles is the concurrent reconcile number of the controller. |
+|      depend-check-wait      |  time  |                30s                | depend-check-wait is the time to wait for ApplicationConfiguration's dependent-resource ready. |

design/api/vela-plugin-registry-reference.md

@@ -0,0 +1,33 @@
+# KubeVela Plugin Registry Reference
+
+## registry interface intro
+
+`Registry` interface definitions have two methods: `GetCap` and `ListCaps`. Here "Cap" can represent trait or component definition
+
+```go
+// Registry define a registry stores trait & component defs
+type Registry interface {
+	GetCap(addonName string) (types.Capability, []byte, error)
+	ListCaps() ([]types.Capability, error)
+}
+```
+
+Now we have implemented:`GithubRegistry`, `LocalRegistry` and `OssRegistry`, which represent three types of registry source. 
+
+To create a `Registry` object you should and must call `NewRegistry()`. 
+
+### Helper type or function
+
+You could use `RegistryFile` to convert `[]byte` (easily got from all kinds of source) to `Capability`. Here is `RegistryFile`'s definition.
+
+```go
+// RegistryFile describes a file item in registry
+type RegistryFile struct {
+	data []byte // file content
+	name string // file's name
+}
+```
+
+## Registry vs Capcenter
+
+How they differ from each other? `Capcenter` is a type for vela CLI. It has some function to sync content from remote and local `~/.vela` directory and apply some `ComponentDefinition` or `TraitDefinition` to the cluster. In the contrast, `Registry` is a type for kubectl vela plugin, which focuses on cluster directly. In one word, `Registry` has no local operations. They share some basic function.

design/vela-core/APIServer-Catalog.md

@@ -27,7 +27,7 @@ This design is based on and tries to resolve the following use cases:
 
 The overall architecture diagram:
 
-![alt](../../docs/resources/apiserver-arch.jpg)
+![alt](../../docs/en/resources/apiserver-arch.jpg)
 
 Here's some explanation of the diagram:
 
@@ -39,19 +39,19 @@ Here's some explanation of the diagram:
 
 The above architecture implies that the Vela APIServer could be used to multiple k8s clusters and catalogs. Below is what a deployment of Vela platform would look like:
 
-![alt](../../docs/resources/api-workflow.png)
+![alt](../../docs/en/resources/api-workflow.png)
 
 ### 2. API Design
 
 Below is the overall architecture of API grouping and storage:
 
-![alt](../../docs/resources/api-arch.jpg)
+![alt](../../docs/en/resources/api-arch.jpg)
 
 There are two distinguished layers:
 - **API layer**: It defines the API discovery and serving endpoints that Vela APIServer implementation must follow. This is the integration point for external system components (e.g. UI) to contact.
 - **Storage layer**: It describes the storage systems and objects that Vela APIServer syncs data with behind the scene. There are three types of storage:
   - **K8s cluster**: Vela APIServer manages multiple k8s clusters with regard to the applications and definitions custom resources.
-  - **Catalog server**: Vela APIServer manages mulitple catalogs which contain COTS application pacakges. Currently in our use case the catalogs resides in Git repos. In the future we can extend this to other catalog storage like file server, object storage.
+  - **Catalog server**: Vela APIServer manages multiple catalogs which contain COTS application pacakges. Currently in our use case the catalogs resides in Git repos. In the future we can extend this to other catalog storage like file server, object storage.
   - **MySQL database**: Vela APIServer stores global, cross-cluster, cross catalog information in a MySQL database. These data do not exist in k8s or catalog and thus need to be managed by APIServer in a separate database. The database is usually hosted on cloud.
 
 #### Environment API
@@ -313,7 +313,7 @@ Under the hood, APIServer will rescan the catalog.
 
 Vela APIServer aggregates package information from multiple catalog servers. To download a package, the user first requests the APIServer to find the location of the catalog and the package. Then the user visits the catalog repo directly to download the package data. The workflow is shown as below:
 
-![alt](../../docs/resources/catalog-workflow.jpg)
+![alt](../../docs/en/resources/catalog-workflow.jpg)
 
 In our future roadmap, we will build a catalog controller for each k8s cluster. Then we will add API endpoint to install the package in APIServer which basically creates a CR to trigger the controller to reconcile package installation into the cluster. We choose this instead of APIServer installing the package because in this way we can bypass the APIServer in the package data transfer path and avoid APIServer becoming a single point of failure.
 

design/vela-core/app_deployment.md

@@ -105,7 +105,7 @@ In the following example, we are assuming the app has deployed v1 now and is upg
 
 We will make sure the spec works for the following environments:
 
-- K8s ingress + service (traffic split percetange determined by replica number)
+- K8s ingress + service (traffic split percentages determined by replica number)
 - Istio service mesh
 
 Here is the workflow with Istio:

design/vela-core/apply-once-only.md

@@ -142,7 +142,7 @@ Besides the condition in `apply-once-only`, `apply-once-only-force` has one more
 
 Three available options are provided to a vela-core runtime setup flag named `apply-one-only`, referring to three modes:
 
-- off - `apply-once-only` is disabeld, this is the default option
+- off - `apply-once-only` is disabled, this is the default option
 - on - `apply-once-only` is enabled
 - force - `apply-once-only-force` is enabled
 

design/vela-core/apply-workload-and-trait.md

@@ -152,7 +152,7 @@ status:
 # update with original manifest fails
 # reconciling also fails for cannot applying trait
 ```
-Additonally, if a trait has no immutable field, update will eliminate all fields set by others.
+Additionally, if a trait has no immutable field, update will eliminate all fields set by others.
 ```yaml
 # original trait manifest
 kind: Bar

design/vela-core/environment.md

@@ -0,0 +1,294 @@
+# Initilizing Environments For Application Deployment
+
+## Background
+
+A team of application development usually needs to initialize some shared environments for developers to deploy applications to.
+For example, a team would initialize two environments, a *dev* environment for testing applications,
+and a *prod* environment for running applications to serve live traffic.
+The environment is a logical concept grouping common resources that multiple application deployments would depend on.
+
+A list of resources we want to initialize per environment:
+
+- K8s Clusters. Different environments might have clusters of different size and version, e.g.
+  small v1.10 k8s cluster for *dev* environment and large v1.9 k8s cluster for *prod* environment.
+- Admin policies. Production environment would usually set global policies on all application deployments,
+  like chaos testing, SLO requirements, security scanning, misconfiguration detection.
+- Operators & CRDs. Environments contains a variety of Operators & CRDs as system capabilities.
+  These operators can include domain registration, routing, logging, monitoring, autoscaling, etc.
+- Shared services. Environments contains a variety of system services that are be shared by applications.
+  These resources can include DB, cache, load balancers, API Gateways, etc.
+
+With the introduction of environment, the user workflow on Vela works like:
+
+- Platform team defines system Components for Environments.
+- Platform team initializes Environments using system Components.
+- Platform team defines user Components for Applications.
+- Developers choose user Components and Environments to deploy Applicatons.
+
+When initializing environments, there are additional requirements:
+
+- The ability to describe dependency relations between environments. For example, both *dev* and *prod* environments
+  would depend on a common environment that sets up operators both *dev* and *prod* would use.
+
+In the following we propose solutions to implement environment concept for application delivery.
+
+## Initialzer CRD
+
+We propose to add an Initializer CRD:
+
+```yaml
+kind: Initializer
+metadata:
+  name: prod-env
+spec:
+  # appTemplate indicates the application template to render and deploy an system application.
+  appTemplate:
+    # We can use Application to deploy the resources that an environment needs.
+    # An environment setup can be done just like deploying applications in system level.
+    metadata:
+      ...
+    spec:
+      # system components
+      components:
+        ...
+      # system policies
+      policies:
+        ...
+
+  # dependsOn indicates the other initializers that this depends on.
+  # It will not apply its components until all dependencies exist.
+  dependsOn:
+    - ref:
+        apiVersion: core.oam.dev/v1beta1
+        kind: Initializer
+        name: common-operators
+```
+
+By providing this initializer CRD, users can initialize environments by deploying system components --
+the abstractions is flexible enough to do work like provisioning cloud resources, handling db migration,
+installing system operators, etc.
+Additionally, initializer dependency enables separating common setup tasks like setting up namespaces,
+RBAC rules, accounts into reusable modules.
+
+
+## Initializer-Related Operators
+
+The Initializer CRD groups initialization resources together.
+To satisfy each resource and its use case, we also need to implement the supporting operators and definitions.
+In the following, we will walk through each use case and discuss the design of solution.
+
+
+### Case 1: K8s Cluster
+
+In this case, an initializer contains some clusters, and developers specify an initializer name to deploy apps.
+
+Platform team would define placement rules as a Policy and deploy the environment as an Initializer:
+
+```yaml
+kind: Initializer
+metadata:
+  name: prod-env
+spec:
+  appTemplate:
+    spec:
+      policies:
+        - name: prod-env-placement
+          type: placement
+          properties:
+            # clusters of specified names or matched labels will be selected
+            clusterSelector:
+              names: ["prod-1"， "prod-2"]
+              labels:
+                tier: prod
+```
+
+Developers would define how to deploy to clusters based on environments via Workflow:
+
+```yaml
+kind: Application
+metadata:
+  name: my-app
+spec:
+  workflow:
+    - name: deploy2clusters
+      type: deploy2clusters
+      properties:
+        # target indicates the name of the initializer
+        # which contains the selected clusters information.
+        target: prod-env
+
+        # propagation indicates how to propagate the app to the clusters.
+        #   all: all clusters will get one instance of the app
+        #   twin: pick two clusters to deploy two instances of the app
+        #   single: pick one cluster to deploy only one instance of the app
+        propagation: all
+```
+
+Under the hood, the `placement` Policy would be translated to Placement objects that contains cluster information.
+The `deploy2clusters` Workflow Steps would trigger `deploy2clusters` Operator to read Placement objects via `target` name
+and handles progapation of the app's resources to selected clusters.
+
+
+### Case 2: Admin Policy
+
+In this case, an initializer contains some admin policies, and developers specify an initializer to deploy apps.
+
+Platform team would define an admin policy as a Policy, and deploy such an environment as an Initializer:
+
+```yaml
+kind: Initializer
+metadata:
+  name: prod-env
+spec:
+  appTemplate:
+    spec:
+      policies:
+        - name: prod-env-slo-policy
+          type: slo-policy
+          properties:
+            properties:
+              # slo indicates the service in this env must be 99.99% up
+              slo: "99.99"
+        - name: prod-env-chaos-policy
+          type: chaos-policy
+          properties:
+            properties:
+              io:
+                action: fault
+                volumePath: /var/run/etcd
+                path: /var/run/etcd/**/*
+                percent: 50
+                duration: "400s"
+```
+
+Developers would specify a target to deploy via Workflow, which automatically does policy checks in the background:
+
+```yaml
+kind: Application
+metadata:
+  name: my-app
+spec:
+  workflow:
+    - name: check-policy
+      type: check-policy
+      properties:
+        # This app will be checked against the policies in the given target
+        target: prod-env
+        # If policy checks failed, send alerts to spcified channels
+        notifications:
+          slack: slack_url
+          dingding: dingding_url
+```
+
+Under the hood, the `slo-policy` and `chaos-policy` Policies would be translated to data objects (e.g. ConfigMap
+or dedicated Policy objects) that contains policy data.
+The `check-policy` Workflow Steps would trigger `check-policy` Operator to register the apps
+to handlers of the target's policy checks, and handle notifications.
+
+
+### case 3: Operator & CRD
+
+In this case, an initializer defines the system Operators ands CRDs to be installed on a cluster.
+Deploying such an initializer will setup these services and definitions on the host cluster.
+
+Platform team would define these Operators and CRDs as Components, and deploy such an environment as an Initializer:
+
+```yaml
+kind: Initializer
+metadata:
+  name: prod-env
+spec:
+  appTemplate:
+    spec:
+      components:
+        - name: prod-monitoring-operator
+          # Reuse the built-in Helm/Kustomize ComponentDefinition to deploy Operators from Git repo.
+          type: helm-git
+          properties:
+            chart:
+              repository: operator-git-repo-url
+              name: monitoring-operator
+              version: 3.2.0
+        - name: prod-logging-operator
+          type: kustomize-git
+          properties:
+            sourceRef:
+              kind: GitRepository
+              name: logging-operator
+            path: ./apps/prod
+```
+
+Under the hood, Vela will support built-in ComponentDefinitions to deploy Helm charts or Kustomize folders
+via git url. We can use this functionality to deploy system operators.
+
+
+### case 4: Shared Service
+
+In this case, an Initializer defines shared services to be installed on the cluster.
+Deploying such an initializer will setup these services on the host cluster.
+
+Platform team would define the shared services as Components, and deploy such an environment as an Initializer:
+
+```yaml
+kind: Initializer
+metadata:
+  name: prod-env
+spec:
+  appTemplate:
+    spec:
+      components:
+        - name: prod-policy-env
+          # Reuse the built-in Helm ComponentDefinition to deploy Crossplane resource.
+          type: helm-git
+          properties:
+            chart:
+              repository: crossplane-mysql-url
+              name: mysql
+              version: 3.2.0
+        - name: prod-policy-env
+          # Reuse the built-in Terraform ComponentDefinition to deploy cloud resource.
+          type: terraform-git
+          properties:
+            module:
+              source: "git::https://github.com/catalog/kafka.git"
+            outputs:
+              - key: queue_urls
+                moduleOutputName: queue_urls
+              - key: json_string
+                moduleOutputName: json_string
+            variables:
+              - key: ACCESS_KEY_ID
+                sensitive: true
+                environmentVariable: true
+              - key: SECRET_ACCESS_KEY
+                sensitive: true
+                environmentVariable: true
+              - key: CONFIRM_DESTROY
+                value: "1"
+                sensitive: false
+                environmentVariable: true
+```
+
+
+## Implementation Plan
+
+We will discuss the details of implementation plan in this section.
+
+### Environment Controller
+
+- Add a new Initializer CRD and controller skeleton in KubeVela. Add reconcile logic:
+  - If finalizer doesn't exist, add finalizer to the object.
+  - If obj DeletionTimestamp is non-zero (i.e. being deleted):
+    - Wait until the Application resource are deleted entirely.
+      The resource tracker finalizer will ensure all children resources are deleted entirely first.
+    - Then remove finalizer.
+  - Check initializer dependency:
+    - If any of them does not exist, try reconcile later.
+  - Handle each resource:
+    - Render the `appTemplate` into an Application object.
+    - Put Initializer name into the label `app.oam.dev/initializer-name` of Application object.
+    - Put Initializer CR as an ownerRef into the Application object.
+    - Apply the Application object.
+
+
+## Considerations

design/vela-core/restful-interface.md

@@ -136,7 +136,7 @@ const cueTemplate appCreateMode = "appFile"
 ```go
 type appConfigValue struct {
     appName string       `json:"appName"`
-    defintion runtime.RawExtension `json:"defintion"` // the content
+    definition runtime.RawExtension `json:"definition"` // the content
     definitionName string `json:"definitionName"` // use to find the definition
     definitionType string `json:"definitionType"`
 }
@@ -161,7 +161,7 @@ const cueTemplate appUpdateMode = "appFile"
 ```go
 
 type appConfigValue struct {
-    defintion runtime.RawExtension `json:"defintion"` // the content
+    definition runtime.RawExtension `json:"definition"` // the content
 }
 ```
 

design/vela-core/rollout-design.md

@@ -179,7 +179,7 @@ just change the application, and the system will pick up the change, then apply
  depends on the workload type and we will list each in the 
  [rollout with different workload](#Rollout plan work with different type of workloads) section
  . This special AC logic is also the real magic for the other rollout scenario to work as AC
-  controller is the only entity that is directly responsible for emiting the workload to the k8s.
+  controller is the only entity that is directly responsible for emitting the workload to the k8s.
    
    
 #### ApplicationDeployment workflow 
@@ -293,7 +293,7 @@ the following fields:
 ## State Transition
 Here is the state transition graph
 
-![](../../docs/resources/approllout-status-transition.jpg)
+![](../../docs/en/resources/approllout-status-transition.jpg)
 
 Here are the various top-level states of the rollout 
 ```go

design/vela-core/workflow_policy.md

@@ -0,0 +1,345 @@
+# Application-Level Policies and Customized Control-Logic Workflow Design
+
+## Background
+
+The current model consists of mainly Components and Traits. While this enables the Application object to plug-in operational capabilities, it is still no flexible enough. Specifically, it has the following limitations:
+
+- The current control logic could not be customized. Once the Vela controller renders final k8s resources, it simply applies them without any extension points. In some scenarios, users want to do more complex operations like:
+  - Blue-green upgrade old-new app revisions.
+  - User interaction like manual approval/rollback.
+  - Distributing workloads across multiple clusters.
+  - Enforcing policies and auditting.
+  - Pushing finalized k8s resources to Git for GitOps (via Flux/Argo) without applying the resources in Vela.
+- There is no application-level config, but only per-component config. In some scenarios, users want to have app-level policies like:
+  - Security: RBAC rules, audit settings, secret backend types.
+  - Insights: app delivery lead time, frequence, MTTR.
+
+## Proposal
+
+To resolve the aforementioned problems, we propose to add app-level policies and customizable workflow to Application API:
+
+```yaml
+kind: Application
+spec:
+  componnets: ...
+
+  # Policies are rendered after components are rendered but before workflow are started
+  policies:
+    - type: security
+      properties:
+        rbac: ...
+        audit: enabled
+        secretBackend: vault
+
+    - type: deployment-insights
+      properties:
+        leadTime: enabled
+        frequency: enabled
+        mttr: enabled
+
+  # workflow is used to customize the control logic.
+  # If workflow is specified, Vela won't apply any resource, but provide rendered resources in a ConfigMap, referenced via 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:
+  
+    # blue-green rollout
+    - type: blue-green-rollout
+      stage: post-render # stage could be pre/post-render. Default is post-render.
+      properties:
+        partition: "50%"
+
+    # traffic shift
+    - type: traffic-shift
+      properties:
+        partition: "50%"
+
+    # promote/rollback
+    - type: rollout-promotion
+      propertie:
+        manualApproval: true
+        rollbackIfNotApproved: true
+```
+
+This also implicates we will add two Definition CRDs -- `PolicyDefinition` and `WorkflowStepDefinition`:
+
+```yaml
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  name: gitops
+spec:
+  schematic:
+    cue:
+      template: |
+        output: {
+          kind: GitOps
+          spec:
+            source:
+              repoURL: parameter.source
+              branch: parameter.branch
+            ...
+        }
+        parameters: {
+          source: string
+          branch: string
+        }
+
+---
+apiVersion: core.oam.dev/v1beta1
+kind: PolicyDefinition
+spec:
+  schematic:
+    cue:
+      template: ...
+```
+
+## Technical Details
+
+To support policies and workflow, the application controller will be modified as the following:
+
+- Before rendering the components, the controller will first execute the `stage: pre-render` steps.
+- App controller will put rendered resources (including Components, Traits, Policies) into a ConfigMap, and reference the ConfigMap name in AppRevision as below:
+
+  ```yaml
+  kind: ApplicationRevision
+  spec:
+    ...
+    resourcesConfigMap:
+      name: my-app-v1-resources
+  ---
+
+  kind: ConfigMap
+  metadata:
+    name: my-app-v1-resources
+  data: 
+    resources: |
+      {
+        "apiVersion": "apps/v1",
+        "kind": "Deployment",
+        "metadata": {
+            "name": "mysvc"
+        },
+        "spec": {
+            "replicas": 1
+        }
+      }
+      ...more json-marshalled resources...
+  ```
+- If workflow is specified, the controller will then apply the ApplicationRevision, but skip applying ApplicationContext. In this way, the resources won't be applied by Vela controller.
+- The controller will then reconcile the workflow step by step. Each workflow step will be recorded in the Application.status:
+  ```yaml
+  kind: Application
+  status:
+    workflow:
+    - type: rollout-promotion
+      phase: running # succeeded | failed | stopped
+      resourceRef:
+        kind: Rollout
+        name: ...
+  ```
+- Note that each workflow step must be idempotent, which means it should be able to process an object that are already submitted and processed. A non-idempotent example would be a controller that keeps appending item to an array field.
+
+Each workflow step has the following interactions with the app controller:
+- The controller will apply the workflow object with annotation `app.oam.dev/workflow-context`. This annotation will pass in the context marshalled in json defined as the following:
+  ```go
+  type WorkflowContext struct {
+    AppName string
+    AppRevisionName string
+    WorkflowIndex int
+  }
+  ```
+- The controller will wait for the workflow object's `status.conditions` to have this condition:
+
+  ```yaml
+  conditions:
+    - type: workflow-progress
+      status: 'True'
+      reason: 'Succeeded'
+      message: '{"observedGeneration":1}'
+  ```
+
+  The reason could be one of the following:
+  - `Succeeded`: This will make the controller run the next step. The observed generation number should be written in `message` since Vela will check it to detect the newer decision on spec change.
+  - `Stopped`: This will make the controller stop the workflow.
+  - `Failed`: This will make the controller stop the workflow. The error should be reported in `message`.
+
+## Use Cases
+
+In this section we will walk through how we implement workflow solutions for the following use cases.
+
+### Case 1: Multi-cluster
+
+In this case, users want to distribute workflow to multiple clusters. The dispatcher implementation is flexible and could be based on [open-cluster-management](https://open-cluster-management.io/) or other methods.
+
+```yaml
+workflow:
+  - type: open-cluster-management
+    properties:
+      placement:
+        - clusterSelector:
+            region: east
+          replicas: "70%"
+        - clusterSelector:
+            region: west
+          replicas: "20%"
+```
+
+The process goes as:
+
+- During infra setup, the Cluster objects are applied and agents are setup in each cluster to manage lifecycle of k8s clusters.
+- Once the Application is applied, the OCM controller can retrieve all rendered resources from AppRevision. It will apply a ManifestWork object including all resources. Then the OCM agent will execute the workload creation in each cluster.
+
+### Case 2: Blue-green rollout
+
+In this case, users want to rollout a new version of the application components in a blue-green rolling upgrade style.
+
+```yaml
+workflow:
+  # blue-green rollout
+  - type: blue-green-rollout
+    properties:
+      partition: "50%"
+
+  # traffic shift
+  - type: traffic-shift
+    properties:
+      partition: "50%"
+
+  # promote/rollback
+  - type: rollout-promotion
+    propertie:
+      manualApproval: true
+      rollbackIfNotApproved: true
+```
+
+The process goes as:
+
+- By default, each modification of the Application object will generate an AppRevision object. The rollout controller will get the current revision from the context and retrieve the previous revision via kube API.
+- Then the rollout controller will do the operation to rollings replicas between two revisions (the actual behavior depends on the workload type, e.g. Deployment or CloneSet).
+- Once the rollover is done, the rollout controller can shift partial traffic to the new revision too.
+- The rollout controller will wait for the manual approval. In this case, it is in the status of Rollout object:
+  ```yaml
+  kind: Rollout
+  status:
+    pause: true # change this to false
+  ```
+
+  The reference to the rollout object will be in the Application object:
+  ```yaml
+  apiVersion: core.oam.dev/v1beta1
+  kind: Application
+  status:
+    workflow:
+    - type: rollout-promotion
+      resourceRef:
+        kind: Rollout
+        name: ...
+  ```
+
+### Case 3: Data Passing
+
+In this case, users want to deploy a database component first, wait the database to be up and ready, and then deploy the application with database connection secret.
+
+```yaml
+components:
+  - name: my-db
+    type: mysql
+    properties:
+
+  - name: my-app
+    type: webservice
+
+
+workflow:
+  - type: apply-component 
+    properties:
+      name: my-db
+
+  # Wait for the MySQL object's status.connSecret to have value.
+  - type: conditional-wait
+    properties:
+      resourceRef:
+        apiVersion: database.example.org/v1alpha1
+        kind: MySQLInstance
+        name: my-db
+      conditions:
+        - field: status.connSecret
+          op: NotEmpty
+
+  # Patch my-app Deployment object's field with the secret name
+  # emitted from MySQL object. And then apply my-app component.
+  - type: apply-component 
+    properties:
+      name: my-app
+      patch:
+        to:
+          field: spec.containers[0].envFrom[0].secretRef.name
+        valueFrom:
+          apiVersion: database.example.org/v1alpha1
+          kind: MySQLInstance
+          name: my-db
+          field: status.connSecret
+
+```
+
+### Case 4: GitOps rollout
+
+In this case, users just want Vela to provide final k8s resources and push them to Git, and then integrate with ArgoCD/Flux to do final rollout. Users will setup a GitOps workflow like below:
+
+```yaml
+workflow:
+- type: gitops # This part configures how to push resources to Git repo
+  properties:
+    gitRepo: git-repo-url
+    branch: branch
+    credentials: ...
+```
+
+The process goes as:
+
+- Everytime an Appliation event is triggered, the GitOps workflow controller will push the rendered resources to a Git repo. This will trigger ArgoCD/Flux to do continuous deployment.
+
+### Case 5: Template-based rollout
+
+In this case, a template for Application object has already been defined. Instead of writing the `spec.components`, users will reference the template and provide parameters/patch to it.
+
+```yaml
+workflow:
+  - type: helm-template
+    stage: pre-render
+    properties:
+      source: git-repo-url
+      path: chart/folder/path
+      parameters:
+        image: my-image
+        replicas: 3
+---
+workflow:
+  - type: kustomize-patch
+    stage: pre-render
+    properties:
+      source: git-repo-url
+      path: base/folder/path
+      patch:
+        spec:
+          components:
+            - name: instance
+              properties:
+                image: prod-image
+```
+
+The process goes as:
+
+- On creating the application, app controller will apply the HelmTemplate/KustomizePatch objects, and wait for its status.
+- The HelmTemplate/KustomizePatch controller would read the template from specified source, render the final config. It will compare the config with the Application object -- if there is difference, it will write back to the Application object per se.
+- The update of Application will trigger another event, the app controller will apply the HelmTemplate/KustomizePatch objects with new context. But this time, the HelmTemplate/KustomizePatch controller will find no diff after the rendering. So it will skip this time.
+
+## Considerations
+
+### Comparison with Argo Workflow/Tekton
+
+The workflow defined here are k8s resource based and very simple one direction workflow. It's mainly used to customize Vela control logic to do more complex deployment operations.
+
+While Argo Workflow/Tekton shares similar idea to provide workflow functionalities, they are container based and provide more complex features like parameters sharing (using volumes and sidecars). More importantly, these projects couldn't satisfy our needs. Otherwise we can just use them in our implementation.

docs/README.md

@@ -2,14 +2,14 @@
 
 [Here](https://github.com/oam-dev/kubevela/tree/master/docs) is the source documentation of [Kubevela website](http://kubevela.io/).
 Any files modifid here will trigger the `check-docs` Github action to run and validate the docs could be build successfully into the website.
-Any changes on these files(`docs/en/*`, `resource/*`, `sidebars.js`) will be submitted to the corresponding locations of the repo 
+Any changes on these files(`docs/en/*`, `docs/en/resource/*`, `sidebars.js`) will be submitted to the corresponding locations of the repo 
 [kubevela.io](https://github.com/oam-dev/kubevela.io). The Github-Action there will parse the document and publish it to the Kubevela Website automatically.
 
 Please follow our guides below to learn how to write the docs in the right way.
 
 ## Add or Update Docs
 
-When you add or modify the docs, these three files(`docs/en/`, `resource/` and `sidebars.js`) should be taken into consideration.
+When you add or modify the docs, these three files(`docs/en/`, `docs/en/resource/` and `sidebars.js`) should be taken into consideration.
 
 1. `docs/en/`, the main English documentation files are mainly located in this folder. All markdown files need to follow the format,
    that the title at the beginning should be in the following format:
@@ -28,11 +28,11 @@ When you add or modify the docs, these three files(`docs/en/`, `resource/` and `
     [the definition and template concepts](../platform-engineers/definition-and-templates)
     ```
    
-2. `resource/`, image files are located in this folder. When you want to use link any image in documentation, 
+2. `docs/en/resource/`, image files are located in this folder. When you want to use link any image in documentation, 
    you should put the image resources here and use a relative path like below:
   
    ```markdown
-    ![alt](../resources/concepts.png)
+    ![alt](./resources/concepts.png)
     ```
 
 3. `sidebars.js`, this file contain the navigation information of the KubeVela website.
@@ -54,19 +54,29 @@ When you add or modify the docs, these three files(`docs/en/`, `resource/` and `
 
 [comment]: <> (TODO: ADD how to translate into Chinese or other language here.)
    
-## Local Development
+## Preview Website
 
-You can preview the website locally with the `node` and `yarn` installed.
-Every time you modify the files under the docs, you need to re-run the following command, it will not sync automatically:
+You can preview the website locally with docker container. Every time you modify the files under the docs or sidebars.js, 
+it will sync automatically:
 
 ```shell
 make docs-start
 ```
 
-## Build in Local
+## Build Website
 
 You can build Kubevela website in local to test the correctness of docs, only run the following cmd:
 
 ```shell
 make docs-build
+```
+
+If you don't want to use docker to preview and build the website, we provide simple scripts in the `hack/website` to help you develop and debug locally.
+
+```
+# preview the website
+bash hack/website/docs-start.sh
+
+# build the website 
+bash hack/website/test-build.sh
 ```

docs/en/README.md

@@ -1,10 +1,10 @@
-![alt](../resources/KubeVela-03.png)
+![alt](resources/KubeVela-03.png)
 
 *Make shipping applications more enjoyable.*
 
 # KubeVela
 
-KubeVela is a modern application engine that adapts to your application's needs, not the other way around.
+KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
 
 ## Community
 

docs/en/advanced-install.mdx

@@ -0,0 +1,162 @@
+---
+title:  Other Install Topics
+---
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+## Install KubeVela with cert-manager
+
+KubeVela can use cert-manager generate certs for your application if it's available. Note that you need to install cert-manager **before** the KubeVela chart.
+
+```shell script
+helm repo add jetstack https://charts.jetstack.io
+helm repo update
+helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.2.0 --create-namespace --set installCRDs=true
+```
+
+Install kubevela with enabled certmanager:
+```shell script
+helm install --create-namespace -n vela-system --set admissionWebhooks.certManager.enabled=true kubevela kubevela/vela-core
+```
+
+## Install Pre-release
+    
+Add flag `--devel` in command `helm search` to choose a pre-release
+version in format `<next_version>-rc-master`. It means a release candidate version build on `master` branch,
+such as `0.4.0-rc-master`.
+
+```shell script
+helm search repo kubevela/vela-core -l --devel
+```
+```console
+    NAME                      CHART VERSION         APP VERSION           DESCRIPTION
+    kubevela/vela-core        0.4.0-rc-master         0.4.0-rc-master         A Helm chart for KubeVela core
+    kubevela/vela-core        0.3.2                   0.3.2                   A Helm chart for KubeVela core
+    kubevela/vela-core        0.3.1                 0.3.1                 A Helm chart for KubeVela core
+```
+
+And try the following command to install it.
+
+```shell script
+helm install --create-namespace -n vela-system kubevela kubevela/vela-core --version <next_version>-rc-master
+```
+```console
+NAME: kubevela
+LAST DEPLOYED: Thu Apr  1 19:41:30 2021
+NAMESPACE: vela-system
+STATUS: deployed
+REVISION: 1
+NOTES:
+Welcome to use the KubeVela! Enjoy your shipping application journey!
+```
+## Install Kubectl Vela Plugin
+
+Install vela kubectl plugin can help you to ship applications more easily!
+
+<Tabs
+className="unique-tabs"
+defaultValue="krew"
+values={[
+{label: 'Krew', value: 'krew'},
+{label: 'Script', value: 'script'},
+]}>
+<TabItem value="krew">
+
+1. [Install and set up](https://krew.sigs.k8s.io/docs/user-guide/setup/install/) Krew on your machine.
+2. Discover plugins available on Krew:
+```shell
+kubectl krew update
+```
+3. install kubectl vela:
+```shell script
+kubectl krew install vela
+```
+
+</TabItem>
+<TabItem value="script">
+
+**macOS/Linux**
+```shell script
+curl -fsSl https://kubevela.io/script/install-kubectl-vela.sh | bash
+```
+
+You can also download the binary from [release pages ( >= v1.0.3)](https://github.com/oam-dev/kubevela/releases) manually.
+Kubectl will discover it from your system path automatically.
+
+</TabItem>
+</Tabs>
+
+For more usage please reference [kubectl plugin](./developers/references/kubectl-plugin).
+## Upgrade
+
+### Step 1. Update Helm repo
+
+
+You can explore the newly released chart versions of KubeVela by run:
+
+```shell
+helm repo update
+helm search repo kubevela/vela-core -l
+```
+
+### Step 2. Upgrade KubeVela CRDs
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_workloaddefinitions.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
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_scopedefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applicationcontexts.yaml
+```
+
+> Tips: If you see errors like `* is invalid: spec.scope: Invalid value: "Namespaced": filed is immutable`. Please delete the CRD which reports error and re-apply the kubevela crds.
+
+```shell
+ kubectl delete crd \
+  scopedefinitions.core.oam.dev \
+  traitdefinitions.core.oam.dev \
+  workloaddefinitions.core.oam.dev
+```
+
+### Step 3. Upgrade KubeVela Helm chart
+
+```shell
+helm upgrade --install --create-namespace --namespace vela-system  kubevela kubevela/vela-core --version <the_new_version>
+```
+
+## Clean Up
+
+Run:
+
+```shell script
+helm uninstall -n vela-system kubevela
+rm -r ~/.vela
+```
+
+This will uninstall KubeVela server component and its dependency components.
+This also cleans up local CLI cache.
+
+Then clean up CRDs (CRDs are not removed via helm by default):
+
+```shell script
+ kubectl delete crd \
+  appdeployments.core.oam.dev \
+  applicationconfigurations.core.oam.dev \
+  applicationcontexts.core.oam.dev \
+  applicationrevisions.core.oam.dev \
+  applications.core.oam.dev \
+  approllouts.core.oam.dev \
+  componentdefinitions.core.oam.dev \
+  components.core.oam.dev \
+  containerizedworkloads.core.oam.dev \
+  healthscopes.core.oam.dev \
+  manualscalertraits.core.oam.dev \
+  podspecworkloads.standard.oam.dev \
+  scopedefinitions.core.oam.dev \
+  traitdefinitions.core.oam.dev \
+  workloaddefinitions.core.oam.dev
+```

docs/en/application.md

@@ -1,237 +0,0 @@
----
-title:  Application CRD
----
-
-This documentation will walk through how to use `Application` object to define your apps with corresponding operational behaviors in declarative approach.
-
-## Example
-
-The sample application below claimed a `backend` component with *Worker* workload type, and a `frontend` component with *Web Service* workload type.
-
-Moreover, the `frontend` component claimed `sidecar` and `autoscaler` traits which means the workload will be automatically injected with a `fluentd` sidecar and scale from 1-100 replicas triggered by CPU usage.
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: website
-spec:
-  components:
-    - name: backend
-      type: worker
-      properties:
-        image: busybox
-        cmd:
-          - sleep
-          - '1000'
-    - name: frontend
-      type: webservice
-      properties:
-        image: nginx
-      traits:
-        - type: autoscaler
-          properties:
-            min: 1
-            max: 10
-            cpuPercent: 60
-        - type: sidecar
-          properties:
-            name: "sidecar-test"
-            image: "fluentd"
-```
-
-### Deploy the Application
-
-Apply application yaml above, then you'll get the application started
-
-```shell
-$ kubectl get application -o yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
- name: website
-....
-status:
-  components:
-  - apiVersion: core.oam.dev/v1alpha2
-    kind: Component
-    name: backend
-  - apiVersion: core.oam.dev/v1alpha2
-    kind: Component
-    name: frontend
-....
-  status: running
-
-```
-
-You could see a Deployment named `frontend` with a container `fluentd` injected is running.
-
-```shell
-$ kubectl get deploy frontend
-NAME       READY   UP-TO-DATE   AVAILABLE   AGE
-frontend   1/1     1            1           100m
-```
-
-Another Deployment is also running named `backend`.
-
-```shell
-$ kubectl get deploy backend
-NAME      READY   UP-TO-DATE   AVAILABLE   AGE
-backend   1/1     1            1           100m
-```
-
-An HPA was also created by the `autoscaler` trait. 
-
-```shell
-$ kubectl get HorizontalPodAutoscaler frontend
-NAME       REFERENCE             TARGETS         MINPODS   MAXPODS   REPLICAS   AGE
-frontend   Deployment/frontend   <unknown>/50%   1         10        1          101m
-```
-
-
-## Under the Hood
-
-In above sample, the `type: worker` means the specification of this component (claimed in following `properties` section) will be enforced by a `ComponentDefinition` object named `worker` as below:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  name: worker
-  annotations:
-    definition.oam.dev/description: "Describes long-running, scalable, containerized services that running at backend. They do NOT have network endpoint to receive external network traffic."
-spec:
-  workload:
-    definition:
-      apiVersion: apps/v1
-      kind: Deployment
-  schematic:
-    cue:
-      template: |
-        output: {
-          apiVersion: "apps/v1"
-          kind:       "Deployment"
-          spec: {
-            selector: matchLabels: {
-              "app.oam.dev/component": context.name
-            }
-            template: {
-              metadata: labels: {
-                "app.oam.dev/component": context.name
-              }
-              spec: {
-                containers: [{
-                  name:  context.name
-                  image: parameter.image
-
-                  if parameter["cmd"] != _|_ {
-                    command: parameter.cmd
-                  }
-                }]
-              }
-            }
-          }
-        }
-        parameter: {
-          image: string
-          cmd?: [...string]
-        }
-```
-
-
-Hence, the `properties` section of `backend` only supports two parameters: `image` and `cmd`, this is enforced by the `parameter` list of the `.spec.template` field of the definition.
-
-The similar extensible abstraction mechanism also applies to traits.
-For example, `type: autoscaler` in `frontend` means its trait specification (i.e. `properties` section)
-will be enforced by a `TraitDefinition` object named `autoscaler` as below:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: "configure k8s HPA for Deployment"
-  name: hpa
-spec:
-  appliesToWorkloads:
-    - webservice
-    - worker
-  schematic:
-    cue:
-      template: |
-        outputs: hpa: {
-          apiVersion: "autoscaling/v2beta2"
-          kind:       "HorizontalPodAutoscaler"
-          metadata: name: context.name
-          spec: {
-            scaleTargetRef: {
-              apiVersion: "apps/v1"
-              kind:       "Deployment"
-              name:       context.name
-            }
-            minReplicas: parameter.min
-            maxReplicas: parameter.max
-            metrics: [{
-              type: "Resource"
-              resource: {
-                name: "cpu"
-                target: {
-                  type:               "Utilization"
-                  averageUtilization: parameter.cpuUtil
-                }
-              }
-            }]
-          }
-        }
-        parameter: {
-          min:     *1 | int
-          max:     *10 | int
-          cpuUtil: *50 | int
-        }
-```
-
-The application also have a `sidecar` trait.
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: "add sidecar to the app"
-  name: sidecar
-spec:
-  appliesToWorkloads:
-    - webservice
-    - worker
-  schematic:
-    cue:
-      template: |-
-        patch: {
-           // +patchKey=name
-           spec: template: spec: containers: [parameter]
-        }
-        parameter: {
-           name: string
-           image: string
-           command?: [...string]
-        }
-```
-
-All the definition objects are expected to be declared and installed by platform team and end users will only focus on `Application` resource.
-
-Please note that the end users of KubeVela do NOT need to know about definition objects, they learn how to use a given capability with visualized forms (or the JSON schema of parameters if they prefer). Please check the [Generate Forms from Definitions](/docs/platform-engineers/openapi-v3-json-schema) section about how this is achieved.
-
-### Conventions and "Standard Contract"
-
-After the `Application` resource is applied to Kubernetes cluster,
-the KubeVela runtime will generate and manage the underlying resources instances following below "standard contract" and conventions.
-
-
-| Label  | Description |
-| :--: | :---------: | 
-|`workload.oam.dev/type=<component definition name>` | The name of its corresponding `ComponentDefinition` |
-|`trait.oam.dev/type=<trait definition name>` | The name of its corresponding `TraitDefinition` | 
-|`app.oam.dev/name=<app name>` | The name of the application it belongs to |
-|`app.oam.dev/component=<component name>` | The name of the component it belongs to |
-|`trait.oam.dev/resource=<name of trait resource instance>` | The name of trait resource instance |
-|`app.oam.dev/appRevision=<name of app revision>` | The name of the application revision it belongs to |