Merge pull request #1831 from wonderflow/fixdev

add application  controller to caps which can be disabled and remove appdeployment

.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. The YAML files of Component/Trait I used.
-2. The YAML file of Application I applied.
-3. Other operations I have done.
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
 4. See error
 -->
 
@@ -31,12 +31,6 @@ 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

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

.github/ISSUE_TEMPLATE/config.yml

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

@@ -1,36 +0,0 @@
-<!--
-
-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/how-to.md

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

.github/workflows/check-docs.yml

@@ -1,26 +0,0 @@
-name: check-docs
-on:
-  pull_request:
-    paths:
-      - 'docs/**'
-    branches:
-      - master
-      - release-*
-jobs:
-  format-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - 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 }}
-        run: |
-          bash ./hack/website/test-build.sh

.github/workflows/codeql-analysis.yml

@@ -1,30 +0,0 @@
-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/dashboard.yml

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

.github/workflows/e2e-test.yml

@@ -1,109 +0,0 @@
-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,33 +13,17 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
-  GOLANGCI_VERSION: 'v1.38'
+  GO_VERSION: '1.14'
+  GOLANGCI_VERSION: 'v1.31'
+  DOCKER_BUILDX_VERSION: 'v0.4.2'
   KIND_VERSION: 'v0.7.0'
 
 jobs:
 
-  detect-noop:
+  unit-tests:
     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
-
-  compatibility-test:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
+      - name: Set up Go 1.14
         uses: actions/setup-go@v1
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -57,6 +41,48 @@ jobs:
           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
+    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
+
+      - 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
@@ -75,17 +101,68 @@ jobs:
       - name: Clean up testdata
         run: make compatibility-testdata-cleanup
 
-  staticcheck:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
+  e2e-tests:
+    runs-on: aliyun
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
+
+      - name: Setup Kind Cluster
+        run: |
+          kind delete cluster
+          kind create cluster
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster
+        run: make kind-load
+
+      - name: Run Make
+        run: make
+
+      - name: Run Make Manager
+        run: make manager
+
+      - name: Prepare for e2e tests
+        run: |
+          make e2e-cleanup
+          make e2e-setup
+
+      - name: Wait for e2e preparation ready
+        run: |
+          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/workloads)" != "200" ]]; do sleep 5; done' || false
+
+      - name: Run api e2e tests
+        run: make e2e-api-test
+
+      - name: Run e2e tests
+        run: make e2e-test
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup
+
+  staticcheck:
+    runs-on: ubuntu-20.04
+
+    steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -98,19 +175,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: staticcheck ./...
-
-      - name: License Header Check
-        run: make check-license-header
+        run: go run honnef.co/go/tools/cmd/staticcheck -- ./...
 
   lint:
     runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -136,8 +205,6 @@ jobs:
 
   check-diff:
     runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -162,23 +229,3 @@ jobs:
 
       - name: Check Diff
         run: make check-diff
-
-  build-cli:
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
-        with:
-          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
-      - name: Run make reviewable
-        run: make reviewable

.github/workflows/license.yml

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

.github/workflows/registry.yml

@@ -72,6 +72,14 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
+      - name: Get the version
+        id: get_version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/}
+          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
+            VERSION=latest
+          fi
+          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
@@ -85,30 +93,14 @@ jobs:
         run: |
           rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
           rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
-      - uses: oprypin/find-latest-tag@v1
-        with:
-          repository: oam-dev/kubevela
-          releases-only: true
-        id: latest_tag
       - name: Tag helm chart image
         run:  |
-          latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
-          sub="."
-          major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
-          minor="$(cut -d"$sub" -f2 <<<"$latest_repo_tag")"
-          patch="0"
-          next_repo_tag="$major.$(($minor + 1)).$patch"
-          image_tag=${GITHUB_REF#refs/tags/}
-          chart_version=$latest_repo_tag
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            image_tag=latest
-            chart_version=${next_repo_tag}-rc-master
-          fi
-          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/image_tag/g" $LEGACY_HELM_CHART/values.yaml
-          chart_smever=${chart_version#"v"}
-          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
+          version=${{ steps.get_version.outputs.VERSION }}
+          sed -i "s/latest/$version/g" $HELM_CHART/values.yaml
+          sed -i "s/latest/$version/g" $LEGACY_HELM_CHART/values.yaml
+          number=${version#"v"}
+          sed -i "s/0.1.0/$number/g" $HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$number/g" $LEGACY_HELM_CHART/Chart.yaml
       - 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
@@ -117,8 +109,8 @@ jobs:
         run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
       - name: add artifacthub stuff to the repo
         run: |
-          rsync README.md $HELM_CHART/README.md
-          rsync README.md $LEGACY_HELM_CHART/README.md
+          rsync docs/en/install.md $HELM_CHART/README.md
+          rsync docs/en/install.md $LEGACY_HELM_CHART/README.md
           sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
           rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
       - name: Package helm charts
@@ -128,22 +120,3 @@ 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

@@ -1,28 +0,0 @@
-name: docs
-on:
-  push:
-    paths:
-      - 'docs/**'
-    branches:
-      - master
-      - release-*
-jobs:
-  release-website:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - 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 }}
-          VERSION: ${{ github.ref }}
-          COMMIT_ID: ${{ github.sha }}
-        run: |
-          bash ./hack/website/release.sh

.github/workflows/release.yml

@@ -13,20 +13,30 @@ jobs:
       VELA_VERSION: ${{ github.ref }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Set up Go
+      - name: Set up Go 1.14
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16
+          go-version: 1.14
         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: Use Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Run dashboard install
+        run: make dashboard-install
+      - name: Run dashboard build
+        run: make dashboard-build
       - name: Tag helm chart image
         run:  |
           sed -i 's/latest/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/values.yaml
           sed -i 's/0.1.0/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/Chart.yaml
+      - name: Run generate-source
+        run: make generate-source
       - name: Run cross-build
         run: make cross-build
       - name: Run compress binary
@@ -34,111 +44,52 @@ jobs:
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Upload Vela Linux amd64 tar.gz
+      - name: Upload 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/vela-linux-amd64.tar.gz
+          asset_path: ./_bin/vela-linux-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela Linux amd64 zip
+      - name: Upload Linux amd64 zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-linux-amd64.zip
+          asset_path: ./_bin/vela-linux-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Vela MacOS tar.gz
+      - name: Upload MacOS tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
+          asset_path: ./_bin/vela-darwin-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela MacOS zip
+      - name: Upload MacOS zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-darwin-amd64.zip
+          asset_path: ./_bin/vela-darwin-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Vela Windows tar.gz
+      - name: Upload Windows tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
+          asset_path: ./_bin/vela-windows-amd64.tar.gz
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela Windows zip
+      - name: Upload Windows zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-windows-amd64.zip
+          asset_path: ./_bin/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
-      - 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
+          asset_content_type: text/plain

.github/workflows/sync-api.yml

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

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

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

.gitignore

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

.golangci.yml

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

.krew.yaml

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

.license/README.md

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

.license/dependency_decisions.yml

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

CONTRIBUTING.md

@@ -3,62 +3,131 @@
 ## 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.
-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).
+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. 
 
-This document is a guide to help you through the process of contributing to KubeVela.
+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). 
 
-## Become a contributor
 
-You can contribute to KubeVela in several ways. Here are some examples:
+## Development
 
-* 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.
+### Prerequisites
 
-For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
+1. Golang version 1.13+
+2. Kubernetes version v1.16+ with `~/.kube/config` configured.
+3. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test))
+4. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.
 
-### Report bugs
+We also recommend you to learn about KubeVela's [design](docs/en/design.md) before dive into its code.
 
-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.
+### Build
 
-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.
+* Clone this project
 
-Follow the issue template and add additional information that will help us replicate the problem.
+```shell script
+git clone git@github.com:oam-dev/kubevela.git
+```
 
-#### Security issues
+KubeVela includes two parts, `vela core` and `vela cli`.
 
-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.
+- 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`).
 
-### Suggest enhancements
+For local development, we probably need to build both of them.
 
-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).
+* Build Vela CLI
 
-### Triage issues
+```shell script
+make
+```
 
-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.
+After the vela cli built successfully, `make` command will create `vela` binary to `bin/` under the project.
 
-Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
+* Configure `vela` binary to System PATH
 
-### Answering questions
+```shell script
+export PATH=$PATH:/your/path/to/project/kubevela/bin
+```
 
-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).
+Then you can use `vela` command directly.
 
-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).
+* Build Vela Core
 
-### Your first contribution
+```shell script
+make manager
+```
 
-Unsure where to begin contributing to KubeVela? Start by browsing issues labeled `good first issue` or `help wanted`.
+* Run Vela Core
 
-- [Good first issue](https://github.com/oam-dev/kubevela/labels/good%20first%20issue) issues are generally straightforward to complete.
-- [Help wanted](https://github.com/oam-dev/kubevela/labels/help%20wanted) issues are problems we would like the community to help us with regardless of complexity.
+Firstly make sure your cluster has CRDs, below is the command that can help install all CRDs.
 
-If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
+```shell script
+make core-install
+```
 
-When you're ready to contribute, it's time to [Create a pull request](/contribute/create-pull-request.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/#/en/quick-start).
+
+## Testing
+
+### Unit test
+
+```shell script
+make test
+```
+
+### E2E test
+
+**Before e2e test start, make sure you have vela-core running.**
+
+```shell script
+make core-run
+```
+
+Start to test.
+
+```
+make e2e-test
+```
+
+## Make a pull request
+
+Remember to write unit-test and e2e-test after you have finished your code.
+ 
+Run following checks before making a pull request.
+
+```shell script
+make reviewable
+```
+
+The command will do some lint checks and clean code.
+
+After that, check in all changes and send a pull request.
+
+## Merge Regulations
+
+Before merging, the pull request should obey the following rules:
+
+- The commit title and message should be clear about what this PR does.
+- All test CI should pass green.
+- The `codecov/project` should pass. This means the coverage should not drop. See [Codecov commit status](https://docs.codecov.io/docs/commit-status#project-status).

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,26 +19,20 @@ COPY version/ version/
 ARG TARGETARCH
 ARG VERSION
 ARG GITVERSION
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
+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}" \
     -o manager-${TARGETARCH} main.go
 
-# Use alpine as base image due to the discussion in issue #1448
-# You can replace distroless as minimal base image to package the manager binary
+# Use 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
+# Could use `--build-arg=BASE_DISTROLESS=gcr.io/distroless/static:nonroot` to overwrite
+ARG BASE_DISTROLESS
+FROM ${BASE_DISTROLESS:-gcr.io/distroless/static:nonroot}
 
 WORKDIR /
 
 ARG TARGETARCH
-COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager
+COPY --from=builder /workspace/manager-${TARGETARCH} /manager
+USER nonroot:nonroot
 
-COPY entrypoint.sh /usr/local/bin/
-
-ENTRYPOINT ["entrypoint.sh"]
-
-CMD ["manager"]
+ENTRYPOINT ["/manager"]

Dockerfile.e2e

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

@@ -1,323 +0,0 @@
-# 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,11 +3,10 @@ VELA_VERSION ?= master
 # Repo info
 GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
 GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
-VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
-VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
-LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
+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)"
 
-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
@@ -35,76 +34,58 @@ 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
 test: vet lint staticcheck
 	go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/...
-	go test -race -covermode=atomic ./references/apiserver/... ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
 	@$(OK) unit-tests pass
 
-# Build vela cli binary
-build: fmt vet lint staticcheck vela-cli kubectl-vela
+# Build manager binary
+build: fmt vet lint staticcheck
+	go run hack/chart/generate.go
+	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
+	git checkout cmd/vela/fake/chart_source.go
 	@$(OK) build succeed
 
 vela-cli:
-	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
-
-kubectl-vela:
-	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
+	go run hack/chart/generate.go
+	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
+	git checkout cmd/vela/fake/chart_source.go
 
 dashboard-build:
-	cd references/dashboard && npm install && cd ..
+	cd dashboard && yarn build && cd ./..
+
+dashboard-install:
+	cd dashboard && yarn && cd ./..
 
 doc-gen:
 	rm -r docs/en/cli/*
 	go run hack/docgen/gen.go
-
-PWD := $(shell pwd)
-docs-build:
-	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:
-	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
+	go run hack/references/generate.go
 
 api-gen:
-	swag init -g references/apiserver/route.go --output references/apiserver/docs
-	swagger-codegen generate -l html2 -i references/apiserver/docs/swagger.yaml -o references/apiserver/docs
-	mv references/apiserver/docs/index.html docs/en/developers/references/restful-api/
+	swag init -g pkg/server/route.go --output pkg/server/docs
+	swagger-codegen generate -l html2 -i pkg/server/docs/swagger.yaml -o pkg/server/docs
+	mv pkg/server/docs/index.html docs/en/developers/references/restful-api/
 
 generate-source:
 	go run hack/frontend/source.go
 
 cross-build:
-	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
+	go run hack/chart/generate.go
+	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./cmd/vela/
 
 compress:
 	( \
 		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
 		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
-		cd _bin/vela && \
-		$(DIST_DIRS) cp ../../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../../README.md {} \; && \
+		cd _bin && \
+		$(DIST_DIRS) cp ../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../README.md {} \; && \
 		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
 		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
-		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 \
+		sha256sum vela-* > sha256sums.txt \
 	)
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
@@ -114,9 +95,8 @@ run: fmt vet
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
-	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w $$(go list -f {{.Dir}} ./...)
-	$(CUE) fmt ./vela-templates/internal/cue/*
-	$(CUE) fmt ./vela-templates/registry/cue/*
+	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd
+	$(CUE) fmt ./hack/vela-templates/cue/*
 
 # Run go vet against code
 vet:
@@ -126,35 +106,29 @@ staticcheck: staticchecktool
 	$(STATICCHECK) ./...
 
 lint: golangci
-	$(GOLANGCILINT) run ./...
+	$(GOLANGCILINT) run  ./...
 
 reviewable: manifests fmt vet lint staticcheck
 	go mod tidy
 
 # Execute auto-gen code commands and ensure branch is clean.
 check-diff: reviewable
-	git --no-pager diff
 	git diff --quiet || ($(ERR) please run 'make reviewable' to include all changes && false)
 	@$(OK) branch is clean
 
 # Build the docker image
 docker-build:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) . -t ${IMG}
 
 # Push the docker image
 docker-push:
-	docker push $(VELA_CORE_IMAGE)
+	docker push ${IMG}
 
 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
-	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
+	bin/vela install --set installCertManager=true --image-pull-policy IfNotPresent --image-repo vela-core-test --image-tag $(GIT_COMMIT) --depend-check-wait 10s
 	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
-	kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
-	kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
 	bin/vela dashboard &
 
 e2e-api-test:
@@ -166,6 +140,8 @@ e2e-api-test:
 e2e-test:
 	# Run e2e test
 	ginkgo -v ./test/e2e-test
+	# integration test will clean environment, please don't put test behind it.
+	CGO_ENABLED=0 go test -timeout 1h -count=1 -v -tags 'integration' ./test/integration
 	@$(OK) tests pass
 
 compatibility-test: vet lint staticcheck generate-compatibility-testdata
@@ -186,52 +162,50 @@ e2e-cleanup:
 
 image-cleanup:
 # Delete Docker image
-ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
-	docker rmi -f $(VELA_CORE_TEST_IMAGE)
+ifneq ($(shell docker images -q vela-core-test:$(GIT_COMMIT)),)
+	docker image rm -f vela-core-test:$(GIT_COMMIT)
 endif
 
-end-e2e:
-	sh ./hack/e2e/end_e2e.sh
-
 # load docker image to the kind cluster
 kind-load:
-	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
-	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
+	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
 
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
 
-# Build vela core manager binary
+# Build manager binary
 manager: fmt vet lint manifests
-	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go
+	go build -o bin/manager ./cmd/core/main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 core-run: fmt vet manifests
 	go run ./cmd/core/main.go
 
-# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
-core-debug-run: fmt vet manifests
-	go run ./cmd/core/main.go --log-debug=true
-
 # Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
 core-install: manifests
 	kubectl apply -f hack/namespace.yaml
 	kubectl apply -f charts/vela-core/crds/
+	kubectl apply -f charts/vela-core/templates/defwithtemplate/
+	kubectl apply -f charts/vela-core/templates/definitions/
+	kubectl apply -f charts/vela-core/templates/velaConfig.yaml
+	bin/vela workloads
 	@$(OK) install succeed
 
 # Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
 core-uninstall: manifests
+	kubectl delete -f charts/vela-core/templates/definitions/
+	kubectl delete -f charts/vela-core/templates/defwithtemplate/
 	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: installcue kustomize
+manifests:
 	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
-	./vela-templates/gen_definitions.sh
-	./hack/crd/cleanup.sh
+	./hack/vela-templates/gen_definitions.sh
 
 GOLANGCILINT_VERSION ?= v1.31.0
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
@@ -290,28 +264,9 @@ else
 CUE=$(shell which cue)
 endif
 
-KUSTOMIZE_VERSION ?= 3.8.2
-
-.PHONY: kustomize
-kustomize:
-ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
-	@{ \
-	set -e ;\
-	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
-	curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(GOBIN);\
-	echo 'Install succeed' ;\
-	}
-KUSTOMIZE=$(GOBIN)/kustomize
-else
-KUSTOMIZE=$(shell which kustomize)
-endif
-
 start-dashboard:
-	go run references/cmd/apiserver/main.go &
-	cd references/dashboard && npm install && npm start && cd ..
+	go run pkg/server/main/startAPIServer.go &
+	cd dashboard && npm install && npm start && cd ..
 
 swagger-gen:
-	$(GOBIN)/swag init -g apiserver/route.go -d pkg/ -o references/apiserver/docs/
-
-check-license-header:
-	./hack/licence/header-check.sh
+	$(GOBIN)/swag init -g server/route.go -d pkg/ -o pkg/server/docs/

PROJECT

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

README.md

@@ -8,53 +8,41 @@
 [![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/en/resources/KubeVela-03.png)
+![alt](docs/resources/KubeVela-03.png)
 
 *Make shipping applications more enjoyable.*
 
 # KubeVela
 
-KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
+For developers, KubeVela is an easy-to-use yet extensible platform that enables them to design and ship applications with minimal effort.
 
-## Features
-
-**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
-
-Full documentation is available on the [KubeVela website](https://kubevela.io/).
+For platform builders, KubeVela is the core engine that empowers them to create above platform with ease.
 
 ## 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)
+- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel
+- Gitter: [Discussion](https://gitter.im/oam-dev/community)
 
-## Talks and Conferences
+> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
 
-| Engagement | Link        |
-|:-----------|:------------|
-| 🎤  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)|
+## How It Works?
+
+![alt](docs/resources/how-it-works.png)
+
+## Quick Start
+
+Quick start guides for developers are available on [this section](https://kubevela.io/#/en/quick-start).
+
+## Platform Builder Guide
+
+Detailed guides for platform teams are available on [this section](https://kubevela.io/#/en/platform-engineers/overview).
+
+## Documentation
+
+For full documentation, please visit the KubeVela website: [https://kubevela.io](https://kubevela.io/).
 
 ## 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).
+This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.

SECURITY.md

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

apis/apis.go

@@ -1,18 +1,2 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 // Package apis contains all api types of KubeVela
 package apis

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

@@ -1,19 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package common contains types required for both v1alpha2 and v1beta1
-// +kubebuilder:object:generate=true
-package common

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

@@ -1,286 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package common
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-)
-
-// Kube defines the encapsulation in raw Kubernetes resource format
-type Kube struct {
-	// Template defines the raw Kubernetes resource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Template runtime.RawExtension `json:"template"`
-
-	// Parameters defines configurable parameters
-	Parameters []KubeParameter `json:"parameters,omitempty"`
-}
-
-// ParameterValueType refers to a data type of parameter
-type ParameterValueType string
-
-// data types of parameter value
-const (
-	StringType  ParameterValueType = "string"
-	NumberType  ParameterValueType = "number"
-	BooleanType ParameterValueType = "boolean"
-)
-
-// A KubeParameter defines a configurable parameter of a component.
-type KubeParameter struct {
-	// Name of this parameter
-	Name string `json:"name"`
-
-	// +kubebuilder:validation:Enum:=string;number;boolean
-	// ValueType indicates the type of the parameter value, and
-	// only supports basic data types: string, number, boolean.
-	ValueType ParameterValueType `json:"type"`
-
-	// FieldPaths specifies an array of fields within this workload that will be
-	// overwritten by the value of this parameter. 	All fields must be of the
-	// same type. Fields are specified as JSON field paths without a leading
-	// dot, for example 'spec.replicas'.
-	FieldPaths []string `json:"fieldPaths"`
-
-	// +kubebuilder:default:=false
-	// Required specifies whether or not a value for this parameter must be
-	// supplied when authoring an Application.
-	Required *bool `json:"required,omitempty"`
-
-	// Description of this parameter.
-	Description *string `json:"description,omitempty"`
-}
-
-// CUE defines the encapsulation in CUE format
-type CUE struct {
-	// Template defines the abstraction template data of the capability, it will replace the old CUE template in extension field.
-	// Template is a required field if CUE is defined in Capability Definition.
-	Template string `json:"template"`
-}
-
-// Schematic defines the encapsulation of this capability(workload/trait/scope),
-// the encapsulation can be defined in different ways, e.g. CUE/HCL(terraform)/KUBE(K8s Object)/HELM, etc...
-type Schematic struct {
-	KUBE *Kube `json:"kube,omitempty"`
-
-	CUE *CUE `json:"cue,omitempty"`
-
-	HELM *Helm `json:"helm,omitempty"`
-
-	Terraform *Terraform `json:"terraform,omitempty"`
-}
-
-// A Helm represents resources used by a Helm module
-type Helm struct {
-	// Release records a Helm release used by a Helm module workload.
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Release runtime.RawExtension `json:"release"`
-
-	// HelmRelease records a Helm repository used by a Helm module workload.
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Repository runtime.RawExtension `json:"repository"`
-}
-
-// Terraform is the struct to describe cloud resources managed by Hashicorp Terraform
-type Terraform struct {
-	// Configuration is Terraform Configuration
-	Configuration string `json:"configuration"`
-
-	// Type specifies which Terraform configuration it is, HCL or JSON syntax
-	// +kubebuilder:default:=hcl
-	// +kubebuilder:validation:Enum:=hcl;json
-	Type string `json:"type,omitempty"`
-}
-
-// A WorkloadTypeDescriptor refer to a Workload Type
-type WorkloadTypeDescriptor struct {
-	// Type ref to a WorkloadDefinition via name
-	Type string `json:"type,omitempty"`
-	// Definition mutually exclusive to workload.type, a embedded WorkloadDefinition
-	Definition WorkloadGVK `json:"definition,omitempty"`
-}
-
-// WorkloadGVK refer to a Workload Type
-type WorkloadGVK struct {
-	APIVersion string `json:"apiVersion"`
-	Kind       string `json:"kind"`
-}
-
-// A DefinitionReference refers to a CustomResourceDefinition by name.
-type DefinitionReference struct {
-	// Name of the referenced CustomResourceDefinition.
-	Name string `json:"name"`
-
-	// Version indicate which version should be used if CRD has multiple versions
-	// by default it will use the first one if not specified
-	Version string `json:"version,omitempty"`
-}
-
-// A ChildResourceKind defines a child Kubernetes resource kind with a selector
-type ChildResourceKind struct {
-	// APIVersion of the child resource
-	APIVersion string `json:"apiVersion"`
-
-	// Kind of the child resource
-	Kind string `json:"kind"`
-
-	// Selector to select the child resources that the workload wants to expose to traits
-	Selector map[string]string `json:"selector,omitempty"`
-}
-
-// Status defines the loop back status of the abstraction by using CUE template
-type Status struct {
-	// CustomStatus defines the custom status message that could display to user
-	// +optional
-	CustomStatus string `json:"customStatus,omitempty"`
-	// HealthPolicy defines the health check policy for the abstraction
-	// +optional
-	HealthPolicy string `json:"healthPolicy,omitempty"`
-}
-
-// ApplicationPhase is a label for the condition of a application at the current time
-type ApplicationPhase string
-
-const (
-	// ApplicationRollingOut means the app is in the middle of rolling out
-	ApplicationRollingOut ApplicationPhase = "rollingOut"
-	// ApplicationRendering means the app is rendering
-	ApplicationRendering ApplicationPhase = "rendering"
-	// 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
-	ApplicationHealthChecking ApplicationPhase = "healthChecking"
-)
-
-// ApplicationComponentStatus record the health status of App component
-type ApplicationComponentStatus struct {
-	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
-type ApplicationTraitStatus struct {
-	Type    string `json:"type"`
-	Healthy bool   `json:"healthy"`
-	Message string `json:"message,omitempty"`
-}
-
-// Revision has name and revision number
-type Revision struct {
-	Name     string `json:"name"`
-	Revision int64  `json:"revision"`
-
-	// RevisionHash record the hash value of the spec of ApplicationRevision object.
-	RevisionHash string `json:"revisionHash,omitempty"`
-}
-
-// RawComponent record raw component
-type RawComponent struct {
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Raw runtime.RawExtension `json:"raw"`
-}
-
-// WorkflowStepStatus record the status of a workflow step
-type WorkflowStepStatus struct {
-	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
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-
-	Rollout AppRolloutStatus `json:"rollout,omitempty"`
-
-	Phase ApplicationPhase `json:"status,omitempty"`
-
-	// Components record the related Components created by Application Controller
-	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 *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

@@ -1,391 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package common
-
-import (
-	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppStatus) DeepCopyInto(out *AppStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	in.Rollout.DeepCopyInto(&out.Rollout)
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]v1alpha1.TypedReference, len(*in))
-		copy(*out, *in)
-	}
-	if in.Services != nil {
-		in, out := &in.Services, &out.Services
-		*out = make([]ApplicationComponentStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ResourceTracker != nil {
-		in, out := &in.ResourceTracker, &out.ResourceTracker
-		*out = new(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)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
-func (in *AppStatus) DeepCopy() *AppStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *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.
-func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationComponentStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationTraitStatus) DeepCopyInto(out *ApplicationTraitStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTraitStatus.
-func (in *ApplicationTraitStatus) DeepCopy() *ApplicationTraitStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationTraitStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CUE) DeepCopyInto(out *CUE) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CUE.
-func (in *CUE) DeepCopy() *CUE {
-	if in == nil {
-		return nil
-	}
-	out := new(CUE)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ChildResourceKind) DeepCopyInto(out *ChildResourceKind) {
-	*out = *in
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChildResourceKind.
-func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
-	if in == nil {
-		return nil
-	}
-	out := new(ChildResourceKind)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DefinitionReference) DeepCopyInto(out *DefinitionReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionReference.
-func (in *DefinitionReference) DeepCopy() *DefinitionReference {
-	if in == nil {
-		return nil
-	}
-	out := new(DefinitionReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Helm) DeepCopyInto(out *Helm) {
-	*out = *in
-	in.Release.DeepCopyInto(&out.Release)
-	in.Repository.DeepCopyInto(&out.Repository)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Helm.
-func (in *Helm) DeepCopy() *Helm {
-	if in == nil {
-		return nil
-	}
-	out := new(Helm)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Kube) DeepCopyInto(out *Kube) {
-	*out = *in
-	in.Template.DeepCopyInto(&out.Template)
-	if in.Parameters != nil {
-		in, out := &in.Parameters, &out.Parameters
-		*out = make([]KubeParameter, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kube.
-func (in *Kube) DeepCopy() *Kube {
-	if in == nil {
-		return nil
-	}
-	out := new(Kube)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KubeParameter) DeepCopyInto(out *KubeParameter) {
-	*out = *in
-	if in.FieldPaths != nil {
-		in, out := &in.FieldPaths, &out.FieldPaths
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Required != nil {
-		in, out := &in.Required, &out.Required
-		*out = new(bool)
-		**out = **in
-	}
-	if in.Description != nil {
-		in, out := &in.Description, &out.Description
-		*out = new(string)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeParameter.
-func (in *KubeParameter) DeepCopy() *KubeParameter {
-	if in == nil {
-		return nil
-	}
-	out := new(KubeParameter)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RawComponent) DeepCopyInto(out *RawComponent) {
-	*out = *in
-	in.Raw.DeepCopyInto(&out.Raw)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RawComponent.
-func (in *RawComponent) DeepCopy() *RawComponent {
-	if in == nil {
-		return nil
-	}
-	out := new(RawComponent)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Revision) DeepCopyInto(out *Revision) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Revision.
-func (in *Revision) DeepCopy() *Revision {
-	if in == nil {
-		return nil
-	}
-	out := new(Revision)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Schematic) DeepCopyInto(out *Schematic) {
-	*out = *in
-	if in.KUBE != nil {
-		in, out := &in.KUBE, &out.KUBE
-		*out = new(Kube)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.CUE != nil {
-		in, out := &in.CUE, &out.CUE
-		*out = new(CUE)
-		**out = **in
-	}
-	if in.HELM != nil {
-		in, out := &in.HELM, &out.HELM
-		*out = new(Helm)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Terraform != nil {
-		in, out := &in.Terraform, &out.Terraform
-		*out = new(Terraform)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schematic.
-func (in *Schematic) DeepCopy() *Schematic {
-	if in == nil {
-		return nil
-	}
-	out := new(Schematic)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Status) DeepCopyInto(out *Status) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Status.
-func (in *Status) DeepCopy() *Status {
-	if in == nil {
-		return nil
-	}
-	out := new(Status)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *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
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadGVK.
-func (in *WorkloadGVK) DeepCopy() *WorkloadGVK {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkloadGVK)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkloadTypeDescriptor) DeepCopyInto(out *WorkloadTypeDescriptor) {
-	*out = *in
-	out.Definition = in.Definition
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadTypeDescriptor.
-func (in *WorkloadTypeDescriptor) DeepCopy() *WorkloadTypeDescriptor {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkloadTypeDescriptor)
-	in.DeepCopyInto(out)
-	return out
-}

apis/core.oam.dev/groupversion_info.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +21,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 )
 
 func init() {
 	// Register the types with the Scheme so the resources can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme, v1beta1.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme)
 }
 
 // AddToSchemes may be used to add all resources defined in the project to a Scheme

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

@@ -0,0 +1,81 @@
+/*
+Copyright 2020 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+)
+
+// ApplicationDeploymentSpec defines how to describe an upgrade between different application
+type ApplicationDeploymentSpec struct {
+	// TargetApplicationName contains the name of the application that we need to upgrade to.
+	// We assume that an application is immutable, thus the name alone is suffice
+	TargetApplicationName string `json:"targetApplicationName"`
+
+	// SourceApplicationName contains the name of the application that we need to upgrade from.
+	// it can be empty only when it's the first time to deploy the application
+	SourceApplicationName string `json:"sourceApplicationName,omitempty"`
+
+	// The list of component to upgrade in the application.
+	// We only support single component application so far
+	// TODO: (RZ) Support multiple components in an application
+	// +optional
+	ComponentList []string `json:"componentList,omitempty"`
+
+	// RolloutPlan is the details on how to rollout the resources
+	RolloutPlan v1alpha1.RolloutPlan `json:"rolloutPlan"`
+
+	// RevertOnDelete revert the rollout when the rollout CR is deleted, default is false
+	// It will remove the target application from the kubernetes
+	// +optional
+	RevertOnDelete *bool `json:"revertOnDelete,omitempty"`
+}
+
+// ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
+type ApplicationDeploymentStatus struct {
+	v1alpha1.RolloutStatus `json:",inline"`
+
+	// LastTargetApplicationName contains the name of the application that we upgraded to
+	// We will restart the rollout if this is not the same as the spec
+	LastTargetApplicationName string `json:"lastTargetApplicationName"`
+
+	// LastSourceApplicationName contains the name of the application that we need to upgrade from.
+	// We will restart the rollout if this is not the same as the spec
+	LastSourceApplicationName string `json:"lastSourceApplicationName,omitempty"`
+}
+
+// ApplicationDeployment is the Schema for the ApplicationDeployment API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type ApplicationDeployment struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ApplicationDeploymentSpec   `json:"spec,omitempty"`
+	Status ApplicationDeploymentStatus `json:"status,omitempty"`
+}
+
+// ApplicationDeploymentList contains a list of ApplicationDeployment
+// +kubebuilder:object:root=true
+type ApplicationDeploymentList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationDeployment `json:"items"`
+}

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,41 +21,61 @@ 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"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
+// ApplicationPhase is a label for the condition of a application at the current time
+type ApplicationPhase string
+
+const (
+	// ApplicationRollingOut means the app is in the middle of rolling out
+	ApplicationRollingOut ApplicationPhase = "rollingOut"
+	// ApplicationRendering means the app is rendering
+	ApplicationRendering ApplicationPhase = "rendering"
+	// ApplicationRunning means the app finished rendering and applied result to the cluster
+	ApplicationRunning ApplicationPhase = "running"
+	// ApplicationHealthChecking means the app finished rendering and applied result to the cluster, but still unhealthy
+	ApplicationHealthChecking ApplicationPhase = "healthChecking"
+)
+
 // AppStatus defines the observed state of Application
 type AppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	v1alpha1.RolloutStatus `json:",inline"`
 
-	Phase common.ApplicationPhase `json:"status,omitempty"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+
+	Phase ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
 	Components []runtimev1alpha1.TypedReference `json:"components,omitempty"`
 
 	// Services record the status of the application services
-	Services []common.ApplicationComponentStatus `json:"services,omitempty"`
+	Services []ApplicationComponentStatus `json:"services,omitempty"`
+}
 
-	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *runtimev1alpha1.TypedReference `json:"resourceTracker,omitempty"`
+// ApplicationComponentStatus record the health status of App component
+type ApplicationComponentStatus struct {
+	Name    string                   `json:"name"`
+	Healthy bool                     `json:"healthy"`
+	Message string                   `json:"message,omitempty"`
+	Traits  []ApplicationTraitStatus `json:"traits,omitempty"`
+}
 
-	// LatestRevision of the application configuration it generates
-	// +optional
-	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
+// ApplicationTraitStatus records the trait health status
+type ApplicationTraitStatus struct {
+	Type    string `json:"type"`
+	Healthy bool   `json:"healthy"`
+	Message string `json:"message,omitempty"`
 }
 
 // ApplicationTrait defines the trait of application
 type ApplicationTrait struct {
 	Name string `json:"name"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
+	Properties runtime.RawExtension `json:"properties"`
 }
 
 // ApplicationComponent describe the component of application
@@ -63,7 +83,7 @@ type ApplicationComponent struct {
 	Name         string `json:"name"`
 	WorkloadType string `json:"type"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Settings runtime.RawExtension `json:"settings,omitempty"`
+	Settings runtime.RawExtension `json:"settings"`
 
 	// Traits define the trait of one component, the type must be array to keep the order.
 	Traits []ApplicationTrait `json:"traits,omitempty"`
@@ -79,29 +99,18 @@ type ApplicationSpec struct {
 	Components []ApplicationComponent `json:"components"`
 
 	// TODO(wonderflow): we should have application level scopes supported here
-
-	// RolloutPlan is the details on how to rollout the resources
-	// The controller simply replace the old resources with the new one if there is no rollout plan involved
-	// +optional
-	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
 }
 
-// Application is the Schema for the applications API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName=app
+
+// Application is the Schema for the applications API
 // +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
-// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
-// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
-// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ApplicationSpec  `json:"spec,omitempty"`
-	Status common.AppStatus `json:"status,omitempty"`
+	Spec   ApplicationSpec `json:"spec,omitempty"`
+	Status AppStatus       `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -1,19 +1,3 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 package v1alpha2
 
 import (
@@ -21,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestApplicationGetComponent(t *testing.T) {
+func TestApplication_GetComponent(t *testing.T) {
 	ac1 := ApplicationComponent{
 		Name:         "ac1",
 		WorkloadType: "type1",

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

@@ -1,48 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// ApplicationContextSpec is the spec of ApplicationContext
-type ApplicationContextSpec struct {
-	// ApplicationRevisionName points to the snapshot of an Application with all its closure
-	ApplicationRevisionName string `json:"applicationRevisionName"`
-}
-
-// ApplicationContext is the Schema for the ApplicationContext API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=appcontext,categories={oam}
-// +kubebuilder:subresource:status
-type ApplicationContext struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ApplicationContextSpec `json:"spec,omitempty"`
-	// we need to reuse the AC status
-	Status ApplicationConfigurationStatus `json:"status,omitempty"`
-}
-
-// ApplicationContextList contains a list of ApplicationContext
-// +kubebuilder:object:root=true
-type ApplicationContextList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationContext `json:"items"`
-}

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

@@ -1,73 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// ApplicationRevisionSpec is the spec of ApplicationRevision
-type ApplicationRevisionSpec struct {
-	// Application records the snapshot of the created/modified Application
-	Application Application `json:"application"`
-
-	// ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
-	ComponentDefinitions map[string]ComponentDefinition `json:"componentDefinitions,omitempty"`
-
-	// WorkloadDefinitions records the snapshot of the workloadDefinitions related with the created/modified Application
-	WorkloadDefinitions map[string]WorkloadDefinition `json:"workloadDefinitions,omitempty"`
-
-	// TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
-	TraitDefinitions map[string]TraitDefinition `json:"traitDefinitions,omitempty"`
-
-	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
-	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
-
-	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
-
-	Components []common.RawComponent `json:"components,omitempty"`
-
-	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
-	// it will contains the whole K8s CR of trait and the reference component in it.
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
-}
-
-// ApplicationRevision is the Schema for the ApplicationRevision API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName=apprev
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type ApplicationRevision struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
-}
-
-// ApplicationRevisionList contains a list of ApplicationRevision
-// +kubebuilder:object:root=true
-type ApplicationRevisionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationRevision `json:"items"`
-}

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

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

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

@@ -1,102 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// ComponentDefinitionSpec defines the desired state of ComponentDefinition
-type ComponentDefinitionSpec struct {
-	// Workload is a workload type descriptor
-	Workload common.WorkloadTypeDescriptor `json:"workload"`
-
-	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
-
-	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
-	// can be used by trait to create resource selectors(e.g. label selector for pods).
-	// +optional
-	RevisionLabel string `json:"revisionLabel,omitempty"`
-
-	// PodSpecPath indicates where/if this workload has K8s podSpec field
-	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
-	// +optional
-	PodSpecPath string `json:"podSpecPath,omitempty"`
-
-	// Status defines the custom health policy and status message for workload
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the workload
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// ComponentDefinitionStatus is the status of ComponentDefinition
-type ComponentDefinitionStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	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
-
-// ComponentDefinition is the Schema for the componentdefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-type ComponentDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ComponentDefinitionSpec   `json:"spec,omitempty"`
-	Status ComponentDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for WorkloadDefinition
-func (cd *ComponentDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	cd.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from WorkloadDefinition
-func (cd *ComponentDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return cd.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// ComponentDefinitionList contains a list of ComponentDefinition
-type ComponentDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ComponentDefinition `json:"items"`
-}

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

@@ -1,134 +0,0 @@
-/*
- Copyright 2021 The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1alpha2
-
-import (
-	"fmt"
-	"reflect"
-
-	"k8s.io/klog/v2"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-)
-
-// ApplicationV1alpha2ToV1beta1 will convert v1alpha2 to v1beta1
-func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application) {
-	// 1) convert metav1.TypeMeta
-	// apiVersion and Kind automatically converted
-
-	// 2) convert metav1.ObjectMeta
-	v1b1.ObjectMeta = *v1a2.ObjectMeta.DeepCopy()
-
-	// 3) convert Spec  ApplicationSpec
-	// 3.1) convert Spec.Components
-	for _, comp := range v1a2.Spec.Components {
-
-		// convert trait, especially for `.name` -> `.type`
-		var traits = make([]v1beta1.ApplicationTrait, len(comp.Traits))
-		for j, trait := range comp.Traits {
-			traits[j] = v1beta1.ApplicationTrait{
-				Type:       trait.Name,
-				Properties: *trait.Properties.DeepCopy(),
-			}
-		}
-
-		// deep copy scopes
-		scopes := make(map[string]string)
-		for k, v := range comp.Scopes {
-			scopes[k] = v
-		}
-		// convert component
-		// `.settings` -> `.properties`
-		v1b1.Spec.Components = append(v1b1.Spec.Components, v1beta1.ApplicationComponent{
-			Name:       comp.Name,
-			Type:       comp.WorkloadType,
-			Properties: *comp.Settings.DeepCopy(),
-			Traits:     traits,
-			Scopes:     scopes,
-		})
-	}
-	// 3.2) convert Spec.RolloutPlan
-	v1b1.Spec.RolloutPlan = v1a2.Spec.RolloutPlan.DeepCopy()
-
-	// 4) convert Status common.AppStatus
-	v1b1.Status = *v1a2.Status.DeepCopy()
-}
-
-// ConvertTo converts this Application to the Hub version (v1beta1 only for now).
-func (app *Application) ConvertTo(dst conversion.Hub) error {
-	switch convertedApp := dst.(type) {
-	case *v1beta1.Application:
-		klog.Infof("convert *v1alpha2.Application [%s] to *v1beta1.Application", app.Name)
-		ApplicationV1alpha2ToV1beta1(app, convertedApp)
-		return nil
-	default:
-	}
-	return fmt.Errorf("unsupported convertTo object %v", reflect.TypeOf(dst))
-}
-
-// ConvertFrom converts from the Hub version (v1beta1) to this version (v1alpha2).
-func (app *Application) ConvertFrom(src conversion.Hub) error {
-	switch sourceApp := src.(type) {
-	case *v1beta1.Application:
-
-		klog.Infof("convert *v1alpha2.Application from *v1beta1.Application [%s]", sourceApp.Name)
-
-		// 1) convert metav1.TypeMeta
-		// apiVersion and Kind automatically converted
-
-		// 2) convert metav1.ObjectMeta
-		app.ObjectMeta = *sourceApp.ObjectMeta.DeepCopy()
-
-		// 3) convert Spec  ApplicationSpec
-		// 3.1) convert Spec.Components
-		for _, comp := range sourceApp.Spec.Components {
-
-			// convert trait, especially for `.type` -> `.name`
-			var traits = make([]ApplicationTrait, len(comp.Traits))
-			for j, trait := range comp.Traits {
-				traits[j] = ApplicationTrait{
-					Name:       trait.Type,
-					Properties: *trait.Properties.DeepCopy(),
-				}
-			}
-
-			// deep copy scopes
-			scopes := make(map[string]string)
-			for k, v := range comp.Scopes {
-				scopes[k] = v
-			}
-			// convert component
-			//  `.properties` -> `.settings`
-			app.Spec.Components = append(app.Spec.Components, ApplicationComponent{
-				Name:         comp.Name,
-				WorkloadType: comp.Type,
-				Settings:     *comp.Properties.DeepCopy(),
-				Traits:       traits,
-				Scopes:       scopes,
-			})
-		}
-		// 3.2) convert Spec.RolloutPlan
-		app.Spec.RolloutPlan = sourceApp.Spec.RolloutPlan.DeepCopy()
-
-		// 4) convert Status common.AppStatus
-		app.Status = *sourceApp.Status.DeepCopy()
-		return nil
-	default:
-	}
-	return fmt.Errorf("unsupported ConvertFrom object %v", reflect.TypeOf(src))
-}

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,7 +83,7 @@ type WorkloadHealthCondition struct {
 // +kubebuilder:object:root=true
 
 // A HealthScope determines an aggregate health status based of the health of components.
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={crossplane,oam}
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".status.health",name=HEALTH,type=string
 type HealthScope struct {

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ type ManualScalerTraitStatus struct {
 // +kubebuilder:object:root=true
 
 // A ManualScalerTrait determines how many replicas a workload should have.
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={crossplane,oam}
 // +kubebuilder:subresource:status
 type ManualScalerTrait struct {
 	metav1.TypeMeta   `json:",inline"`

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,22 +17,56 @@ limitations under the License.
 package v1alpha2
 
 import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/types"
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 )
 
+// CUE defines the encapsulation in CUE format
+type CUE struct {
+	// Template defines the abstraction template data of the capability, it will replace the old CUE template in extension field.
+	// Template is a required field if CUE is defined in Capability Definition.
+	Template string `json:"template"`
+}
+
+// Schematic defines the encapsulation of this capability(workload/trait/scope),
+// the encapsulation can be defined in different ways, e.g. CUE/HCL(terraform)/KUBE(K8s Object)/HELM, etc...
+type Schematic struct {
+	CUE *CUE `json:"cue,omitempty"`
+	// TODO(wonderflow): support HCL(terraform)/KUBE(K8s Object)/HELM here.
+}
+
+// A DefinitionReference refers to a CustomResourceDefinition by name.
+type DefinitionReference struct {
+	// Name of the referenced CustomResourceDefinition.
+	Name string `json:"name"`
+
+	// Version indicate which version should be used if CRD has multiple versions
+	// by default it will use the first one if not specified
+	Version string `json:"version,omitempty"`
+}
+
+// A ChildResourceKind defines a child Kubernetes resource kind with a selector
+type ChildResourceKind struct {
+	// APIVersion of the child resource
+	APIVersion string `json:"apiVersion"`
+
+	// Kind of the child resource
+	Kind string `json:"kind"`
+
+	// Selector to select the child resources that the workload wants to expose to traits
+	Selector map[string]string `json:"selector,omitempty"`
+}
+
 // A WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
 type WorkloadDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this workload kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
+	Reference DefinitionReference `json:"definitionRef"`
 
 	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
+	ChildResourceKinds []ChildResourceKind `json:"childResourceKinds,omitempty"`
 
 	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
 	// can be used by trait to create resource selectors(e.g. label selector for pods).
@@ -46,11 +80,16 @@ type WorkloadDefinitionSpec struct {
 
 	// Status defines the custom health policy and status message for workload
 	// +optional
-	Status *common.Status `json:"status,omitempty"`
+	Status *Status `json:"status,omitempty"`
+
+	// Template defines the abstraction template data of the workload, it will replace the old template in extension field.
+	// the data format depends on templateType, by default it's CUE
+	// +optional
+	Template string `json:"template,omitempty"`
 
 	// Schematic defines the data format and template of the encapsulation of the workload
 	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
+	Schematic *Schematic `json:"schematic,omitempty"`
 
 	// Extension is used for extension needs by OAM platform builders
 	// +optional
@@ -58,9 +97,14 @@ type WorkloadDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
-// WorkloadDefinitionStatus is the status of WorkloadDefinition
-type WorkloadDefinitionStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+// Status defines the loop back status of the abstraction by using CUE template
+type Status struct {
+	// CustomStatus defines the custom status message that could display to user
+	// +optional
+	CustomStatus string `json:"customStatus,omitempty"`
+	// HealthPolicy defines the health check policy for the abstraction
+	// +optional
+	HealthPolicy string `json:"healthPolicy,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -69,24 +113,13 @@ type WorkloadDefinitionStatus struct {
 // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
 // is used to validate the schema of the workload when it is embedded in an OAM
 // Component.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
-// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
+// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
-	Status WorkloadDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for WorkloadDefinition
-func (wd *WorkloadDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	wd.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from WorkloadDefinition
-func (wd *WorkloadDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return wd.Status.GetCondition(conditionType)
+	Spec WorkloadDefinitionSpec `json:"spec,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -101,7 +134,7 @@ type WorkloadDefinitionList struct {
 // A TraitDefinitionSpec defines the desired state of a TraitDefinition.
 type TraitDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
-	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
+	Reference DefinitionReference `json:"definitionRef,omitempty"`
 
 	// Revision indicates whether a trait is aware of component revision
 	// +optional
@@ -111,10 +144,6 @@ type TraitDefinitionSpec struct {
 	// +optional
 	WorkloadRefPath string `json:"workloadRefPath,omitempty"`
 
-	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
-	// +optional
-	PodDisruptive bool `json:"podDisruptive,omitempty"`
-
 	// AppliesToWorkloads specifies the list of workload kinds this trait
 	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
@@ -136,11 +165,11 @@ type TraitDefinitionSpec struct {
 
 	// Schematic defines the data format and template of the encapsulation of the trait
 	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
+	Schematic *Schematic `json:"schematic,omitempty"`
 
 	// Status defines the custom health policy and status message for trait
 	// +optional
-	Status *common.Status `json:"status,omitempty"`
+	Status *Status `json:"status,omitempty"`
 
 	// Extension is used for extension needs by OAM platform builders
 	// +optional
@@ -148,43 +177,19 @@ type TraitDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
-// TraitDefinitionStatus is the status of TraitDefinition
-type TraitDefinitionStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	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
 
 // A TraitDefinition registers a kind of Kubernetes custom resource as a valid
 // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
 // to validate the schema of the trait when it is embedded in an OAM
 // ApplicationConfiguration.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
-	Status TraitDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for TraitDefinition
-func (td *TraitDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	td.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from TraitDefinition
-func (td *TraitDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return td.Status.GetCondition(conditionType)
+	Spec TraitDefinitionSpec `json:"spec,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -199,7 +204,7 @@ type TraitDefinitionList struct {
 // A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
 type ScopeDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this scope kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
+	Reference DefinitionReference `json:"definitionRef"`
 
 	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
 	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
@@ -221,7 +226,7 @@ type ScopeDefinitionSpec struct {
 // to validate the schema of the scope when it is embedded in an OAM
 // ApplicationConfiguration.
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -272,10 +277,6 @@ type ComponentSpec struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Workload runtime.RawExtension `json:"workload"`
 
-	// HelmRelease records a Helm release used by a Helm module workload.
-	// +optional
-	Helm *common.Helm `json:"helm,omitempty"`
-
 	// Parameters exposed by this component. ApplicationConfigurations that
 	// reference this component may specify values for these parameters, which
 	// will in turn be injected into the embedded workload.
@@ -293,15 +294,21 @@ type ComponentStatus struct {
 
 	// LatestRevision of component
 	// +optional
-	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
+	LatestRevision *Revision `json:"latestRevision,omitempty"`
 
 	// One Component should only be used by one AppConfig
 }
 
+// Revision has name and revision number
+type Revision struct {
+	Name     string `json:"name"`
+	Revision int64  `json:"revision"`
+}
+
 // +kubebuilder:object:root=true
 
 // A Component describes how an OAM workload kind may be instantiated.
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={crossplane,oam}
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".spec.workload.kind",name=WORKLOAD-KIND,type=string
 // +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
@@ -488,9 +495,6 @@ type ApplicationConfigurationStatus struct {
 
 	Dependency DependencyStatus `json:"dependency,omitempty"`
 
-	// RollingStatus indicates what phase are we in the rollout phase
-	RollingStatus types.RollingStatus `json:"rollingStatus,omitempty"`
-
 	// Workloads created by this ApplicationConfiguration.
 	Workloads []WorkloadStatus `json:"workloads,omitempty"`
 
@@ -531,7 +535,7 @@ type DependencyToObject struct {
 // +kubebuilder:object:root=true
 
 // An ApplicationConfiguration represents an OAM application.
-// +kubebuilder:resource:shortName=appconfig,categories={oam}
+// +kubebuilder:resource:shortName=appconfig,categories={crossplane,oam}
 // +kubebuilder:subresource:status
 type ApplicationConfiguration struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -563,50 +567,8 @@ type DataOutput struct {
 	// If no conditions is specified, it is by default to check output value not empty.
 	// +optional
 	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-	// OutputStore specifies the object used to store intermediate data generated by Operations
-	OutputStore StoreReference `json:"outputStore,omitempty"`
 }
 
-// StoreReference specifies the referenced object in DataOutput or DataInput
-type StoreReference struct {
-	runtimev1alpha1.TypedReference `json:",inline"`
-	// Operations specify the data processing operations
-	Operations []DataOperation `json:"operations,omitempty"`
-}
-
-// DataOperation defines the specific operation for data
-type DataOperation struct {
-	// Type specifies the type of DataOperation
-	Type string `json:"type"`
-	// Operator specifies the operation under this DataOperation type
-	Operator DataOperator `json:"op"`
-	// ToFieldPath refers to the value of an object's field
-	ToFieldPath string `json:"toFieldPath"`
-	// ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-	ToDataPath string `json:"toDataPath,omitempty"`
-	// +optional
-	// Value specifies an expected value
-	// This is mutually exclusive with ValueFrom
-	Value string `json:"value,omitempty"`
-	// +optional
-	// ValueFrom specifies expected value from object such as workload and trait
-	// This is mutually exclusive with Value
-	ValueFrom  ValueFrom              `json:"valueFrom,omitempty"`
-	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-}
-
-// DataOperator defines the type of Operator in DataOperation
-type DataOperator string
-
-const (
-	// AddOperator specifies the add operation for data passing
-	AddOperator DataOperator = "add"
-	// DeleteOperator specifies the delete operation for data passing
-	DeleteOperator DataOperator = "delete"
-	// ReplaceOperator specifies the replace operation for data passing
-	ReplaceOperator DataOperator = "replace"
-)
-
 // DataInput specifies a data input sink to an object.
 // If input is array, it will be appended to the target field paths.
 type DataInput struct {
@@ -621,12 +583,6 @@ type DataInput struct {
 	// If StrategyMergeKeys specified, we will check the key in the target array.
 	// If any key exist, do update; if no key exist, append.
 	StrategyMergeKeys []string `json:"strategyMergeKeys,omitempty"`
-
-	// When the Conditions is satified, ToFieldPaths will be filled with passed value
-	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-
-	// InputStore specifies the object used to read intermediate data genereted by DataOutput
-	InputStore StoreReference `json:"inputStore,omitempty"`
 }
 
 // DataInputValueFrom specifies the value source for a data input.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -389,7 +389,7 @@ var _ oam.Workload = &ContainerizedWorkload{}
 // +kubebuilder:object:root=true
 
 // A ContainerizedWorkload is a workload that runs OCI containers.
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={crossplane,oam}
 // +kubebuilder:subresource:status
 type ContainerizedWorkload struct {
 	metav1.TypeMeta   `json:",inline"`

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+Copyright 2020 The KubeVela Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -37,14 +37,6 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )
 
-// ComponentDefinition type metadata.
-var (
-	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
-	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
-	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
-	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
-)
-
 // WorkloadDefinition type metadata.
 var (
 	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
@@ -85,14 +77,6 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )
 
-// ApplicationContext type metadata.
-var (
-	ApplicationContextKind             = reflect.TypeOf(ApplicationContext{}).Name()
-	ApplicationContextGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationContextKind}.String()
-	ApplicationContextKindAPIVersion   = ApplicationContextKind + "." + SchemeGroupVersion.String()
-	ApplicationContextGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationContextKind)
-)
-
 // ContainerizedWorkload type metadata.
 var (
 	ContainerizedWorkloadKind             = reflect.TypeOf(ContainerizedWorkload{}).Name()
@@ -125,24 +109,15 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
-// AppRollout type metadata.
+// Application type metadata.
 var (
-	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
-	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
-	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
-)
-
-// ApplicationRevision type metadata
-var (
-	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
-	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
-	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
-	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
+	ApplicationDeploymentKind            = reflect.TypeOf(ApplicationDeployment{}).Name()
+	ApplicationDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationDeploymentKind}.String()
+	ApplicationDeploymentKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	ApplicationDeploymentKindVersionKind = SchemeGroupVersion.WithKind(ApplicationDeploymentKind)
 )
 
 func init() {
-	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
 	SchemeBuilder.Register(&TraitDefinition{}, &TraitDefinitionList{})
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
@@ -152,7 +127,5 @@ func init() {
 	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
-	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
-	SchemeBuilder.Register(&ApplicationContext{}, &ApplicationContextList{})
+	SchemeBuilder.Register(&ApplicationDeployment{}, &ApplicationDeploymentList{})
 }

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

@@ -23,116 +23,12 @@ 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"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRollout) DeepCopyInto(out *AppRollout) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
-func (in *AppRollout) DeepCopy() *AppRollout {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRollout) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppRollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
-func (in *AppRolloutList) DeepCopy() *AppRolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
-	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-	if in.RevertOnDelete != nil {
-		in, out := &in.RevertOnDelete, &out.RevertOnDelete
-		*out = new(bool)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
-func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1alpha1.TypedReference, len(*in))
@@ -140,21 +36,11 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	}
 	if in.Services != nil {
 		in, out := &in.Services, &out.Services
-		*out = make([]common.ApplicationComponentStatus, len(*in))
+		*out = make([]ApplicationComponentStatus, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.ResourceTracker != nil {
-		in, out := &in.ResourceTracker, &out.ResourceTracker
-		*out = new(v1alpha1.TypedReference)
-		**out = **in
-	}
-	if in.LatestRevision != nil {
-		in, out := &in.LatestRevision, &out.LatestRevision
-		*out = new(common.Revision)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -224,6 +110,26 @@ func (in *ApplicationComponent) DeepCopy() *ApplicationComponent {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStatus) {
+	*out = *in
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]ApplicationTraitStatus, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponentStatus.
+func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationComponentStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationConfiguration) DeepCopyInto(out *ApplicationConfiguration) {
 	*out = *in
@@ -381,26 +287,26 @@ func (in *ApplicationConfigurationStatus) DeepCopy() *ApplicationConfigurationSt
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationContext) DeepCopyInto(out *ApplicationContext) {
+func (in *ApplicationDeployment) DeepCopyInto(out *ApplicationDeployment) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContext.
-func (in *ApplicationContext) DeepCopy() *ApplicationContext {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeployment.
+func (in *ApplicationDeployment) DeepCopy() *ApplicationDeployment {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationContext)
+	out := new(ApplicationDeployment)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationContext) DeepCopyObject() runtime.Object {
+func (in *ApplicationDeployment) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -408,31 +314,31 @@ func (in *ApplicationContext) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationContextList) DeepCopyInto(out *ApplicationContextList) {
+func (in *ApplicationDeploymentList) DeepCopyInto(out *ApplicationDeploymentList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]ApplicationContext, len(*in))
+		*out = make([]ApplicationDeployment, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContextList.
-func (in *ApplicationContextList) DeepCopy() *ApplicationContextList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentList.
+func (in *ApplicationDeploymentList) DeepCopy() *ApplicationDeploymentList {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationContextList)
+	out := new(ApplicationDeploymentList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationContextList) DeepCopyObject() runtime.Object {
+func (in *ApplicationDeploymentList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -440,16 +346,43 @@ func (in *ApplicationContextList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationContextSpec) DeepCopyInto(out *ApplicationContextSpec) {
+func (in *ApplicationDeploymentSpec) DeepCopyInto(out *ApplicationDeploymentSpec) {
 	*out = *in
+	if in.ComponentList != nil {
+		in, out := &in.ComponentList, &out.ComponentList
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
+	if in.RevertOnDelete != nil {
+		in, out := &in.RevertOnDelete, &out.RevertOnDelete
+		*out = new(bool)
+		**out = **in
+	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContextSpec.
-func (in *ApplicationContextSpec) DeepCopy() *ApplicationContextSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentSpec.
+func (in *ApplicationDeploymentSpec) DeepCopy() *ApplicationDeploymentSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationContextSpec)
+	out := new(ApplicationDeploymentSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationDeploymentStatus) DeepCopyInto(out *ApplicationDeploymentStatus) {
+	*out = *in
+	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentStatus.
+func (in *ApplicationDeploymentStatus) DeepCopy() *ApplicationDeploymentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationDeploymentStatus)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -486,116 +419,6 @@ func (in *ApplicationList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevision) DeepCopyInto(out *ApplicationRevision) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevision.
-func (in *ApplicationRevision) DeepCopy() *ApplicationRevision {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevision)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationRevision) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevisionList) DeepCopyInto(out *ApplicationRevisionList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ApplicationRevision, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionList.
-func (in *ApplicationRevisionList) DeepCopy() *ApplicationRevisionList {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevisionList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationRevisionList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
-	*out = *in
-	in.Application.DeepCopyInto(&out.Application)
-	if in.ComponentDefinitions != nil {
-		in, out := &in.ComponentDefinitions, &out.ComponentDefinitions
-		*out = make(map[string]ComponentDefinition, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
-	if in.WorkloadDefinitions != nil {
-		in, out := &in.WorkloadDefinitions, &out.WorkloadDefinitions
-		*out = make(map[string]WorkloadDefinition, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
-	if in.TraitDefinitions != nil {
-		in, out := &in.TraitDefinitions, &out.TraitDefinitions
-		*out = make(map[string]TraitDefinition, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
-	if in.ScopeDefinitions != nil {
-		in, out := &in.ScopeDefinitions, &out.ScopeDefinitions
-		*out = make(map[string]ScopeDefinition, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]common.RawComponent, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	in.ApplicationConfiguration.DeepCopyInto(&out.ApplicationConfiguration)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
-func (in *ApplicationRevisionSpec) DeepCopy() *ApplicationRevisionSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevisionSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	*out = *in
@@ -606,11 +429,6 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.RolloutPlan != nil {
-		in, out := &in.RolloutPlan, &out.RolloutPlan
-		*out = new(standard_oam_devv1alpha1.RolloutPlan)
-		(*in).DeepCopyInto(*out)
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.
@@ -639,6 +457,21 @@ func (in *ApplicationTrait) DeepCopy() *ApplicationTrait {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationTraitStatus) DeepCopyInto(out *ApplicationTraitStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTraitStatus.
+func (in *ApplicationTraitStatus) DeepCopy() *ApplicationTraitStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationTraitStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CPUResources) DeepCopyInto(out *CPUResources) {
 	*out = *in
@@ -655,6 +488,43 @@ func (in *CPUResources) DeepCopy() *CPUResources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CUE) DeepCopyInto(out *CUE) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CUE.
+func (in *CUE) DeepCopy() *CUE {
+	if in == nil {
+		return nil
+	}
+	out := new(CUE)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ChildResourceKind) DeepCopyInto(out *ChildResourceKind) {
+	*out = *in
+	if in.Selector != nil {
+		in, out := &in.Selector, &out.Selector
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ChildResourceKind.
+func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
+	if in == nil {
+		return nil
+	}
+	out := new(ChildResourceKind)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Component) DeepCopyInto(out *Component) {
 	*out = *in
@@ -682,124 +552,6 @@ func (in *Component) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ComponentDefinition) DeepCopyInto(out *ComponentDefinition) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinition.
-func (in *ComponentDefinition) DeepCopy() *ComponentDefinition {
-	if in == nil {
-		return nil
-	}
-	out := new(ComponentDefinition)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ComponentDefinition) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ComponentDefinitionList) DeepCopyInto(out *ComponentDefinitionList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ComponentDefinition, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionList.
-func (in *ComponentDefinitionList) DeepCopy() *ComponentDefinitionList {
-	if in == nil {
-		return nil
-	}
-	out := new(ComponentDefinitionList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ComponentDefinitionList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ComponentDefinitionSpec) DeepCopyInto(out *ComponentDefinitionSpec) {
-	*out = *in
-	out.Workload = in.Workload
-	if in.ChildResourceKinds != nil {
-		in, out := &in.ChildResourceKinds, &out.ChildResourceKinds
-		*out = make([]common.ChildResourceKind, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Status != nil {
-		in, out := &in.Status, &out.Status
-		*out = new(common.Status)
-		**out = **in
-	}
-	if in.Schematic != nil {
-		in, out := &in.Schematic, &out.Schematic
-		*out = new(common.Schematic)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Extension != nil {
-		in, out := &in.Extension, &out.Extension
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionSpec.
-func (in *ComponentDefinitionSpec) DeepCopy() *ComponentDefinitionSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ComponentDefinitionSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ComponentDefinitionStatus) DeepCopyInto(out *ComponentDefinitionStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.LatestRevision != nil {
-		in, out := &in.LatestRevision, &out.LatestRevision
-		*out = new(common.Revision)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionStatus.
-func (in *ComponentDefinitionStatus) DeepCopy() *ComponentDefinitionStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ComponentDefinitionStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentList) DeepCopyInto(out *ComponentList) {
 	*out = *in
@@ -898,11 +650,6 @@ func (in *ComponentScope) DeepCopy() *ComponentScope {
 func (in *ComponentSpec) DeepCopyInto(out *ComponentSpec) {
 	*out = *in
 	in.Workload.DeepCopyInto(&out.Workload)
-	if in.Helm != nil {
-		in, out := &in.Helm, &out.Helm
-		*out = new(common.Helm)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.Parameters != nil {
 		in, out := &in.Parameters, &out.Parameters
 		*out = make([]ComponentParameter, len(*in))
@@ -928,7 +675,7 @@ func (in *ComponentStatus) DeepCopyInto(out *ComponentStatus) {
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
 	if in.LatestRevision != nil {
 		in, out := &in.LatestRevision, &out.LatestRevision
-		*out = new(common.Revision)
+		*out = new(Revision)
 		**out = **in
 	}
 }
@@ -1340,12 +1087,6 @@ func (in *DataInput) DeepCopyInto(out *DataInput) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
-		*out = make([]ConditionRequirement, len(*in))
-		copy(*out, *in)
-	}
-	in.InputStore.DeepCopyInto(&out.InputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataInput.
@@ -1373,27 +1114,6 @@ func (in *DataInputValueFrom) DeepCopy() *DataInputValueFrom {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DataOperation) DeepCopyInto(out *DataOperation) {
-	*out = *in
-	out.ValueFrom = in.ValueFrom
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
-		*out = make([]ConditionRequirement, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOperation.
-func (in *DataOperation) DeepCopy() *DataOperation {
-	if in == nil {
-		return nil
-	}
-	out := new(DataOperation)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 	*out = *in
@@ -1402,7 +1122,6 @@ func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 		*out = make([]ConditionRequirement, len(*in))
 		copy(*out, *in)
 	}
-	in.OutputStore.DeepCopyInto(&out.OutputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOutput.
@@ -1415,6 +1134,21 @@ func (in *DataOutput) DeepCopy() *DataOutput {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DefinitionReference) DeepCopyInto(out *DefinitionReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DefinitionReference.
+func (in *DefinitionReference) DeepCopy() *DefinitionReference {
+	if in == nil {
+		return nil
+	}
+	out := new(DefinitionReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DependencyFromObject) DeepCopyInto(out *DependencyFromObject) {
 	*out = *in
@@ -1822,6 +1556,41 @@ func (in *MemoryResources) DeepCopy() *MemoryResources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Revision) DeepCopyInto(out *Revision) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Revision.
+func (in *Revision) DeepCopy() *Revision {
+	if in == nil {
+		return nil
+	}
+	out := new(Revision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Schematic) DeepCopyInto(out *Schematic) {
+	*out = *in
+	if in.CUE != nil {
+		in, out := &in.CUE, &out.CUE
+		*out = new(CUE)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schematic.
+func (in *Schematic) DeepCopy() *Schematic {
+	if in == nil {
+		return nil
+	}
+	out := new(Schematic)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ScopeDefinition) DeepCopyInto(out *ScopeDefinition) {
 	*out = *in
@@ -1932,24 +1701,16 @@ func (in *SecretKeySelector) DeepCopy() *SecretKeySelector {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *StoreReference) DeepCopyInto(out *StoreReference) {
+func (in *Status) DeepCopyInto(out *Status) {
 	*out = *in
-	out.TypedReference = in.TypedReference
-	if in.Operations != nil {
-		in, out := &in.Operations, &out.Operations
-		*out = make([]DataOperation, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StoreReference.
-func (in *StoreReference) DeepCopy() *StoreReference {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Status.
+func (in *Status) DeepCopy() *Status {
 	if in == nil {
 		return nil
 	}
-	out := new(StoreReference)
+	out := new(Status)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -1975,7 +1736,6 @@ func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitDefinition.
@@ -2044,12 +1804,12 @@ func (in *TraitDefinitionSpec) DeepCopyInto(out *TraitDefinitionSpec) {
 	}
 	if in.Schematic != nil {
 		in, out := &in.Schematic, &out.Schematic
-		*out = new(common.Schematic)
+		*out = new(Schematic)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
-		*out = new(common.Status)
+		*out = new(Status)
 		**out = **in
 	}
 	if in.Extension != nil {
@@ -2069,27 +1829,6 @@ func (in *TraitDefinitionSpec) DeepCopy() *TraitDefinitionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TraitDefinitionStatus) DeepCopyInto(out *TraitDefinitionStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.LatestRevision != nil {
-		in, out := &in.LatestRevision, &out.LatestRevision
-		*out = new(common.Revision)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitDefinitionStatus.
-func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(TraitDefinitionStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *UnstaifiedDependency) DeepCopyInto(out *UnstaifiedDependency) {
 	*out = *in
@@ -2158,7 +1897,6 @@ func (in *WorkloadDefinition) DeepCopyInto(out *WorkloadDefinition) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadDefinition.
@@ -2217,19 +1955,19 @@ func (in *WorkloadDefinitionSpec) DeepCopyInto(out *WorkloadDefinitionSpec) {
 	out.Reference = in.Reference
 	if in.ChildResourceKinds != nil {
 		in, out := &in.ChildResourceKinds, &out.ChildResourceKinds
-		*out = make([]common.ChildResourceKind, len(*in))
+		*out = make([]ChildResourceKind, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
-		*out = new(common.Status)
+		*out = new(Status)
 		**out = **in
 	}
 	if in.Schematic != nil {
 		in, out := &in.Schematic, &out.Schematic
-		*out = new(common.Schematic)
+		*out = new(Schematic)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.Extension != nil {
@@ -2249,22 +1987,6 @@ func (in *WorkloadDefinitionSpec) DeepCopy() *WorkloadDefinitionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkloadDefinitionStatus) DeepCopyInto(out *WorkloadDefinitionStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadDefinitionStatus.
-func (in *WorkloadDefinitionStatus) DeepCopy() *WorkloadDefinitionStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkloadDefinitionStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadHealthCondition) DeepCopyInto(out *WorkloadHealthCondition) {
 	*out = *in

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

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

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

@@ -1,135 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-)
-
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// ApplicationTrait defines the trait of application
-type ApplicationTrait struct {
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
-}
-
-// ApplicationComponent describe the component of application
-type ApplicationComponent struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
-
-	// Traits define the trait of one component, the type must be array to keep the order.
-	Traits []ApplicationTrait `json:"traits,omitempty"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	// scopes in ApplicationComponent defines the component-level scopes
-	// the format is <scope-type:scope-instance-name> pairs, the key represents type of `ScopeDefinition` while the value represent the name of scope instance.
-	Scopes map[string]string `json:"scopes,omitempty"`
-}
-
-// 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
-	// The controller simply replace the old resources with the new one if there is no rollout plan involved
-	// +optional
-	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// Application is the Schema for the applications API
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={oam},shortName=app
-// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
-// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
-// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
-// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type Application struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ApplicationSpec  `json:"spec,omitempty"`
-	Status common.AppStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ApplicationList contains a list of Application
-type ApplicationList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Application `json:"items"`
-}
-
-// GetComponent get the component from the application based on its workload type
-func (app *Application) GetComponent(workloadType string) *ApplicationComponent {
-	for _, c := range app.Spec.Components {
-		if c.Type == workloadType {
-			return &c
-		}
-	}
-	return nil
-}

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

@@ -1,79 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// ApplicationRevisionSpec is the spec of ApplicationRevision
-type ApplicationRevisionSpec struct {
-	// Application records the snapshot of the created/modified Application
-	Application Application `json:"application"`
-
-	// ComponentDefinitions records the snapshot of the componentDefinitions related with the created/modified Application
-	ComponentDefinitions map[string]ComponentDefinition `json:"componentDefinitions,omitempty"`
-
-	// WorkloadDefinitions records the snapshot of the workloadDefinitions related with the created/modified Application
-	WorkloadDefinitions map[string]WorkloadDefinition `json:"workloadDefinitions,omitempty"`
-
-	// TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
-	TraitDefinitions map[string]TraitDefinition `json:"traitDefinitions,omitempty"`
-
-	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
-	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
-
-	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
-	Components []common.RawComponent `json:"components,omitempty"`
-
-	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
-	// it will contains the whole K8s CR of trait and the reference component in it.
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
-
-	// ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
-	ResourcesConfigMap corev1.LocalObjectReference `json:"resourcesConfigMap,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ApplicationRevision is the Schema for the ApplicationRevision API
-// +kubebuilder:storageversion
-// +kubebuilder:resource:categories={oam},shortName=apprev
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type ApplicationRevision struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ApplicationRevisionList contains a list of ApplicationRevision
-type ApplicationRevisionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationRevision `json:"items"`
-}

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

@@ -1,77 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-)
-
-// AppRolloutSpec defines how to describe an upgrade between different apps
-type AppRolloutSpec struct {
-	// TargetAppRevisionName contains the name of the applicationConfiguration that we need to upgrade to.
-	// Here we use an applicationConfiguration as a revision of an application, thus the name alone is suffice
-	TargetAppRevisionName string `json:"targetAppRevisionName"`
-
-	// SourceAppRevisionName contains the name of the applicationConfiguration that we need to upgrade from.
-	// it can be empty only when it's the first time to deploy the application
-	SourceAppRevisionName string `json:"sourceAppRevisionName,omitempty"`
-
-	// The list of component to upgrade in the application.
-	// We only support single component application so far
-	// TODO: (RZ) Support multiple components in an application
-	// +optional
-	ComponentList []string `json:"componentList,omitempty"`
-
-	// RolloutPlan is the details on how to rollout the resources
-	RolloutPlan v1alpha1.RolloutPlan `json:"rolloutPlan"`
-
-	// RevertOnDelete revert the failed rollout when the rollout CR is deleted
-	// It will revert the change back to the source version at once (not in batches)
-	// Default is false
-	// +optional
-	RevertOnDelete bool `json:"revertOnDelete,omitempty"`
-}
-
-// AppRollout is the Schema for the AppRollout API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName=approllout
-// +kubebuilder:subresource:status
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutTargetSize`
-// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.upgradedReplicas`
-// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.upgradedReadyReplicas`
-// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState`
-// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type AppRollout struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   AppRolloutSpec          `json:"spec,omitempty"`
-	Status common.AppRolloutStatus `json:"status,omitempty"`
-}
-
-// AppRolloutList contains a list of AppRollout
-// +kubebuilder:object:root=true
-type AppRolloutList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []AppRollout `json:"items"`
-}

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

@@ -1,61 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// ClusterSpec defines the desired state of Cluster
-type ClusterSpec struct {
-	// KubeconfigSecretRef specifies the reference to the secret
-	// that contains the kubeconfig in field `config`.
-	KubeconfigSecretRef LocalSecretReference `json:"kubeconfigSecretRef,omitempty"`
-}
-
-// LocalSecretReference is a reference to a secret within the enclosing
-// namespace.
-type LocalSecretReference struct {
-	// Name of a secret within the enclosing namespace.
-	Name string `json:"name"`
-}
-
-// ClusterStatus defines the observed state of Cluster
-type ClusterStatus struct {
-}
-
-// +kubebuilder:object:root=true
-
-// Cluster is the Schema for the clusters API
-type Cluster struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ClusterSpec   `json:"spec,omitempty"`
-	Status ClusterStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ClusterList contains a list of Cluster
-type ClusterList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Cluster `json:"items"`
-}

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

@@ -1,103 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// ComponentDefinitionSpec defines the desired state of ComponentDefinition
-type ComponentDefinitionSpec struct {
-	// Workload is a workload type descriptor
-	Workload common.WorkloadTypeDescriptor `json:"workload"`
-
-	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
-
-	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
-	// can be used by trait to create resource selectors(e.g. label selector for pods).
-	// +optional
-	RevisionLabel string `json:"revisionLabel,omitempty"`
-
-	// PodSpecPath indicates where/if this workload has K8s podSpec field
-	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
-	// +optional
-	PodSpecPath string `json:"podSpecPath,omitempty"`
-
-	// Status defines the custom health policy and status message for workload
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the workload
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// ComponentDefinitionStatus is the status of ComponentDefinition
-type ComponentDefinitionStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	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
-
-// ComponentDefinition is the Schema for the componentdefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-type ComponentDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ComponentDefinitionSpec   `json:"spec,omitempty"`
-	Status ComponentDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for WorkloadDefinition
-func (cd *ComponentDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	cd.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from WorkloadDefinition
-func (cd *ComponentDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return cd.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// ComponentDefinitionList contains a list of ComponentDefinition
-type ComponentDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ComponentDefinition `json:"items"`
-}

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

@@ -1,20 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-// Hub marks this type as a conversion hub.
-func (*Application) Hub() {}

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

@@ -1,289 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// A WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
-type WorkloadDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this workload kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
-
-	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
-
-	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
-	// can be used by trait to create resource selectors(e.g. label selector for pods).
-	// +optional
-	RevisionLabel string `json:"revisionLabel,omitempty"`
-
-	// PodSpecPath indicates where/if this workload has K8s podSpec field
-	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
-	// +optional
-	PodSpecPath string `json:"podSpecPath,omitempty"`
-
-	// Status defines the custom health policy and status message for workload
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the workload
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// WorkloadDefinitionStatus is the status of WorkloadDefinition
-type WorkloadDefinitionStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// A WorkloadDefinition registers a kind of Kubernetes custom resource as a
-// valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
-// is used to validate the schema of the workload when it is embedded in an OAM
-// Component.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-type WorkloadDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
-	Status WorkloadDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for WorkloadDefinition
-func (wd *WorkloadDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	wd.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from WorkloadDefinition
-func (wd *WorkloadDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return wd.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// WorkloadDefinitionList contains a list of WorkloadDefinition.
-type WorkloadDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []WorkloadDefinition `json:"items"`
-}
-
-// A TraitDefinitionSpec defines the desired state of a TraitDefinition.
-type TraitDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this trait kind.
-	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
-
-	// Revision indicates whether a trait is aware of component revision
-	// +optional
-	RevisionEnabled bool `json:"revisionEnabled,omitempty"`
-
-	// WorkloadRefPath indicates where/if a trait accepts a workloadRef object
-	// +optional
-	WorkloadRefPath string `json:"workloadRefPath,omitempty"`
-
-	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
-	// +optional
-	PodDisruptive bool `json:"podDisruptive,omitempty"`
-
-	// AppliesToWorkloads specifies the list of workload kinds this trait
-	// applies to. Workload kinds are specified in kind.group/version format,
-	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
-	// all workload kinds.
-	// +optional
-	AppliesToWorkloads []string `json:"appliesToWorkloads,omitempty"`
-
-	// ConflictsWith specifies the list of traits(CRD name, Definition name, CRD group)
-	// which could not apply to the same workloads with this trait.
-	// Traits that omit this field can work with any other traits.
-	// Example rules:
-	// "service" # Trait definition name
-	// "services.k8s.io" # API resource/crd name
-	// "*.networking.k8s.io" # API group
-	// "labelSelector:foo=bar" # label selector
-	// labelSelector format: https://pkg.go.dev/k8s.io/apimachinery/pkg/labels#Parse
-	// +optional
-	ConflictsWith []string `json:"conflictsWith,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the trait
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Status defines the custom health policy and status message for trait
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// TraitDefinitionStatus is the status of TraitDefinition
-type TraitDefinitionStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	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
-
-// A TraitDefinition registers a kind of Kubernetes custom resource as a valid
-// OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
-// to validate the schema of the trait when it is embedded in an OAM
-// ApplicationConfiguration.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
-// +kubebuilder:subresource:status
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-type TraitDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
-	Status TraitDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for TraitDefinition
-func (td *TraitDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
-	td.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from TraitDefinition
-func (td *TraitDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return td.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// TraitDefinitionList contains a list of TraitDefinition.
-type TraitDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []TraitDefinition `json:"items"`
-}
-
-// A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
-type ScopeDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this scope kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
-
-	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
-	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
-
-	// AllowComponentOverlap specifies whether an OAM component may exist in
-	// multiple instances of this kind of scope.
-	AllowComponentOverlap bool `json:"allowComponentOverlap"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// A ScopeDefinition registers a kind of Kubernetes custom resource as a valid
-// OAM scope kind by referencing its CustomResourceDefinition. The CRD is used
-// to validate the schema of the scope when it is embedded in an OAM
-// ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
-// +kubebuilder:storageversion
-type ScopeDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ScopeDefinitionSpec `json:"spec,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ScopeDefinitionList contains a list of ScopeDefinition.
-type ScopeDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ScopeDefinition `json:"items"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-
-// An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
-type ResourceTracker struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Status ResourceTrackerStatus `json:"status,omitempty"`
-}
-
-// ResourceTrackerStatus define the status of resourceTracker
-type ResourceTrackerStatus struct {
-	TrackedResources []TypedReference `json:"trackedResources,omitempty"`
-}
-
-// A TypedReference refers to an object by Name, Kind, and APIVersion. It is
-// commonly used to reference across-namespace objects
-type TypedReference struct {
-	// APIVersion of the referenced object.
-	APIVersion string `json:"apiVersion"`
-
-	// Kind of the referenced object.
-	Kind string `json:"kind"`
-
-	// Name of the referenced object.
-	Name string `json:"name"`
-
-	// Namespace of the objects outside the application namespace.
-	// +optional
-	Namespace string `json:"namespace,omitempty"`
-
-	// UID of the referenced object.
-	// +optional
-	UID types.UID `json:"uid,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ResourceTrackerList contains a list of ResourceTracker
-type ResourceTrackerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ResourceTracker `json:"items"`
-}

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

@@ -1,70 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	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/doc.go

@@ -1,22 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-// Package v1beta1 contains resources relating to the Open Application Model.
-// See https://github.com/oam-dev/spec for more details.
-// +kubebuilder:object:generate=true
-// +groupName=core.oam.dev
-// +versionName=v1beta1
-package v1beta1

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

@@ -1,77 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	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

@@ -1,158 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"reflect"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-)
-
-// Package type metadata.
-const (
-	Group   = "core.oam.dev"
-	Version = "v1beta1"
-)
-
-var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: Group, Version: Version}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-)
-
-// ComponentDefinition type metadata.
-var (
-	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
-	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
-	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
-	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
-)
-
-// WorkloadDefinition type metadata.
-var (
-	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
-	WorkloadDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkloadDefinitionKind}.String()
-	WorkloadDefinitionKindAPIVersion   = WorkloadDefinitionKind + "." + SchemeGroupVersion.String()
-	WorkloadDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkloadDefinitionKind)
-)
-
-// TraitDefinition type metadata.
-var (
-	TraitDefinitionKind             = reflect.TypeOf(TraitDefinition{}).Name()
-	TraitDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: TraitDefinitionKind}.String()
-	TraitDefinitionKindAPIVersion   = TraitDefinitionKind + "." + SchemeGroupVersion.String()
-	TraitDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(TraitDefinitionKind)
-)
-
-// PolicyDefinition type metadata.
-var (
-	PolicyDefinitionKind             = reflect.TypeOf(PolicyDefinition{}).Name()
-	PolicyDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: PolicyDefinitionKind}.String()
-	PolicyDefinitionKindAPIVersion   = PolicyDefinitionKind + "." + SchemeGroupVersion.String()
-	PolicyDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(PolicyDefinitionKind)
-)
-
-// WorkflowStepDefinition type metadata.
-var (
-	WorkflowStepDefinitionKind             = reflect.TypeOf(WorkflowStepDefinition{}).Name()
-	WorkflowStepDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkflowStepDefinitionKind}.String()
-	WorkflowStepDefinitionKindAPIVersion   = WorkflowStepDefinitionKind + "." + SchemeGroupVersion.String()
-	WorkflowStepDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkflowStepDefinitionKind)
-)
-
-// DefinitionRevision type metadata.
-var (
-	DefinitionRevisionKind             = reflect.TypeOf(DefinitionRevision{}).Name()
-	DefinitionRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: DefinitionRevisionKind}.String()
-	DefinitionRevisionKindAPIVersion   = DefinitionRevisionKind + "." + SchemeGroupVersion.String()
-	DefinitionRevisionGroupVersionKind = SchemeGroupVersion.WithKind(DefinitionRevisionKind)
-)
-
-// Application type metadata.
-var (
-	ApplicationKind            = reflect.TypeOf(Application{}).Name()
-	ApplicationGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationKind}.String()
-	ApplicationKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
-)
-
-// AppRollout type metadata.
-var (
-	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
-	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
-	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
-)
-
-// ApplicationRevision type metadata
-var (
-	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
-	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
-	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
-	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
-)
-
-// ScopeDefinition type metadata.
-var (
-	ScopeDefinitionKind             = reflect.TypeOf(ScopeDefinition{}).Name()
-	ScopeDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ScopeDefinitionKind}.String()
-	ScopeDefinitionKindAPIVersion   = ScopeDefinitionKind + "." + SchemeGroupVersion.String()
-	ScopeDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ScopeDefinitionKind)
-)
-
-// ResourceTracker type metadata.
-var (
-	ResourceTrackerKind            = reflect.TypeOf(ResourceTracker{}).Name()
-	ResourceTrackerGroupKind       = schema.GroupKind{Group: Group, Kind: ResourceTrackerKind}.String()
-	ResourceTrackerKindAPIVersion  = ResourceTrackerKind + "." + SchemeGroupVersion.String()
-	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
-)
-
-// AppDeployment type metadata.
-var (
-	AppDeploymentKind            = reflect.TypeOf(AppDeployment{}).Name()
-	AppDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: AppDeploymentKind}.String()
-	AppDeploymentKindAPIVersion  = AppDeploymentKind + "." + SchemeGroupVersion.String()
-	AppDeploymentKindVersionKind = SchemeGroupVersion.WithKind(AppDeploymentKind)
-)
-
-// Cluster type metadata.
-var (
-	ClusterKind            = reflect.TypeOf(Cluster{}).Name()
-	ClusterGroupKind       = schema.GroupKind{Group: Group, Kind: ClusterKind}.String()
-	ClusterKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ClusterKindVersionKind = SchemeGroupVersion.WithKind(ClusterKind)
-)
-
-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{})
-	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
-	SchemeBuilder.Register(&AppDeployment{}, &AppDeploymentList{})
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
-	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
-}

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

@@ -1,77 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	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/generate.go

@@ -1,31 +1,15 @@
 // +build generate
 
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 // See the below link for details on what is happening here.
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 
 // NOTE(@wonderflow) We don't remove existing CRDs here, because the crd folders contain not only auto generated.
 
 // Generate deepcopy methodsets and CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../config/crd/base
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../charts/vela-core/crds
 
 // 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 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:trivialVersions=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
 //go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
 
 //go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -1,19 +1,3 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 package v1alpha1
 
 import (
@@ -50,31 +34,20 @@ const (
 type RollingState string
 
 const (
-	// LocatingTargetAppState indicates that the rollout is in the stage of locating target app
-	// we use this state to make sure we special handle the target app successfully only once
-	LocatingTargetAppState RollingState = "locatingTargetApp"
-	// VerifyingSpecState indicates that the rollout is in the stage of verifying the rollout settings
-	// and the controller can locate both the target and the source
-	VerifyingSpecState RollingState = "verifyingSpec"
-	// InitializingState indicates that the rollout is initializing all the new resources
+	// VerifyingState verify that the rollout setting is valid and the controller can locate both the
+	// target and the source
+	VerifyingState RollingState = "verifying"
+	// InitializingState rollout is initializing all the new resources
 	InitializingState RollingState = "initializing"
-	// RollingInBatchesState indicates that the rollout starts rolling
+	// RollingInBatchesState rolling out
 	RollingInBatchesState RollingState = "rollingInBatches"
-	// FinalisingState indicates that the rollout is finalizing, possibly clean up the old resources, adjust traffic
+	// FinalisingState finalize the rolling, possibly clean up the old resources, adjust traffic
 	FinalisingState RollingState = "finalising"
-	// RolloutFailingState indicates that the rollout is failing
-	// one needs to finalize it before mark it as failed by cleaning up the old resources, adjust traffic
-	RolloutFailingState RollingState = "rolloutFailing"
-	// RolloutSucceedState indicates that rollout successfully completed to match the desired target state
+	// RolloutSucceedState rollout successfully completed to match the desired target state
 	RolloutSucceedState RollingState = "rolloutSucceed"
-	// RolloutAbandoningState indicates that the rollout is being abandoned
-	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
-	RolloutAbandoningState RollingState = "rolloutAbandoning"
-	// RolloutDeletingState indicates that the rollout is being deleted
-	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
-	RolloutDeletingState RollingState = "RolloutDeletingState"
-	// RolloutFailedState indicates that rollout is failed, the target replica is not reached
-	// we can not move forward anymore, we will let the client to decide when or whether to revert.
+	// RolloutFailedState rollout is failed, the target replica is not reached
+	// we can not move forward anymore
+	// we will let the client to decide when or whether to revert
 	RolloutFailedState RollingState = "rolloutFailed"
 )
 
@@ -100,9 +73,8 @@ const (
 type RolloutPlan struct {
 
 	// RolloutStrategy defines strategies for the rollout plan
-	// The default is IncreaseFirstRolloutStrategyType
 	// +optional
-	RolloutStrategy RolloutStrategyType `json:"rolloutStrategy,omitempty"`
+	RolloutStrategy *RolloutStrategyType `json:"rolloutStrategy,omitempty"`
 
 	// The size of the target resource. The default is the same
 	// as the size of the source resource.
@@ -110,11 +82,12 @@ type RolloutPlan struct {
 	TargetSize *int32 `json:"targetSize,omitempty"`
 
 	// The number of batches, default = 1
+	// mutually exclusive to RolloutBatches
 	// +optional
 	NumBatches *int32 `json:"numBatches,omitempty"`
 
 	// The exact distribution among batches.
-	// its size has to be exactly the same as the NumBatches (if set)
+	// mutually exclusive to NumBatches.
 	// The total number cannot exceed the targetSize or the size of the source resource
 	// We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum
 	// We highly recommend to leave the last batch's replica field empty
@@ -126,7 +99,7 @@ type RolloutPlan struct {
 	// This is designed for the operators to manually rollout
 	// Default is the the number of batches which will rollout all the batches
 	// +optional
-	BatchPartition *int32 `json:"batchPartition,omitempty"`
+	BatchPartition *int32 `json:"lastBatchToRollout,omitempty"`
 
 	// Paused the rollout, default is false
 	// +optional
@@ -188,11 +161,8 @@ type RolloutWebhook struct {
 	// URL address of this webhook
 	URL string `json:"url"`
 
-	// Method the HTTP call method, default is POST
-	Method string `json:"method,omitempty"`
-
-	// ExpectedStatus contains all the expected http status code that we will accept as success
-	ExpectedStatus []int `json:"expectedStatus,omitempty"`
+	// Request timeout for this webhook
+	Timeout string `json:"timeout,omitempty"`
 
 	// Metadata (key-value pairs) for this webhook
 	// +optional
@@ -201,14 +171,11 @@ type RolloutWebhook struct {
 
 // RolloutWebhookPayload holds the info and metadata sent to webhooks
 type RolloutWebhookPayload struct {
-	// Name of the upgrading resource
-	Name string `json:"name"`
+	// ResourceRef refers to the resource we are operating on
+	ResourceRef *runtimev1alpha1.TypedReference `json:"resourceRef"`
 
-	// Namespace of the upgrading resource
-	Namespace string `json:"namespace"`
-
-	// Phase of the rollout
-	Phase string `json:"phase"`
+	// RolloutRef refers to the rollout that is controlling the rollout
+	RolloutRef *runtimev1alpha1.TypedReference `json:"rolloutRef"`
 
 	// Metadata (key-value pairs) are the extra data send to this webhook
 	Metadata map[string]string `json:"metadata,omitempty"`
@@ -247,14 +214,6 @@ type RolloutStatus struct {
 	// Conditions represents the latest available observations of a CloneSet's current state.
 	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
-	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
-	// and does not change until the rollout is restarted
-	RolloutOriginalSize int32 `json:"rolloutOriginalSize,omitempty"`
-
-	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
-	// and does not change until the rollout is restarted
-	RolloutTargetSize int32 `json:"rolloutTargetSize,omitempty"`
-
 	// NewPodTemplateIdentifier is a string that uniquely represent the new pod template
 	// each workload type could use different ways to identify that so we cannot compare between resources
 	NewPodTemplateIdentifier string `json:"targetGeneration,omitempty"`
@@ -278,6 +237,6 @@ type RolloutStatus struct {
 	// UpgradedReplicas is the number of Pods upgraded by the rollout controller
 	UpgradedReplicas int32 `json:"upgradedReplicas"`
 
-	// UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+	// UpgradedReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
 	UpgradedReadyReplicas int32 `json:"upgradedReadyReplicas"`
 }

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

@@ -1,19 +1,3 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 package v1alpha1
 
 import (
@@ -36,15 +20,6 @@ const (
 	// RollingRetriableFailureEvent indicates that we encountered an unexpected but retriable error
 	RollingRetriableFailureEvent RolloutEvent = "RollingRetriableFailureEvent"
 
-	// AppLocatedEvent indicates that apps are located successfully
-	AppLocatedEvent RolloutEvent = "AppLocatedEvent"
-
-	// RollingModifiedEvent indicates that the rolling target or source has changed
-	RollingModifiedEvent RolloutEvent = "RollingModifiedEvent"
-
-	// RollingDeletedEvent indicates that the rolling is being deleted
-	RollingDeletedEvent RolloutEvent = "RollingDeletedEvent"
-
 	// RollingSpecVerifiedEvent indicates that we have successfully verified that the rollout spec
 	RollingSpecVerifiedEvent RolloutEvent = "RollingSpecVerifiedEvent"
 
@@ -64,8 +39,11 @@ const (
 	// FinishedOneBatchEvent indicates that we have successfully rolled out one batch
 	FinishedOneBatchEvent RolloutEvent = "FinishedOneBatchEvent"
 
-	// RolloutOneBatchEvent indicates that we have rollout one batch
-	RolloutOneBatchEvent RolloutEvent = "RolloutOneBatchEvent"
+	// BatchRolloutContinueEvent indicates that we need to continue to upgrade the pods in the batch
+	BatchRolloutContinueEvent RolloutEvent = "BatchRolloutContinueEvent"
+
+	// BatchRolloutVerifyingEvent indicates that we are waiting for the approval of resume one batch
+	BatchRolloutVerifyingEvent RolloutEvent = "BatchRolloutVerifyingEvent"
 
 	// OneBatchAvailableEvent indicates that the batch resource is considered available
 	// this events comes after we have examine the pod readiness check and traffic shifting if needed
@@ -76,38 +54,31 @@ const (
 
 	// BatchRolloutFailedEvent indicates that we are waiting for the approval of the
 	BatchRolloutFailedEvent RolloutEvent = "BatchRolloutFailedEvent"
+
+	// WorkloadModifiedEvent indicates that the res
+	WorkloadModifiedEvent RolloutEvent = "WorkloadModifiedEvent"
 )
 
 // These are valid conditions of the rollout.
 const (
-	// RolloutSpecVerifying indicates that the rollout just started with verification
-	RolloutSpecVerifying runtimev1alpha1.ConditionType = "RolloutSpecVerifying"
-	// RolloutInitializing means we start to initialize the cluster
-	RolloutInitializing runtimev1alpha1.ConditionType = "RolloutInitializing"
+	// RolloutSpecVerified indicates that the rollout spec matches the resource we have in the cluster
+	RolloutSpecVerified runtimev1alpha1.ConditionType = "RolloutSpecVerified"
+	// RolloutInitialized means all the needed initialization work is done
+	RolloutInitialized runtimev1alpha1.ConditionType = "Initialized"
 	// RolloutInProgress means we are upgrading resources.
-	RolloutInProgress runtimev1alpha1.ConditionType = "RolloutInProgress"
-	// RolloutFinalizing means the rollout is finalizing
-	RolloutFinalizing runtimev1alpha1.ConditionType = "RolloutFinalizing"
-	// RolloutFailing means the rollout is failing
-	RolloutFailing runtimev1alpha1.ConditionType = "RolloutFailing"
-	// RolloutAbandoning means that the rollout is being abandoned.
-	RolloutAbandoning runtimev1alpha1.ConditionType = "RolloutAbandoning"
-	// RolloutDeleting means that the rollout is being deleted.
-	RolloutDeleting runtimev1alpha1.ConditionType = "RolloutDeleting"
-	// RolloutFailed means that the rollout failed.
-	RolloutFailed runtimev1alpha1.ConditionType = "RolloutFailed"
+	RolloutInProgress runtimev1alpha1.ConditionType = "Ready"
 	// RolloutSucceed means that the rollout is done.
-	RolloutSucceed runtimev1alpha1.ConditionType = "RolloutSucceed"
-	// BatchInitializing
-	BatchInitializing runtimev1alpha1.ConditionType = "BatchInitializing"
-	// BatchPaused
-	BatchPaused runtimev1alpha1.ConditionType = "BatchPaused"
-	// BatchVerifying
-	BatchVerifying runtimev1alpha1.ConditionType = "BatchVerifying"
+	RolloutSucceed runtimev1alpha1.ConditionType = "Succeed"
+	// BatchInitialized
+	BatchInitialized runtimev1alpha1.ConditionType = "BatchInitialized"
+	// BatchInRolled
+	BatchInRolled runtimev1alpha1.ConditionType = "BatchInRolled"
+	// BatchVerified
+	BatchVerified runtimev1alpha1.ConditionType = "BatchVerified"
 	// BatchRolloutFailed
 	BatchRolloutFailed runtimev1alpha1.ConditionType = "BatchRolloutFailed"
-	// BatchFinalizing
-	BatchFinalizing runtimev1alpha1.ConditionType = "BatchFinalizing"
+	// BatchFinalized
+	BatchFinalized runtimev1alpha1.ConditionType = "BatchFinalized"
 	// BatchReady
 	BatchReady runtimev1alpha1.ConditionType = "BatchReady"
 )
@@ -138,25 +109,22 @@ const invalidBatchRollingStateTransition = "the batch rolling state transition f
 func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType {
 	// figure out which condition type should we put in the condition depends on its state
 	switch r.RollingState {
-	case VerifyingSpecState:
-		return RolloutSpecVerifying
+	case VerifyingState:
+		return RolloutSpecVerified
 
 	case InitializingState:
-		return RolloutInitializing
+		return RolloutInitialized
 
 	case RollingInBatchesState:
 		switch r.BatchRollingState {
 		case BatchInitializingState:
-			return BatchInitializing
+			return BatchInitialized
 
 		case BatchVerifyingState:
-			return BatchVerifying
+			return BatchVerified
 
 		case BatchFinalizingState:
-			return BatchFinalizing
-
-		case BatchRolloutFailedState:
-			return BatchRolloutFailed
+			return BatchFinalized
 
 		case BatchReadyState:
 			return BatchReady
@@ -166,22 +134,10 @@ func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType
 		}
 
 	case FinalisingState:
-		return RolloutFinalizing
-
-	case RolloutFailingState:
-		return RolloutFailing
-
-	case RolloutAbandoningState:
-		return RolloutAbandoning
-
-	case RolloutDeletingState:
-		return RolloutDeleting
-
-	case RolloutSucceedState:
 		return RolloutSucceed
 
 	default:
-		return RolloutFailed
+		return RolloutSucceed
 	}
 }
 
@@ -198,171 +154,78 @@ func (r *RolloutStatus) RolloutFailed(reason string) {
 	r.RollingState = RolloutFailedState
 }
 
-// RolloutFailing is a special state transition that always moves the rollout state to the failing state
-func (r *RolloutStatus) RolloutFailing(reason string) {
-	// set the condition first which depends on the state
-	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
-	r.RollingState = RolloutFailingState
-	r.BatchRollingState = BatchInitializingState
-}
-
-// ResetStatus resets the status of the rollout to start from beginning
-func (r *RolloutStatus) ResetStatus() {
-	r.NewPodTemplateIdentifier = ""
-	r.RolloutTargetSize = -1
-	r.LastAppliedPodTemplateIdentifier = ""
-	r.RollingState = LocatingTargetAppState
-	r.BatchRollingState = BatchInitializingState
-	r.CurrentBatch = 0
-	r.UpgradedReplicas = 0
-	r.UpgradedReadyReplicas = 0
-}
-
-// SetRolloutCondition sets the supplied condition, replacing any existing condition
-// of the same type unless they are identical.
-func (r *RolloutStatus) SetRolloutCondition(new runtimev1alpha1.Condition) {
-	exists := false
-	for i, existing := range r.Conditions {
-		if existing.Type != new.Type {
-			continue
-		}
-		// we want to update the condition when the LTT changes
-		if existing.Type == new.Type &&
-			existing.Status == new.Status &&
-			existing.Reason == new.Reason &&
-			existing.Message == new.Message &&
-			existing.LastTransitionTime == new.LastTransitionTime {
-			exists = true
-			continue
-		}
-
-		r.Conditions[i] = new
-		exists = true
-	}
-	if !exists {
-		r.Conditions = append(r.Conditions, new)
-	}
-}
-
-// we can't panic since it will crash the other controllers
-func (r *RolloutStatus) illegalStateTransition(err error) {
-	r.RolloutFailed(err.Error())
-}
-
 // StateTransition is the center place to do rollout state transition
 // it returns an error if the transition is invalid
 // it changes the coming rollout state if it's valid
 func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 	rollingState := r.RollingState
 	batchRollingState := r.BatchRollingState
-	defer func() {
-		klog.InfoS("try to execute a rollout state transition",
-			"pre rolling state", rollingState,
-			"pre batch rolling state", batchRollingState,
-			"post rolling state", r.RollingState,
-			"post batch rolling state", r.BatchRollingState)
-	}()
+	defer klog.InfoS("try to execute a rollout state transition",
+		"pre rolling state", rollingState,
+		"pre batch rolling state", batchRollingState,
+		"post rolling state", r.RollingState,
+		"post batch rolling state", r.BatchRollingState)
 
-	// we have special transition for these types of event since they require additional info
+	// we have special transition for these two types of event
 	if event == RollingFailedEvent || event == RollingRetriableFailureEvent {
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-		return
-	}
-	// special handle modified event here
-	if event == RollingModifiedEvent {
-		if r.RollingState == RolloutDeletingState {
-			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-			return
-		}
-		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
-			r.ResetStatus()
-		} else {
-			r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
-			r.RollingState = RolloutAbandoningState
-			r.BatchRollingState = BatchInitializingState
-		}
-		return
-	}
-
-	// special handle deleted event here, it can happen at many states
-	if event == RollingDeletedEvent {
-		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
-			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-			return
-		}
-		r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout is being deleted"))
-		r.RollingState = RolloutDeletingState
-		r.BatchRollingState = BatchInitializingState
-		return
-	}
-
-	// special handle appLocatedEvent event here, it only applies to one state but it's legal to happen at other states
-	if event == AppLocatedEvent {
-		if r.RollingState == LocatingTargetAppState {
-			r.RollingState = VerifyingSpecState
-		}
-		return
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 	}
 
 	switch rollingState {
-	case VerifyingSpecState:
+	case VerifyingState:
 		if event == RollingSpecVerifiedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = InitializingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case InitializingState:
 		if event == RollingInitializedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RollingInBatchesState
-			r.BatchRollingState = BatchInitializingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RollingInBatchesState:
 		r.batchStateTransition(event)
 		return
 
-	case RolloutAbandoningState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.ResetStatus()
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RolloutDeletingState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RolloutFailedState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
 	case FinalisingState:
 		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RolloutSucceedState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
-	case RolloutFailingState:
+	case RolloutSucceedState:
+		if event == WorkloadModifiedEvent {
+			r.RollingState = VerifyingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			return
+		}
 		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RolloutFailedState
+			// no op
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
-	case RolloutSucceedState, RolloutFailedState:
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+	case RolloutFailedState:
+		if event == WorkloadModifiedEvent {
+			r.RollingState = VerifyingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			return
+		}
+		if event == RollingFailedEvent {
+			// no op
+			return
+		}
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	default:
-		r.illegalStateTransition(fmt.Errorf("invalid rolling state %s before transition", rollingState))
+		panic(fmt.Errorf("invalid rolling state %s", rollingState))
 	}
 }
 
@@ -381,49 +244,55 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchInRollingState
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchInRollingState:
-		if event == RolloutOneBatchEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.BatchRollingState = BatchVerifyingState
+		if event == BatchRolloutContinueEvent {
+			// no op
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		if event == BatchRolloutVerifyingEvent {
+			r.BatchRollingState = BatchVerifyingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			return
+		}
+		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchVerifyingState:
 		if event == OneBatchAvailableEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchFinalizingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		if event == BatchRolloutVerifyingEvent {
+			// no op
+			return
+		}
+		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchFinalizingState:
 		if event == FinishedOneBatchEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchReadyState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		if event == AllBatchFinishedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			// transition out of the batch loop
-			r.BatchRollingState = BatchReadyState
 			r.RollingState = FinalisingState
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchReadyState:
 		if event == BatchRolloutApprovedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchInitializingState
-			r.CurrentBatch++
+			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	default:
-		r.illegalStateTransition(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
+		panic(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
 	}
 }

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

@@ -1,19 +1,3 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 package v1alpha1
 
 import (
@@ -42,7 +26,6 @@ type RolloutTraitSpec struct {
 // RolloutTrait is the Schema for the RolloutTrait API
 // +kubebuilder:object:root=true
 // +genclient
-// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 type RolloutTrait struct {
 	metav1.TypeMeta   `json:",inline"`

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

@@ -225,6 +225,11 @@ func (in *RolloutBatch) DeepCopy() *RolloutBatch {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutPlan) DeepCopyInto(out *RolloutPlan) {
 	*out = *in
+	if in.RolloutStrategy != nil {
+		in, out := &in.RolloutStrategy, &out.RolloutStrategy
+		*out = new(RolloutStrategyType)
+		**out = **in
+	}
 	if in.TargetSize != nil {
 		in, out := &in.TargetSize, &out.TargetSize
 		*out = new(int32)
@@ -373,11 +378,6 @@ func (in *RolloutTraitSpec) DeepCopy() *RolloutTraitSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutWebhook) DeepCopyInto(out *RolloutWebhook) {
 	*out = *in
-	if in.ExpectedStatus != nil {
-		in, out := &in.ExpectedStatus, &out.ExpectedStatus
-		*out = make([]int, len(*in))
-		copy(*out, *in)
-	}
 	if in.Metadata != nil {
 		in, out := &in.Metadata, &out.Metadata
 		*out = new(map[string]string)
@@ -404,6 +404,16 @@ func (in *RolloutWebhook) DeepCopy() *RolloutWebhook {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutWebhookPayload) DeepCopyInto(out *RolloutWebhookPayload) {
 	*out = *in
+	if in.ResourceRef != nil {
+		in, out := &in.ResourceRef, &out.ResourceRef
+		*out = new(corev1alpha1.TypedReference)
+		**out = **in
+	}
+	if in.RolloutRef != nil {
+		in, out := &in.RolloutRef, &out.RolloutRef
+		*out = new(corev1alpha1.TypedReference)
+		**out = **in
+	}
 	if in.Metadata != nil {
 		in, out := &in.Metadata, &out.Metadata
 		*out = make(map[string]string, len(*in))

apis/types/args.go

@@ -0,0 +1,23 @@
+package types
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
+)
+
+// Args is args for controller-runtime client
+type Args struct {
+	Config *rest.Config
+	Schema *runtime.Scheme
+}
+
+// SetConfig insert kubeconfig into Args
+func (a *Args) SetConfig() error {
+	restConf, err := config.GetConfig()
+	if err != nil {
+		return err
+	}
+	a.Config = restConf
+	return nil
+}

apis/types/capability.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The KubeVela Authors.
+
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,9 +22,6 @@ 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
@@ -41,34 +38,24 @@ 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"`
-	Category       CapabilityCategory `json:"category,omitempty"`
+	Name           string      `json:"name"`
+	Type           CapType     `json:"type"`
+	CueTemplate    string      `json:"template,omitempty"`
+	CueTemplateURI string      `json:"templateURI,omitempty"`
+	Parameters     []Parameter `json:"parameters,omitempty"`
+	DefinitionPath string      `json:"definition"`
+	CrdName        string      `json:"crdName,omitempty"`
+	Center         string      `json:"center,omitempty"`
+	Status         string      `json:"status,omitempty"`
+	Description    string      `json:"description,omitempty"`
 
 	// trait only
 	AppliesTo []string `json:"appliesTo,omitempty"`
 
-	// Namespace represents it's a system-level or user-level capability.
-	Namespace string `json:"namespace,omitempty"`
-
 	// Plugin Source
 	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
@@ -91,40 +78,20 @@ type Installation struct {
 type CapType string
 
 const (
-	// TypeComponentDefinition represents OAM ComponentDefinition
-	TypeComponentDefinition CapType = "componentDefinition"
 	// TypeWorkload represents OAM Workload
 	TypeWorkload CapType = "workload"
 	// TypeTrait represents OAM Trait
 	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
-const CapabilityConfigMapNamePrefix = "schema-"
-
-const (
-	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
-	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
 )
 
 // CapabilityCategory defines the category of a capability
 type CapabilityCategory string
 
-// categories of capability schematic
 const (
+	// TerraformCategory means the capability is in Terraform format
 	TerraformCategory CapabilityCategory = "terraform"
-
-	HelmCategory CapabilityCategory = "helm"
-
-	KubeCategory CapabilityCategory = "kube"
-
-	CUECategory CapabilityCategory = "cue"
 )
 
 // Parameter defines a parameter for cli from capability template
@@ -134,10 +101,8 @@ 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

@@ -1,37 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package 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

@@ -1,55 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package 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/rolling.go

@@ -1,31 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-// RollingStatus represents the rollout phases
-type RollingStatus string
-
-const (
-	// RollingTemplating means that the AC is rolling and need template
-	RollingTemplating RollingStatus = "RollingTemplating"
-	// RollingTemplated means that the AC is rolling and it already templated
-	RollingTemplated RollingStatus = "RollingTemplated"
-	// RollingCompleted means that the AC is the new active revision of the application
-	RollingCompleted RollingStatus = "RollingCompleted"
-	// InactiveAfterRollingCompleted means that the AC is the inactive revision after the rolling is finished
-	InactiveAfterRollingCompleted RollingStatus = "InactiveAfterRollingCompleted"
-)

apis/types/types.go

@@ -1,19 +1,3 @@
-/*
-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
 
 const (
@@ -29,8 +13,6 @@ 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 (
@@ -52,6 +34,8 @@ type EnvMeta struct {
 	Email     string `json:"email,omitempty"`
 	Domain    string `json:"domain,omitempty"`
 
+	// Below are not arguments, should be auto-generated
+	Issuer  string `json:"issuer"`
 	Current string `json:"current,omitempty"`
 }
 
@@ -66,6 +50,4 @@ 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

@@ -1,29 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-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_appdeployments.yaml

@@ -1,196 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: appdeployments.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: AppDeployment
-    listKind: AppDeploymentList
-    plural: appdeployments
-    shortNames:
-    - appdeploy
-    singular: appdeployment
-  scope: Namespaced
-  versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: AppDeployment is the Schema for the AppDeployment API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: AppDeploymentSpec defines how to describe an upgrade between different apps
-            properties:
-              appRevisions:
-                description: AppRevision specifies  AppRevision resources to and the rules to apply to them.
-                items:
-                  description: AppRevision specifies an AppRevision resource to and the rules to apply to it.
-                  properties:
-                    placement:
-                      description: Placement defines the cluster placement rules for an app revision.
-                      items:
-                        description: ClusterPlacement defines the cluster placement rules for an app revision.
-                        properties:
-                          clusterSelector:
-                            description: ClusterSelector selects the cluster to  deploy apps to. If not specified, it indicates the host cluster per se.
-                            properties:
-                              labels:
-                                additionalProperties:
-                                  type: string
-                                description: Labels defines the label selector to select the cluster.
-                                type: object
-                              name:
-                                description: Name is the name of the cluster.
-                                type: string
-                            type: object
-                          distribution:
-                            description: Distribution defines the replica distribution of an AppRevision to a cluster.
-                            properties:
-                              replicas:
-                                description: Replicas is the replica number.
-                                type: integer
-                            type: object
-                        type: object
-                      type: array
-                    revisionName:
-                      description: RevisionName is the name of the AppRevision.
-                      type: string
-                  type: object
-                type: array
-              traffic:
-                description: Traffic defines the traffic rules to apply across revisions.
-                properties:
-                  gateways:
-                    description: Gateways specifies the names of gateways that should apply these rules. Gateways in other namespaces may be referred to by `<gateway namespace>/<gateway name>`; specifying a gateway with no namespace qualifier is the same as specifying the AppDeployment's namespace.
-                    items:
-                      type: string
-                    type: array
-                  hosts:
-                    description: Hosts are the destination hosts to which traffic is being sent. Could be a DNS name with wildcard prefix or an IP address.
-                    items:
-                      type: string
-                    type: array
-                  http:
-                    description: HTTP defines the rules to match and split http traffoc across revisions.
-                    items:
-                      description: HTTPRule defines the rules to match and split http traffic across revisions.
-                      properties:
-                        match:
-                          description: Match defines the conditions to be satisfied for the rule to be activated. All conditions inside a single match block have AND semantics, while the list of match blocks have OR semantics. The rule is matched if any one of the match blocks succeed.
-                          items:
-                            description: HTTPMatchRequest specifies a set of criterion to be met in order for the rule to be applied to the HTTP request. For example, the following restricts the rule to match only requests where the URL path starts with /ratings/v2/ and the request contains a custom `end-user` header with value `jason`.
-                            properties:
-                              uri:
-                                description: URI defines how to match with an URI.
-                                properties:
-                                  prefix:
-                                    type: string
-                                type: object
-                            type: object
-                          type: array
-                        weightedTargets:
-                          description: WeightedTargets defines the revision targets to select and route traffic to.
-                          items:
-                            description: WeightedTarget defines the revision target to select and route traffic to.
-                            properties:
-                              componentName:
-                                description: ComponentName is the name of the component. Note that it is the original component name in the Application. No need to append revision.
-                                type: string
-                              port:
-                                description: Port is the port to route traffic towards.
-                                type: integer
-                              revisionName:
-                                description: RevisionName is the name of the app revision.
-                                type: string
-                              weight:
-                                description: Weight defines the proportion of traffic to be forwarded to the service version. (0-100). Sum of weights across destinations SHOULD BE == 100. If there is only one destination in a rule, the weight value is assumed to be 100.
-                                type: integer
-                            type: object
-                          type: array
-                      type: object
-                    type: array
-                type: object
-            type: object
-          status:
-            description: AppDeploymentStatus defines the observed state of AppDeployment
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True, False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              phase:
-                description: Phase shows the phase that the AppDeployment is undergoing. If Phase is Rolling, no update should be made to the spec.
-                type: string
-              placement:
-                description: Placement shows the cluster placement results of the app revisions.
-                items:
-                  description: PlacementStatus shows the cluster placement results of an app revision.
-                  properties:
-                    clusters:
-                      description: Clusters shows cluster placement results.
-                      items:
-                        description: ClusterPlacementStatus shows the placement results of a cluster.
-                        properties:
-                          clusterName:
-                            description: ClusterName indicates the name of the cluster to deploy apps to. If empty, it indicates the host cluster per se.
-                            type: string
-                          replicas:
-                            description: Replicas indicates the replica number of an app revision to deploy to a cluster.
-                            type: integer
-                        type: object
-                      type: array
-                    revisionName:
-                      description: RevisionName is the name of the AppRevision.
-                      type: string
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -5,11 +5,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: applicationconfigurations.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: ApplicationConfiguration
     listKind: ApplicationConfigurationList
@@ -48,111 +50,6 @@ spec:
                       items:
                         description: DataInput specifies a data input sink to an object. If input is array, it will be appended to the target field paths.
                         properties:
-                          conditions:
-                            description: When the Conditions is satified, ToFieldPaths will be filled with passed value
-                            items:
-                              description: ConditionRequirement specifies the requirement to match a value.
-                              properties:
-                                fieldPath:
-                                  description: FieldPath specifies got value from workload/trait object
-                                  type: string
-                                op:
-                                  description: ConditionOperator specifies the operator to match a value.
-                                  type: string
-                                value:
-                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                  type: string
-                                valueFrom:
-                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                  properties:
-                                    fieldPath:
-                                      type: string
-                                  required:
-                                  - fieldPath
-                                  type: object
-                              required:
-                              - op
-                              type: object
-                            type: array
-                          inputStore:
-                            description: InputStore specifies the object used to read intermediate data genereted by DataOutput
-                            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
-                              operations:
-                                description: Operations specify the data processing operations
-                                items:
-                                  description: DataOperation defines the specific operation for data
-                                  properties:
-                                    conditions:
-                                      items:
-                                        description: ConditionRequirement specifies the requirement to match a value.
-                                        properties:
-                                          fieldPath:
-                                            description: FieldPath specifies got value from workload/trait object
-                                            type: string
-                                          op:
-                                            description: ConditionOperator specifies the operator to match a value.
-                                            type: string
-                                          value:
-                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                            type: string
-                                          valueFrom:
-                                            description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                            properties:
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                        required:
-                                        - op
-                                        type: object
-                                      type: array
-                                    op:
-                                      description: Operator specifies the operation under this DataOperation type
-                                      type: string
-                                    toDataPath:
-                                      description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-                                      type: string
-                                    toFieldPath:
-                                      description: ToFieldPath refers to the value of an object's field
-                                      type: string
-                                    type:
-                                      description: Type specifies the type of DataOperation
-                                      type: string
-                                    value:
-                                      description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                      type: string
-                                    valueFrom:
-                                      description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
-                                      properties:
-                                        fieldPath:
-                                          type: string
-                                      required:
-                                      - fieldPath
-                                      type: object
-                                  required:
-                                  - op
-                                  - toFieldPath
-                                  - type
-                                  type: object
-                                type: array
-                              uid:
-                                description: UID of the referenced object.
-                                type: string
-                            required:
-                            - apiVersion
-                            - kind
-                            - name
-                            type: object
                           strategyMergeKeys:
                             description: StrategyMergeKeys specifies the merge key if the toFieldPaths target is an array. The StrategyMergeKeys is optional, by default, if the toFieldPaths target is an array, we will append. If StrategyMergeKeys specified, we will check the key in the target array. If any key exist, do update; if no key exist, append.
                             items:
@@ -211,85 +108,6 @@ spec:
                           name:
                             description: Name is the unique name of a DataOutput in an ApplicationConfiguration.
                             type: string
-                          outputStore:
-                            description: OutputStore specifies the object used to store intermediate data generated by Operations
-                            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
-                              operations:
-                                description: Operations specify the data processing operations
-                                items:
-                                  description: DataOperation defines the specific operation for data
-                                  properties:
-                                    conditions:
-                                      items:
-                                        description: ConditionRequirement specifies the requirement to match a value.
-                                        properties:
-                                          fieldPath:
-                                            description: FieldPath specifies got value from workload/trait object
-                                            type: string
-                                          op:
-                                            description: ConditionOperator specifies the operator to match a value.
-                                            type: string
-                                          value:
-                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                            type: string
-                                          valueFrom:
-                                            description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                            properties:
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                        required:
-                                        - op
-                                        type: object
-                                      type: array
-                                    op:
-                                      description: Operator specifies the operation under this DataOperation type
-                                      type: string
-                                    toDataPath:
-                                      description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-                                      type: string
-                                    toFieldPath:
-                                      description: ToFieldPath refers to the value of an object's field
-                                      type: string
-                                    type:
-                                      description: Type specifies the type of DataOperation
-                                      type: string
-                                    value:
-                                      description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                      type: string
-                                    valueFrom:
-                                      description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
-                                      properties:
-                                        fieldPath:
-                                          type: string
-                                      required:
-                                      - fieldPath
-                                      type: object
-                                  required:
-                                  - op
-                                  - toFieldPath
-                                  - type
-                                  type: object
-                                type: array
-                              uid:
-                                description: UID of the referenced object.
-                                type: string
-                            required:
-                            - apiVersion
-                            - kind
-                            - name
-                            type: object
                         type: object
                       type: array
                     parameterValues:
@@ -353,111 +171,6 @@ spec:
                             items:
                               description: DataInput specifies a data input sink to an object. If input is array, it will be appended to the target field paths.
                               properties:
-                                conditions:
-                                  description: When the Conditions is satified, ToFieldPaths will be filled with passed value
-                                  items:
-                                    description: ConditionRequirement specifies the requirement to match a value.
-                                    properties:
-                                      fieldPath:
-                                        description: FieldPath specifies got value from workload/trait object
-                                        type: string
-                                      op:
-                                        description: ConditionOperator specifies the operator to match a value.
-                                        type: string
-                                      value:
-                                        description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                        type: string
-                                      valueFrom:
-                                        description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                        properties:
-                                          fieldPath:
-                                            type: string
-                                        required:
-                                        - fieldPath
-                                        type: object
-                                    required:
-                                    - op
-                                    type: object
-                                  type: array
-                                inputStore:
-                                  description: InputStore specifies the object used to read intermediate data genereted by DataOutput
-                                  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
-                                    operations:
-                                      description: Operations specify the data processing operations
-                                      items:
-                                        description: DataOperation defines the specific operation for data
-                                        properties:
-                                          conditions:
-                                            items:
-                                              description: ConditionRequirement specifies the requirement to match a value.
-                                              properties:
-                                                fieldPath:
-                                                  description: FieldPath specifies got value from workload/trait object
-                                                  type: string
-                                                op:
-                                                  description: ConditionOperator specifies the operator to match a value.
-                                                  type: string
-                                                value:
-                                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                                  type: string
-                                                valueFrom:
-                                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                                  properties:
-                                                    fieldPath:
-                                                      type: string
-                                                  required:
-                                                  - fieldPath
-                                                  type: object
-                                              required:
-                                              - op
-                                              type: object
-                                            type: array
-                                          op:
-                                            description: Operator specifies the operation under this DataOperation type
-                                            type: string
-                                          toDataPath:
-                                            description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-                                            type: string
-                                          toFieldPath:
-                                            description: ToFieldPath refers to the value of an object's field
-                                            type: string
-                                          type:
-                                            description: Type specifies the type of DataOperation
-                                            type: string
-                                          value:
-                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                            type: string
-                                          valueFrom:
-                                            description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
-                                            properties:
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                        required:
-                                        - op
-                                        - toFieldPath
-                                        - type
-                                        type: object
-                                      type: array
-                                    uid:
-                                      description: UID of the referenced object.
-                                      type: string
-                                  required:
-                                  - apiVersion
-                                  - kind
-                                  - name
-                                  type: object
                                 strategyMergeKeys:
                                   description: StrategyMergeKeys specifies the merge key if the toFieldPaths target is an array. The StrategyMergeKeys is optional, by default, if the toFieldPaths target is an array, we will append. If StrategyMergeKeys specified, we will check the key in the target array. If any key exist, do update; if no key exist, append.
                                   items:
@@ -516,85 +229,6 @@ spec:
                                 name:
                                   description: Name is the unique name of a DataOutput in an ApplicationConfiguration.
                                   type: string
-                                outputStore:
-                                  description: OutputStore specifies the object used to store intermediate data generated by Operations
-                                  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
-                                    operations:
-                                      description: Operations specify the data processing operations
-                                      items:
-                                        description: DataOperation defines the specific operation for data
-                                        properties:
-                                          conditions:
-                                            items:
-                                              description: ConditionRequirement specifies the requirement to match a value.
-                                              properties:
-                                                fieldPath:
-                                                  description: FieldPath specifies got value from workload/trait object
-                                                  type: string
-                                                op:
-                                                  description: ConditionOperator specifies the operator to match a value.
-                                                  type: string
-                                                value:
-                                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                                  type: string
-                                                valueFrom:
-                                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
-                                                  properties:
-                                                    fieldPath:
-                                                      type: string
-                                                  required:
-                                                  - fieldPath
-                                                  type: object
-                                              required:
-                                              - op
-                                              type: object
-                                            type: array
-                                          op:
-                                            description: Operator specifies the operation under this DataOperation type
-                                            type: string
-                                          toDataPath:
-                                            description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-                                            type: string
-                                          toFieldPath:
-                                            description: ToFieldPath refers to the value of an object's field
-                                            type: string
-                                          type:
-                                            description: Type specifies the type of DataOperation
-                                            type: string
-                                          value:
-                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
-                                            type: string
-                                          valueFrom:
-                                            description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
-                                            properties:
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                        required:
-                                        - op
-                                        - toFieldPath
-                                        - type
-                                        type: object
-                                      type: array
-                                    uid:
-                                      description: UID of the referenced object.
-                                      type: string
-                                  required:
-                                  - apiVersion
-                                  - kind
-                                  - name
-                                  type: object
                               type: object
                             type: array
                           trait:
@@ -738,9 +372,6 @@ spec:
                 description: The generation observed by the appConfig controller.
                 format: int64
                 type: integer
-              rollingStatus:
-                description: RollingStatus indicates what phase are we in the rollout phase
-                type: string
               status:
                 description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the entire application
                 type: string

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

@@ -1,304 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: applicationcontexts.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: ApplicationContext
-    listKind: ApplicationContextList
-    plural: applicationcontexts
-    shortNames:
-    - appcontext
-    singular: applicationcontext
-  scope: Namespaced
-  versions:
-  - name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: ApplicationContext is the Schema for the ApplicationContext 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: ApplicationContextSpec is the spec of ApplicationContext
-            properties:
-              applicationRevisionName:
-                description: ApplicationRevisionName points to the snapshot of an Application with all its closure
-                type: string
-            required:
-            - applicationRevisionName
-            type: object
-          status:
-            description: we need to reuse the AC status
-            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
-              dependency:
-                description: DependencyStatus represents the observed state of the dependency of an ApplicationConfiguration.
-                properties:
-                  unsatisfied:
-                    items:
-                      description: UnstaifiedDependency describes unsatisfied dependency flow between one pair of objects.
-                      properties:
-                        from:
-                          description: DependencyFromObject represents the object that dependency data comes from.
-                          properties:
-                            apiVersion:
-                              description: APIVersion of the referenced object.
-                              type: string
-                            fieldPath:
-                              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
-                        reason:
-                          type: string
-                        to:
-                          description: DependencyToObject represents the object that dependency data goes to.
-                          properties:
-                            apiVersion:
-                              description: APIVersion of the referenced object.
-                              type: string
-                            fieldPaths:
-                              items:
-                                type: string
-                              type: array
-                            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
-                      required:
-                      - from
-                      - reason
-                      - to
-                      type: object
-                    type: array
-                type: object
-              historyWorkloads:
-                description: HistoryWorkloads will record history but still working revision workloads.
-                items:
-                  description: HistoryWorkload contain the old component revision that are still running
-                  properties:
-                    revision:
-                      description: Revision of this workload
-                      type: string
-                    workloadRef:
-                      description: Reference to running workload.
-                      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: object
-                type: array
-              observedGeneration:
-                description: The generation observed by the appConfig controller.
-                format: int64
-                type: integer
-              rollingStatus:
-                description: RollingStatus indicates what phase are we in the rollout phase
-                type: string
-              status:
-                description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the entire application
-                type: string
-              workloads:
-                description: Workloads created by this ApplicationConfiguration.
-                items:
-                  description: A WorkloadStatus represents the status of a workload.
-                  properties:
-                    appliedComponentRevision:
-                      description: AppliedComponentRevision indicates the applied component revision name of this workload
-                      type: string
-                    componentName:
-                      description: ComponentName that produced this workload.
-                      type: string
-                    componentRevisionName:
-                      description: ComponentRevisionName of current component
-                      type: string
-                    dependencyUnsatisfied:
-                      description: DependencyUnsatisfied notify does the workload has dependency unsatisfied
-                      type: boolean
-                    scopes:
-                      description: Scopes associated with this workload.
-                      items:
-                        description: A WorkloadScope represents a scope associated with a workload and its status
-                        properties:
-                          scopeRef:
-                            description: Reference to a scope created by an ApplicationConfiguration.
-                            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
-                          status:
-                            description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the scope
-                            type: string
-                        required:
-                        - scopeRef
-                        type: object
-                      type: array
-                    status:
-                      description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the entire status of the workload
-                      type: string
-                    traits:
-                      description: Traits associated with this workload.
-                      items:
-                        description: A WorkloadTrait represents a trait associated with a workload and its status
-                        properties:
-                          appliedGeneration:
-                            description: AppliedGeneration indicates the generation observed by the appConfig controller. The same field is also recorded in the annotations of traits. A trait is possible to be deleted from cluster after created. This field is useful to track the observed generation of traits after they are deleted.
-                            format: int64
-                            type: integer
-                          dependencyUnsatisfied:
-                            description: DependencyUnsatisfied notify does the trait has dependency unsatisfied
-                            type: boolean
-                          message:
-                            description: Message will allow controller to leave some additional information for this trait
-                            type: string
-                          status:
-                            description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the trait
-                            type: string
-                          traitRef:
-                            description: Reference to a trait created by an ApplicationConfiguration.
-                            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
-                        required:
-                        - traitRef
-                        type: object
-                      type: array
-                    workloadRef:
-                      description: Reference to a workload created by an ApplicationConfiguration.
-                      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: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -0,0 +1,341 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
+  name: applicationdeployments.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ApplicationDeployment
+    listKind: ApplicationDeploymentList
+    plural: applicationdeployments
+    singular: applicationdeployment
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: ApplicationDeployment is the Schema for the ApplicationDeployment 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: ApplicationDeploymentSpec defines how to describe an upgrade between different application
+            properties:
+              componentList:
+                description: 'The list of component to upgrade in the application. We only support single component application so far TODO: (RZ) Support multiple components in an application'
+                items:
+                  type: string
+                type: array
+              revertOnDelete:
+                description: RevertOnDelete revert the rollout when the rollout CR is deleted, default is false It will remove the target application from the kubernetes
+                type: boolean
+              rolloutPlan:
+                description: RolloutPlan is the details on how to rollout the resources
+                properties:
+                  canaryMetric:
+                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
+                    items:
+                      description: CanaryMetric holds the reference to metrics used for canary analysis
+                      properties:
+                        interval:
+                          description: Interval represents the windows size
+                          type: string
+                        metricsRange:
+                          description: Range value accepted for this metric
+                          properties:
+                            max:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Maximum value
+                              x-kubernetes-int-or-string: true
+                            min:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Minimum value
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        name:
+                          description: Name of the metric
+                          type: string
+                        templateRef:
+                          description: TemplateRef references a metric template object
+                          properties:
+                            apiVersion:
+                              description: 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
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  lastBatchToRollout:
+                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
+                    format: int32
+                    type: integer
+                  numBatches:
+                    description: The number of batches, default = 1 mutually exclusive to RolloutBatches
+                    format: int32
+                    type: integer
+                  paused:
+                    description: Paused the rollout, default is false
+                    type: boolean
+                  rolloutBatches:
+                    description: The exact distribution among batches. mutually exclusive to NumBatches. The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
+                    items:
+                      description: RolloutBatch is used to describe how the each batch rollout should be
+                      properties:
+                        batchRolloutWebhooks:
+                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
+                          items:
+                            description: RolloutWebhook holds the reference to external checks used for canary analysis
+                            properties:
+                              metadata:
+                                additionalProperties:
+                                  type: string
+                                description: Metadata (key-value pairs) for this webhook
+                                type: object
+                              name:
+                                description: Name of this webhook
+                                type: string
+                              timeout:
+                                description: Request timeout for this webhook
+                                type: string
+                              type:
+                                description: Type of this webhook
+                                type: string
+                              url:
+                                description: URL address of this webhook
+                                type: string
+                            required:
+                            - name
+                            - type
+                            - url
+                            type: object
+                          type: array
+                        canaryMetric:
+                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
+                          items:
+                            description: CanaryMetric holds the reference to metrics used for canary analysis
+                            properties:
+                              interval:
+                                description: Interval represents the windows size
+                                type: string
+                              metricsRange:
+                                description: Range value accepted for this metric
+                                properties:
+                                  max:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Maximum value
+                                    x-kubernetes-int-or-string: true
+                                  min:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Minimum value
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              name:
+                                description: Name of the metric
+                                type: string
+                              templateRef:
+                                description: TemplateRef references a metric template object
+                                properties:
+                                  apiVersion:
+                                    description: 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
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        instanceInterval:
+                          description: The wait time, in seconds, between instances upgrades, default = 0
+                          format: int32
+                          type: integer
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
+                          x-kubernetes-int-or-string: true
+                        podList:
+                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
+                          items:
+                            type: string
+                          type: array
+                        replicas:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    type: array
+                  rolloutStrategy:
+                    description: RolloutStrategy defines strategies for the rollout plan
+                    type: string
+                  rolloutWebhooks:
+                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
+                    items:
+                      description: RolloutWebhook holds the reference to external checks used for canary analysis
+                      properties:
+                        metadata:
+                          additionalProperties:
+                            type: string
+                          description: Metadata (key-value pairs) for this webhook
+                          type: object
+                        name:
+                          description: Name of this webhook
+                          type: string
+                        timeout:
+                          description: Request timeout for this webhook
+                          type: string
+                        type:
+                          description: Type of this webhook
+                          type: string
+                        url:
+                          description: URL address of this webhook
+                          type: string
+                      required:
+                      - name
+                      - type
+                      - url
+                      type: object
+                    type: array
+                  targetSize:
+                    description: The size of the target resource. The default is the same as the size of the source resource.
+                    format: int32
+                    type: integer
+                type: object
+              sourceApplicationName:
+                description: SourceApplicationName contains the name of the application that we need to upgrade from. it can be empty only when it's the first time to deploy the application
+                type: string
+              targetApplicationName:
+                description: TargetApplicationName contains the name of the application that we need to upgrade to. We assume that an application is immutable, thus the name alone is suffice
+                type: string
+            required:
+            - rolloutPlan
+            - targetApplicationName
+            type: object
+          status:
+            description: ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
+            properties:
+              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
+              lastSourceApplicationName:
+                description: LastSourceApplicationName contains the name of the application that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                type: string
+              lastTargetApplicationName:
+                description: LastTargetApplicationName contains the name of the application that we upgraded to We will restart the rollout if this is not the same as the spec
+                type: string
+              rollingState:
+                description: RollingState is the Rollout State
+                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: UpgradedReplicas 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
+            - lastTargetApplicationName
+            - rollingState
+            - upgradedReadyReplicas
+            - upgradedReplicas
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,731 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: approllouts.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: AppRollout
-    listKind: AppRolloutList
-    plural: approllouts
-    shortNames:
-    - approllout
-    singular: approllout
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .status.rolloutStatus.rolloutTargetSize
-      name: TARGET
-      type: string
-    - jsonPath: .status.rolloutStatus.upgradedReplicas
-      name: UPGRADED
-      type: string
-    - jsonPath: .status.rolloutStatus.upgradedReadyReplicas
-      name: READY
-      type: string
-    - jsonPath: .status.rolloutStatus.batchRollingState
-      name: BATCH-STATE
-      type: string
-    - jsonPath: .status.rolloutStatus.rollingState
-      name: ROLLING-STATE
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: AppRollout is the Schema for the AppRollout API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: AppRolloutSpec defines how to describe an upgrade between different apps
-            properties:
-              componentList:
-                description: 'The list of component to upgrade in the application. We only support single component application so far TODO: (RZ) Support multiple components in an application'
-                items:
-                  type: string
-                type: array
-              revertOnDelete:
-                description: RevertOnDelete revert the rollout when the rollout CR is deleted It will remove the target app from the kubernetes if it's set to true
-                type: boolean
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: 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
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template object
-                                properties:
-                                  apiVersion:
-                                    description: 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
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
-              sourceAppRevisionName:
-                description: SourceAppRevisionName contains the name of the applicationRevision that we need to upgrade from. it can be empty only when the rolling is only a scale event
-                type: string
-              targetAppRevisionName:
-                description: TargetAppRevisionName contains the name of the applicationRevision that we need to upgrade to.
-                type: string
-            required:
-            - rolloutPlan
-            - targetAppRevisionName
-            type: object
-          status:
-            description: AppRolloutStatus defines the observed state of AppRollout
-            properties:
-              LastSourceAppRevision:
-                description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                type: string
-              batchRollingState:
-                description: BatchRollingState only meaningful when the Status is rolling
-                type: string
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True, False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              currentBatch:
-                description: The current batch the rollout is working on/blocked it starts from 0
-                format: int32
-                type: integer
-              lastAppliedPodTemplateIdentifier:
-                description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                type: string
-              lastTargetAppRevision:
-                description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                type: string
-              rollingState:
-                description: RollingState is the Rollout State
-                type: string
-              rolloutOriginalSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              rolloutTargetSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              targetGeneration:
-                description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                type: string
-              upgradedReadyReplicas:
-                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                format: int32
-                type: integer
-              upgradedReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                format: int32
-                type: integer
-            required:
-            - currentBatch
-            - lastTargetAppRevision
-            - rollingState
-            - upgradedReadyReplicas
-            - upgradedReplicas
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources:
-      status: {}
-  - additionalPrinterColumns:
-    - jsonPath: .status.rolloutTargetSize
-      name: TARGET
-      type: string
-    - jsonPath: .status.upgradedReplicas
-      name: UPGRADED
-      type: string
-    - jsonPath: .status.upgradedReadyReplicas
-      name: READY
-      type: string
-    - jsonPath: .status.batchRollingState
-      name: BATCH-STATE
-      type: string
-    - jsonPath: .status.rollingState
-      name: ROLLING-STATE
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: AppRollout is the Schema for the AppRollout API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: AppRolloutSpec defines how to describe an upgrade between different apps
-            properties:
-              componentList:
-                description: 'The list of component to upgrade in the application. We only support single component application so far TODO: (RZ) Support multiple components in an application'
-                items:
-                  type: string
-                type: array
-              revertOnDelete:
-                description: RevertOnDelete revert the failed rollout when the rollout CR is deleted It will revert the change back to the source version at once (not in batches) Default is false
-                type: boolean
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: 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
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template object
-                                properties:
-                                  apiVersion:
-                                    description: 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
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
-              sourceAppRevisionName:
-                description: SourceAppRevisionName contains the name of the applicationConfiguration that we need to upgrade from. it can be empty only when it's the first time to deploy the application
-                type: string
-              targetAppRevisionName:
-                description: TargetAppRevisionName contains the name of the applicationConfiguration that we need to upgrade to. Here we use an applicationConfiguration as a revision of an application, thus the name alone is suffice
-                type: string
-            required:
-            - rolloutPlan
-            - targetAppRevisionName
-            type: object
-          status:
-            description: AppRolloutStatus defines the observed state of AppRollout
-            properties:
-              LastSourceAppRevision:
-                description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                type: string
-              batchRollingState:
-                description: BatchRollingState only meaningful when the Status is rolling
-                type: string
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True, False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              currentBatch:
-                description: The current batch the rollout is working on/blocked it starts from 0
-                format: int32
-                type: integer
-              lastAppliedPodTemplateIdentifier:
-                description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                type: string
-              lastTargetAppRevision:
-                description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                type: string
-              rollingState:
-                description: RollingState is the Rollout State
-                type: string
-              rolloutOriginalSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              rolloutTargetSize:
-                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                format: int32
-                type: integer
-              targetGeneration:
-                description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                type: string
-              upgradedReadyReplicas:
-                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                format: int32
-                type: integer
-              upgradedReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                format: int32
-                type: integer
-            required:
-            - currentBatch
-            - lastTargetAppRevision
-            - rollingState
-            - upgradedReadyReplicas
-            - upgradedReplicas
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -1,55 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: clusters.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
-    singular: cluster
-  scope: Namespaced
-  versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: Cluster is the Schema for the clusters API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ClusterSpec defines the desired state of Cluster
-            properties:
-              kubeconfigSecretRef:
-                description: KubeconfigSecretRef specifies the reference to the secret that contains the kubeconfig in field `config`.
-                properties:
-                  name:
-                    description: Name of a secret within the enclosing namespace.
-                    type: string
-                required:
-                - name
-                type: object
-            type: object
-          status:
-            description: ClusterStatus defines the observed state of Cluster
-            type: object
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -1,481 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: componentdefinitions.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: ComponentDefinition
-    listKind: ComponentDefinitionList
-    plural: componentdefinitions
-    shortNames:
-    - comp
-    singular: componentdefinition
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.workload.definition.kind
-      name: WORKLOAD-KIND
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: ComponentDefinition is the Schema for the componentdefinitions 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: 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
-    served: true
-    storage: false
-    subresources:
-      status: {}
-  - additionalPrinterColumns:
-    - jsonPath: .spec.workload.definition.kind
-      name: WORKLOAD-KIND
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: ComponentDefinition is the Schema for the componentdefinitions 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: 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
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -5,11 +5,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: components.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: Component
     listKind: ComponentList
@@ -40,21 +42,6 @@ spec:
           spec:
             description: A ComponentSpec defines the desired state of a Component.
             properties:
-              helm:
-                description: HelmRelease records a Helm release used by a Helm module workload.
-                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
               parameters:
                 description: Parameters exposed by this component. ApplicationConfigurations that reference this component may specify values for these parameters, which will in turn be injected into the embedded workload.
                 items:
@@ -127,9 +114,6 @@ spec:
                   revision:
                     format: int64
                     type: integer
-                  revisionHash:
-                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
-                    type: string
                 required:
                 - name
                 - revision

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

@@ -5,11 +5,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: containerizedworkloads.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: ContainerizedWorkload
     listKind: ContainerizedWorkloadList

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

@@ -1,813 +0,0 @@
-
----
-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_healthscopes.yaml

@@ -5,11 +5,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: healthscopes.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: HealthScope
     listKind: HealthScopeList

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

@@ -5,11 +5,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: manualscalertraits.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: ManualScalerTrait
     listKind: ManualScalerTraitList

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

@@ -1,195 +0,0 @@
-
----
-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_resourcetrackers.yaml

@@ -1,74 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: resourcetrackers.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: ResourceTracker
-    listKind: ResourceTrackerList
-    plural: resourcetrackers
-    shortNames:
-    - tracker
-    singular: resourcetracker
-  scope: Cluster
-  versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: An ResourceTracker represents a tracker for track cross namespace resources
-        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
-          status:
-            description: ResourceTrackerStatus define the status of resourceTracker
-            properties:
-              trackedResources:
-                items:
-                  description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference across-namespace objects
-                  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
-                    namespace:
-                      description: Namespace of the objects outside the application namespace.
-                      type: string
-                    uid:
-                      description: UID of the referenced object.
-                      type: string
-                  required:
-                  - apiVersion
-                  - kind
-                  - name
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -5,17 +5,17 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: scopedefinitions.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: ScopeDefinition
     listKind: ScopeDefinitionList
     plural: scopedefinitions
-    shortNames:
-    - scope
     singular: scopedefinition
   scope: Namespaced
   versions:
@@ -67,56 +67,6 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
-    subresources: {}
-  - additionalPrinterColumns:
-    - jsonPath: .spec.definitionRef.name
-      name: DEFINITION-NAME
-      type: string
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        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.
-        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 ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
-            properties:
-              allowComponentOverlap:
-                description: AllowComponentOverlap specifies whether an OAM component may exist in multiple instances of this kind of scope.
-                type: boolean
-              definitionRef:
-                description: Reference to the CustomResourceDefinition that defines this scope 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
-              workloadRefsPath:
-                description: WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
-                type: string
-            required:
-            - allowComponentOverlap
-            - definitionRef
-            type: object
-        type: object
-    served: true
     storage: true
     subresources: {}
 status:

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

@@ -5,26 +5,23 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: traitdefinitions.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: TraitDefinition
     listKind: TraitDefinitionList
     plural: traitdefinitions
-    shortNames:
-    - trait
     singular: traitdefinition
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.appliesToWorkloads
-      name: APPLIES-TO
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
+    - jsonPath: .spec.definitionRef.name
+      name: DEFINITION-NAME
       type: string
     name: v1alpha2
     schema:
@@ -68,9 +65,6 @@ spec:
                 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
@@ -86,80 +80,6 @@ spec:
                     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
@@ -175,272 +95,10 @@ spec:
                 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 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
-    storage: false
-    subresources:
-      status: {}
-  - additionalPrinterColumns:
-    - jsonPath: .spec.appliesToWorkloads
-      name: APPLIES-TO
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: A TraitDefinition registers a kind of Kubernetes custom resource as a valid OAM trait kind by referencing its CustomResourceDefinition. The CRD is used to validate the schema of the trait when it is embedded in an OAM ApplicationConfiguration.
-        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
     served: true
     storage: true
-    subresources:
-      status: {}
+    subresources: {}
 status:
   acceptedNames:
     kind: ""

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

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

@@ -5,17 +5,17 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
   name: workloaddefinitions.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
+    - crossplane
     - oam
     kind: WorkloadDefinition
     listKind: WorkloadDefinitionList
     plural: workloaddefinitions
-    shortNames:
-    - workload
     singular: workloaddefinition
   scope: Namespaced
   versions:
@@ -94,80 +94,6 @@ spec:
                     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
@@ -179,243 +105,12 @@ spec:
                     description: HealthPolicy defines the health check policy for the abstraction
                     type: string
                 type: object
+              template:
+                description: Template defines the abstraction template data of the workload, it will replace the old template in extension field. the data format depends on templateType, by default it's CUE
+                type: string
             required:
             - definitionRef
             type: object
-          status:
-            description: WorkloadDefinitionStatus is the status of WorkloadDefinition
-            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
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources: {}
-  - additionalPrinterColumns:
-    - jsonPath: .spec.definitionRef.name
-      name: DEFINITION-NAME
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: A WorkloadDefinition registers a kind of Kubernetes custom resource as a valid OAM workload kind by referencing its CustomResourceDefinition. The CRD is used to validate the schema of the workload when it is embedded in an OAM Component.
-        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 WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
-            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
-              definitionRef:
-                description: Reference to the CustomResourceDefinition that defines this workload 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
-              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
-            required:
-            - definitionRef
-            type: object
-          status:
-            description: WorkloadDefinitionStatus is the status of WorkloadDefinition
-            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
-            type: object
         type: object
     served: true
     storage: true