disable rollout and deploy docs (#1860)

* fix trait name
* add test

.github/CODEOWNERS

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

.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/PULL_REQUEST_TEMPLATE.md

@@ -1,37 +0,0 @@
-
-### Description of your changes
-
-<!--
-
-Briefly describe what this pull request does. We love pull requests that resolve an open KubeVela issue. If yours does, you
-can uncomment the below line to indicate which issue your PR fixes, for example
-"Fixes #500":
-
--->
-
-Fixes #
-
-I have:
-
-- [ ] Read and followed KubeVela's [contribution process](https://github.com/kubevela/kubevela/blob/master/contribute/create-pull-request.md).
-- [ ] [Related Docs](https://github.com/kubevela/kubevela.io) updated properly. In a new feature or configuration option, an update to the documentation is necessary. 
-- [ ] Run `make reviewable` to ensure this PR is ready for review.
-- [ ] Added `backport release-x.y` labels to auto-backport this PR if necessary.
-
-### How has this code been tested
-
-<!--
-Before reviewers can be confident in the correctness of this pull request, it
-needs to tested and shown to be correct. Briefly describe the testing that has
-already been done or which is planned for this change.
--->
-
-
-### Special notes for your reviewer
-
-<!--
-
-Be sure to direct your reviewers'
-attention to anything that needs special consideration.
-
--->

.github/bot.md

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

.github/comment.userlist

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

.github/issue-commands.json

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

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

@@ -1,10 +0,0 @@
-{
-  "LABEL": {
-    "name": "title-needs-formatting",
-    "color": "EEEEEE"
-  },
-  "CHECKS": {
-    "prefixes": ["Fix: ", "Feat: ", "Docs: ", "Test: ", "Chore: ", "CI: ", "Perf: ", "Refactor: ", "Revert: ", "Style: ", "Test: ",
-      "Fix(", "Feat(", "Docs(", "Test(", "Chore(", "CI(", "Perf(", "Refactor(", "Revert(", "Style(", "Test(", "[Backport"]
-  }
-}

.github/workflows/apiserver-test.yaml

@@ -1,207 +0,0 @@
-name: VelaUX APIServer Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-      - apiserver
-    tags:
-      - v*
-  workflow_dispatch: { }
-  pull_request:
-    branches:
-      - master
-      - release-*
-      - apiserver
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
-
-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@v4.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - id: set-k8s-matrix
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
-            echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
-          fi
-
-  apiserver-unit-tests:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v2
-        with:
-          path: .work/pkg
-          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-pkg-
-
-      - name: Install ginkgo
-        run: |
-          sudo apt-get install -y golang-ginkgo-dev
-
-      - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.7.0
-        with:
-          mongodb-version: '5.0'
-
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 3.1.0
-          kubebuilderOnly: false
-          kubernetesVersion: v1.21.2
-
-      - name: Run api server unit test
-        run: make unit-test-apiserver
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.txt
-          flags: apiserver-unittests
-          name: codecov-umbrella
-
-  apiserver-e2e-tests:
-    runs-on: aliyun-legacy
-    needs: [ detect-noop,set-k8s-matrix ]
-    if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
-
-
-      - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-name: worker
-          k3d-args: --kubeconfig-update-default=false --network=k3d-k3s-default ${{ env.EGRESS_ARG }}
-
-
-      - name: Kind Cluster (Worker)
-        run: |
-          internal_ip=$(docker network inspect k3d-k3s-default|jq ".[0].Containers"| jq -r '.[]| select(.Name=="k3d-worker-server-0")|.IPv4Address' | cut -d/ -f1)
-          k3d kubeconfig get worker > /tmp/worker.client.kubeconfig
-          cp /tmp/worker.client.kubeconfig /tmp/worker.kubeconfig
-          sed -i "s/0.0.0.0:[0-9]\+/$internal_ip:6443/"  /tmp/worker.kubeconfig
-
-      - name: Load image to k3d cluster
-        run: make image-load
-
-      - name: Cleanup for e2e tests
-        run: |
-          make vela-cli
-          make e2e-cleanup
-          make e2e-setup-core
-          bin/vela addon enable fluxcd
-          timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
-          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
-
-      - name: Run api server e2e test
-        run: |
-          export ALIYUN_ACCESS_KEY_ID=${{ secrets.ALIYUN_ACCESS_KEY_ID }}
-          export ALIYUN_ACCESS_KEY_SECRET=${{ secrets.ALIYUN_ACCESS_KEY_SECRET }}
-          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          make e2e-apiserver-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e-core
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e_apiserver_test.out
-          flags: apiserver-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/back-port.yaml

@@ -1,22 +0,0 @@
-name: Backport
-on:
-  pull_request_target:
-    types:
-      - closed
-
-jobs:
-  # align with crossplane's choice https://github.com/crossplane/crossplane/blob/master/.github/workflows/backport.yml
-  open-pr:
-    runs-on: ubuntu-20.04
-    if: github.event.pull_request.merged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}

.github/workflows/chart.yaml

@@ -1,100 +0,0 @@
-name: Publish Chart
-
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch: { }
-
-env:
-  BUCKET: ${{ secrets.OSS_BUCKET }}
-  ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
-  ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-  ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}
-
-jobs:  
-  publish-charts:
-    env:
-      HELM_CHARTS_DIR: charts
-      HELM_CHART: charts/vela-core
-      MINIMAL_HELM_CHART: charts/vela-minimal
-      LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
-      LOCAL_OSS_DIRECTORY: .oss
-      HELM_CHART_NAME: vela-core
-      MINIMAL_HELM_CHART_NAME: vela-minimal
-      LEGACY_HELM_CHART_NAME: vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART_NAME: vela-rollout
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@master
-      - name: Get git revision
-        id: vars
-        shell: bash
-        run: |
-          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
-      - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.4.0
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - name: Generate helm doc
-        run: |
-          make helm-doc-gen
-      - name: Prepare legacy chart
-        run: |
-          rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
-          rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
-      - name: Prepare vela chart
-        run: |
-          rsync -r $VELA_ROLLOUT_HELM_CHART $HELM_CHARTS_DIR
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          echo ::set-output name=VERSION::${VERSION}
-      - name: Tag helm chart image
-        run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
-          chart_version=${{ steps.get_version.outputs.VERSION }}
-          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $MINIMAL_HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $LEGACY_HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $VELA_ROLLOUT_HELM_CHART/values.yaml
-          chart_smever=${chart_version#"v"}
-          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $MINIMAL_HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $VELA_ROLLOUT_HELM_CHART/Chart.yaml
-      - name: Install ossutil
-        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
-      - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
-      - name: sync cloud to local
-        run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
-      - name: add artifacthub stuff to the repo
-        run: |
-          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
-          rsync $HELM_CHART/README.md $VELA_ROLLOUT_HELM_CHART/README.md
-          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
-          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
-      - name: Package helm charts
-        run: |
-          helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $MINIMAL_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
-      - name: sync local to cloud
-        run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
-          chart_semver=${image_tag#"v"}
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/index.yaml oss://$BUCKET/core/index.yaml
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$HELM_CHART_NAME-${chart_semver}.tgz 
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$MINIMAL_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$MINIMAL_HELM_CHART_NAME-${chart_semver}.tgz
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz

.github/workflows/check-docs.yml

@@ -0,0 +1,26 @@
+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/clean-md.py ./docs/en
+      - name: Test Build
+        env:
+          VERSION: ${{ github.ref }}
+        run: |
+          bash ./hack/website/test-build.sh

.github/workflows/commit-lint.yml

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

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

@@ -1,145 +0,0 @@
-name: E2E MultiCluster Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-    tags:
-      - v*
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
-
-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@v4.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - id: set-k8s-matrix
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
-            echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
-          fi
-
-
-  e2e-multi-cluster-tests:
-    runs-on: aliyun-legacy
-    needs: [ detect-noop,set-k8s-matrix ]
-    if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
-
-    steps:
-      - name: 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: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
-
-      - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-name: worker
-          k3d-args: --kubeconfig-update-default=false --network=k3d-k3s-default ${{ env.EGRESS_ARG }}
-
-      - name: Generating internal worker kubeconfig
-        run: |
-          internal_ip=$(docker network inspect k3d-k3s-default|jq ".[0].Containers"| jq -r '.[]| select(.Name=="k3d-worker-server-0")|.IPv4Address' | cut -d/ -f1)
-          k3d kubeconfig get worker > /tmp/worker.client.kubeconfig
-          cp /tmp/worker.client.kubeconfig /tmp/worker.kubeconfig
-          sed -i "s/0.0.0.0:[0-9]\+/$internal_ip:6443/"  /tmp/worker.kubeconfig
-
-      - name: Load image to k3d cluster (hub and worker)
-        run: make image-load image-load-runtime-cluster
-
-      - name: Cleanup for e2e tests
-        run: |
-          make vela-cli
-          make e2e-cleanup
-          make e2e-setup-core-auth
-          make setup-runtime-e2e-cluster
-
-      - name: Run e2e multicluster tests
-        run: |
-          export PATH=$(pwd)/bin:$PATH
-          make e2e-multicluster-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e-core
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out,/tmp/e2e_multicluster_test.out
-          flags: e2e-multicluster-test
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup

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

@@ -1,128 +0,0 @@
-name: E2E Rollout Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-    tags:
-      - v*
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
-
-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@v4.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - id: set-k8s-matrix
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
-            echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
-          fi
-
-  e2e-rollout-tests:
-    runs-on: aliyun-legacy
-    needs: [ detect-noop,set-k8s-matrix ]
-    if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
-
-    steps:
-      - name: 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: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
-
-      - name: Load image to k3d cluster
-        run: make image-load image-load-runtime-cluster
-
-      - name: Prepare for e2e tests
-        run: |
-          make vela-cli
-          make e2e-cleanup
-          make e2e-setup-core
-          make setup-runtime-e2e-cluster
-          helm test -n vela-system kubevela --timeout 5m
-
-      - name: Run e2e tests
-        run: make e2e-rollout-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
-          flags: e2e-rollout-tests
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup

.github/workflows/e2e-test.yml

@@ -1,135 +0,0 @@
-name: E2E Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-    tags:
-      - v*
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
-
-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@v4.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - id: set-k8s-matrix
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
-            echo "pushing tag: ${{ github.ref_name }}"
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
-          fi
-
-  e2e-tests:
-    runs-on: aliyun-legacy
-    needs: [ detect-noop,set-k8s-matrix ]
-    if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
-
-    steps:
-      - name: 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: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
-
-      - name: Load image to k3d cluster
-        run: make image-load
-
-      - name: Run Make
-        run: make
-
-      - name: Prepare for e2e tests
-        run: |
-          make e2e-cleanup
-          make e2e-setup-core
-          helm test -n vela-system kubevela --timeout 5m
-
-      - name: Run api e2e tests
-        run: make e2e-api-test
-
-      - name: Run addons e2e tests
-        run: make e2e-addon-test
-
-      - name: Run e2e tests
-        run: make e2e-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
-          flags: e2etests
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup

.github/workflows/go.yml

@@ -13,8 +13,9 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.14'
   GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
 
 jobs:
 
@@ -25,13 +26,177 @@ jobs:
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@v4.0.0
+        uses: fkirc/skip-duplicate-actions@v3.3.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
+  unit-tests:
+    runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Install ginkgo
+        run:  |
+          sudo apt-get install -y golang-ginkgo-dev
+
+      - name: Setup Kind Cluster
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+
+      - name: install Kubebuilder
+        uses: wonderflow/kubebuilder-action@v1.1
+
+      - name: Run Make test
+        run: make test
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.txt
+          flags: unittests
+          name: codecov-umbrella
+
+  compatibility-test:
+    runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Install ginkgo
+        run: |
+          sudo apt-get install -y golang-ginkgo-dev
+
+      - name: Setup Kind Cluster
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+
+      - name: install Kubebuilder
+        uses: wonderflow/kubebuilder-action@v1.1
+
+      - name: Run Make compatibility-test
+        run: make compatibility-test
+
+      - name: Clean up testdata
+        run: make compatibility-testdata-cleanup
+
+  e2e-tests:
+    runs-on: aliyun
+    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
+
   staticcheck:
     runs-on: ubuntu-20.04
     needs: detect-noop
@@ -56,8 +221,8 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Install StaticCheck
-        run: GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@v0.3.0
-
+        run: GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck
+      
       - name: Static Check
         run: staticcheck ./...
 
@@ -70,11 +235,6 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
-      - name: Setup Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -92,12 +252,12 @@ jobs:
       # version, but we prefer this action because it leaves 'annotations' (i.e.
       # it comments on PRs to point out linter violations).
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v2
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 
   check-diff:
-    runs-on: aliyun-legacy
+    runs-on: ubuntu-20.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
@@ -112,11 +272,6 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
       - name: Cache Go Dependencies
         uses: actions/cache@v2
         with:
@@ -127,11 +282,23 @@ jobs:
       - name: Check code formatting
         run: go install golang.org/x/tools/cmd/goimports && make fmt
 
-      - name: Run cross-build
-        run: make cross-build
-
       - name: Check Diff
         run: make check-diff
-              
-      - name: Cleanup binary
-        run: make build-cleanup
+
+  build-cli:
+    runs-on: ubuntu-latest
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14
+        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

.github/workflows/issue-commands.yml

@@ -1,75 +0,0 @@
-name: Run commands when issues are labeled or comments added
-on:
-  issues:
-    types: [labeled, opened]
-  issue_comment:
-    types: [created]
-
-jobs:
-  bot:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "oam-dev/kubevela-github-actions"
-          path: ./actions
-          ref: v0.4.2
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14'
-          cache: 'npm'
-          cache-dependency-path: ./actions/package-lock.json
-      - name: Install Dependencies
-        run: npm ci --production --prefix ./actions
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          token: ${{secrets.VELA_BOT_TOKEN}}
-          configPath: issue-commands
-
-  backport:
-    runs-on: ubuntu-18.04
-    if: github.event.issue.pull_request && contains(github.event.comment.body, '/backport')
-    steps:
-      - name: Extract Command
-        id: command
-        uses: xt0rted/slash-command-action@v1
-        with:
-          repo-token: ${{ secrets.VELA_BOT_TOKEN }}
-          command: backport
-          reaction: "true"
-          reaction-type: "eyes"
-          allow-edits: "false"
-          permission-level: read
-      - name: Handle Command
-        uses: actions/github-script@v4
-        env:
-          VERSION: ${{ steps.command.outputs.command-arguments }}
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const version = process.env.VERSION
-            let label = "backport release-" + version
-            if (version.includes("release")) {
-              label = "backport " + version
-            }
-            // Add our backport label.
-            github.issues.addLabels({
-              // Every pull request is an issue, but not every issue is a pull request.
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: [label]
-            })
-            console.log("Added '" + label + "' label.")
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Open Backport PR
-        uses: zeebe-io/backport-action@v0.0.6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}

.github/workflows/registry.yml

@@ -8,11 +8,14 @@ on:
   workflow_dispatch: {}
 
 env:
+  BUCKET: kubevelacharts
+  ENDPOINT: oss-cn-hangzhou.aliyuncs.com
   ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
   ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+  ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}
 
 jobs:
-  publish-core-images:
+  publish-images:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -33,7 +36,7 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login docker.io
         uses: docker/login-action@v1
@@ -41,19 +44,10 @@ jobs:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
-        with:
-          driver-opts: image=moby/buildkit:master
-
       - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-core for Dockerhub, GHCR and ACR
+        name: Build & Pushing
         with:
           context: .
           file: Dockerfile
@@ -65,124 +59,72 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
           tags: |-
+            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
             docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
 
-      - uses: docker/build-push-action@v2
-        name: Build & Pushing CLI for Dockerhub, GHCR and ACR
-        with:
-          context: .
-          file: Dockerfile.cli
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-
-  publish-addon-images:
-    runs-on: ubuntu-latest
+  publish-charts:
+    env:
+      HELM_CHARTS_DIR: charts
+      HELM_CHART: charts/vela-core
+      LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
+      LOCAL_OSS_DIRECTORY: .oss/
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            VERSION=latest
-          fi
-          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
         run: |
           echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
-      - name: Login ghcr.io
-        uses: docker/login-action@v1
+      - name: Install Helm
+        uses: azure/setup-helm@v1
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login docker.io
-        uses: docker/login-action@v1
+          version: v3.4.0
+      - name: Prepare legacy chart
+        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:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-        with:
-          driver-opts: image=moby/buildkit:master
-
-      - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-apiserver for Dockerhub, GHCR and ACR
-        with:
-          context: .
-          file: Dockerfile.apiserver
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
-
-      - uses: docker/build-push-action@v2
-        name: Build & Pushing runtime rollout Dockerhub, GHCR and ACR
-        with:
-          context: .
-          file: runtime/rollout/Dockerfile
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-
-  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
+          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
       - 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
+        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
+      - name: sync cloud to local
+        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
+          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
+          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
+      - name: Package helm charts
+        run: |
+          helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
+          helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
       - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f
+        run: ./ossutil --config-file .ossutilconfig sync $LOCAL_OSS_DIRECTORY oss://$BUCKET/core -f

.github/workflows/release-docs.yaml

@@ -0,0 +1,28 @@
+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/clean-md.py ./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

@@ -4,177 +4,136 @@ on:
   push:
     tags:
       - "v*"
-  workflow_dispatch: { }
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  BUCKET: ${{ secrets.CLI_OSS_BUCKET }}
-  ENDPOINT: ${{ secrets.CLI_OSS_ENDPOINT }}
-  ACCESS_KEY: ${{ secrets.CLI_OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.CLI_OSS_ACCESS_KEY_SECRET }}
+  workflow_dispatch: {}
 
 jobs:
-  build:
+  publish-cli:
     runs-on: ubuntu-latest
-    name: build
-    strategy:
-      matrix:
-        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
     env:
-      VELA_VERSION_KEY: github.com/oam-dev/kubevela/version.VelaVersion
-      VELA_GITVERSION_KEY: github.com/oam-dev/kubevela/version.GitRevision
-      GO_BUILD_ENV: GO111MODULE=on CGO_ENABLED=0
-      DIST_DIRS: find * -type d -exec
+      VELA_VERSION: ${{ github.ref }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Go
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.17
+          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: Tag helm chart image
+        run:  |
+          sed -i 's/latest/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/values.yaml
+          sed -i 's/0.1.0/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/Chart.yaml
+      - name: Run cross-build
+        run: make cross-build
+      - name: Run compress binary
+        run: make compress
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Get matrix
-        id: get_matrix
-        run: |
-          TARGETS=${{matrix.TARGETS}}
-          echo ::set-output name=OS::${TARGETS%/*}
-          echo ::set-output name=ARCH::${TARGETS#*/}
-      - name: Get ldflags
-        id: get_ldflags
-        run: |
-          LDFLAGS="-s -w -X ${{ env.VELA_VERSION_KEY }}=${{ env.VELA_VERSION }} -X ${{ env.VELA_GITVERSION_KEY }}=git-$(git rev-parse --short HEAD)"
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV
-      - name: Build
-        run: |
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/vela -v \
-            ./references/cmd/cli/main.go
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/kubectl-vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/kubectl-vela -v \
-            ./cmd/plugin/main.go
-      - name: Compress
-        run: |
-          echo "\n## Release Info\nVERSION: ${{ env.VELA_VERSION }}" >> README.md && \
-          echo "GIT_COMMIT: ${GITHUB_SHA}\n" >> README.md && \
-          cd _bin/vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r vela-{}.zip {} \; && \
-          cd ../kubectl-vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf kubectl-vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r kubectl-vela-{}.zip {} \; && \
-          cd .. && \
-          sha256sum vela/vela-* kubectl-vela/kubectl-vela-* >> sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt \
-      - name: Upload Vela tar.gz
+      - name: Upload Vela Linux amd64 tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_path: ./_bin/vela/vela-linux-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela zip
+      - name: Upload Vela Linux amd64 zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_path: ./_bin/vela/vela-linux-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela tar.gz
+      - name: Upload Vela MacOS tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela zip
+      - name: Upload Vela MacOS zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_path: ./_bin/vela/vela-darwin-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Post sha256
-        uses: actions/upload-artifact@v2
+      - name: Upload Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
         with:
-          name: sha256sums
-          path: ./_bin/sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt
-          retention-days: 1
-      - name: clear the asset
-        run: |
-          rm -rf ./_bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}
-          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
-      - 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 ${ENDPOINT} -c .ossutilconfig
-      - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync ./_bin/vela oss://$BUCKET/binary/vela/${{ env.VELA_VERSION }}
-      
-      - name: sync the latest version file
-        if: ${{ !contains(env.VELA_VERSION,'alpha') && !contains(env.VELA_VERSION,'beta') }}
-        run: |
-          LATEST_VERSION=$(curl -fsSl https://static.kubevela.net/binary/vela/latest_version)
-          verlte() {
-            [  "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
-          }
-          verlte ${{ env.VELA_VERSION }} $LATEST_VERSION && echo "${{ env.VELA_VERSION }} <= $LATEST_VERSION, skip update" && exit 0
-          echo ${{ env.VELA_VERSION }} > ./latest_version
-          ./ossutil --config-file .ossutilconfig cp -u ./latest_version oss://$BUCKET/binary/vela/latest_version
-
-
-  upload-plugin-homebrew:
-    needs: build
-    runs-on: ubuntu-latest
-    name: upload-sha256sums
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Get release
-        id: get_release
-        uses: bruceadams/get-release@v1.2.2
-      - name: Download sha256sums
-        uses: actions/download-artifact@v2
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
         with:
-          name: sha256sums
-          path: cli-artifacts
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: cli-artifacts
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - shell: bash
-        working-directory: cli-artifacts
-        run: |
-          for file in *
-          do
-            sed -i "s/\/vela/-${{ env.VELA_VERSION }}/g" ${file}
-            sed -i "s/\/kubectl-vela/-${{ env.VELA_VERSION }}/g" ${file}
-            cat ${file} >> sha256sums.txt
-          done
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
       - name: Upload Checksums
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: cli-artifacts/sha256sums.txt
+          asset_path: ./_bin/sha256sums.txt
           asset_name: sha256sums.txt
           asset_content_type: text/plain
-      - name: Update kubectl plugin version in krew-index
-        uses: rajatjindal/krew-release-bot@v0.0.38
-      - name: Update Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
+      - uses: actions/setup-node@v1
         with:
-          token: ${{ secrets.HOMEBREW_TOKEN }}
-          formula: kubevela
-          tag: ${{ github.ref }}
-          revision: ${{ github.sha }}
-          force: false
+          node-version: '12.x'
+      - name: Sync release to kubevela.io Repo
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.GH_PAGES_DEPLOY }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
+          COMMIT_ID: ${{ github.sha }}
+        run: |
+          bash ./hack/website/release.sh
+      - name: Update kubectl plugin version in krew-index
+        uses: rajatjindal/krew-release-bot@v0.0.38

.github/workflows/sync-api.yml

@@ -11,10 +11,10 @@ jobs:
   sync-core-api:
     runs-on: ubuntu-20.04
     steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.14
         uses: actions/setup-go@v1
         env:
-          GO_VERSION: '1.17'
+          GO_VERSION: '1.14'
           GOLANGCI_VERSION: 'v1.38'
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -33,5 +33,4 @@ jobs:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
           COMMIT_ID: ${{ github.sha }}
         run: |
-          bash ./hack/apis/clientgen.sh
-          bash ./hack/apis/sync.sh
+          bash ./hack/apis/sync.sh

.github/workflows/timed-task.yml

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

.github/workflows/trivy-scan.yml

@@ -1,30 +0,0 @@
-name: "Trivy Scan"
-
-on:
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  images:
-    name: Image Scan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Build Vela Core image from Dockerfile
-        run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org -t docker.io/oamdev/vela-core:${{ github.sha }} .
-
-      - name: Run Trivy vulnerability scanner for vela core
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/oamdev/vela-core:${{ github.sha }}'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
-        if: always()
-        with:
-          sarif_file: 'trivy-results.sarif'

.github/workflows/unit-test.yml

@@ -1,85 +0,0 @@
-name: Unit-Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-
-env:
-  # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-
-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@v4.0.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 K3d
-        uses: nolar/setup-k3d-k3s@v1.0.8
-        with:
-          version: v1.20
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 3.1.0
-          kubebuilderOnly: false
-          kubernetesVersion: v1.21.2
-
-      - name: Run Make test
-        run: make test
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.txt
-          flags: core-unittests
-          name: codecov-umbrella

.gitignore

@@ -1,4 +1,4 @@
-# Binaries for programs and docgen
+# Binaries for programs and plugins
 *.exe
 *.exe~
 *.dll
@@ -7,7 +7,6 @@
 bin
 _bin
 e2e/vela
-vela
 
 # Test binary, build with `go test -c`
 *.test
@@ -42,13 +41,20 @@ references/cmd/cli/fake/source.go
 references/cmd/cli/fake/chart_source.go
 charts/vela-core/crds/_.yaml
 .test_vela
-tmp/
 
 .vela/
 
-# check docs
-git-page/
+# Dashboard
+node_modules/
+.eslintcache
+references/dashboard/dist/
+references/dashboard/package-lock.json
+references/dashboard/src/.umi/
+package-lock.json
+references/dashboard/src/.umi-production/
 
-# e2e rollout runtime image build
-runtime/rollout/e2e/tmp
-vela.json
+# Swagger: generate Restful API
+references/apiserver/docs/index.html
+
+# check docs
+git-page/

.krew.yaml

@@ -33,8 +33,8 @@ spec:
         arch: amd64
     {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-windows-amd64.zip" .TagName }}
     files:
-    - from: "*/kubectl-vela"
-      to: "kubectl-vela.exe"
+    - from: "*/kubectl-vela.exe"
+      to: "."
     - from: "*/LICENSE"
       to: "."
     bin: "kubectl-vela.exe"

CHANGELOG/CHANGELOG-1.0.md

@@ -1,260 +0,0 @@
-# v1.0.7
-
-This is a minor fix for release-1.0, please refer to release-1.1.x for the latest feature.
-
-1. Fix podDisruptive field for inner traits #1844
-
-
-# v1.0.6
-
-1. fix bug: When the Component contains multiple traits of the same type, the status of the trait in the Application is reported incorrectly (#1731) (#1743)
-2. Fix terraform component can't work normally, generate OpenAPI JSON schema for Terraform Component (#1738) (#1753)
-3. Improve the logging system #1735 #1758
-4. add ConcurrentReconciles for setting the concurrent reconcile number of the controller  #1775 
-
-# v1.0.5
-
-1. Fix Terraform application status issue (#1611)
-2. application supports specifying different versions of Definition (#1597)
-3. Enable Dynamic Admission Control for Application (#1619)
-4. Update inner samples for "vela show xxx --web" (#1616)
-5. fix empty rolloutBatch will panic whole controller bug (#1646)
-6. Use stricter syntax check for CUE (#1643)
-7. make ResourceTracker to own cluster-scope resource (#1634)
-8. update docs
-
-# v1.0.4
-
-## Upgrade to this release
-
-**Please update Application CRD to upgrade from v1.0.3 to this release**
-
-```
-kubectl apply -f https://raw.githubusercontent.com/kubevela/kubevela/master/charts/vela-core/crds/core.oam.dev_applications.yaml
-```
-
-**Check the upgrade docs to upgrade from other release: https://kubevela.io/docs/advanced-install#upgrade**
-
-
-## Changelog
-
-1. add more PVC volume traits and docs (#1524)
-2. automatically sync vela api code to the repo([kubevela-core-api](https://github.com/oam-dev/kubevela-core-api)) on release, you can use this repo as import package for kubevela integration (#1523)
-3. fix cue template of worker and ingress with more accurate error info (#1532)
-4. add critical path k8s event for Application (#1463)
-5. support K8s Deployment for AppRollout #1539 #1557
-6. vela cli: enable "vela show" to support namespaced capability (#1521)
-7. Add scpoe reference in Application object `status.Service` (#1540)
-8. vela cli: `vela show` support list the parameter of ComponentDefinition created by helm charts (#1543)
-9. Add revision mechanism for Component/Trait Definition and default revision histroy will keep 20 revisions #1531
-10. fix CRD for legacy K8s cluser(<=1.14) (#1531)
-11. fix duplate key in kubevela chart webhook yaml (#1571)
-12. Check whether parameter.cmd is nill for `sidecar` trait (#1575)
-13. add e2e-test into test coverage report (#1553)
-14. support krew install for kubectl vela plugin #1582
-15. fix controller cannot start due to the format error of the third-party CRD (#1584)
-16. use accelerate domain for helm chart repo to speed up for global users (#1585)
-17.  embed rollout in an application, now you can use rolloutPlan in Application (#1568)
-18. Support server-side Terraform as cloud resource provider #1519
-
-# v1.0.3
-
-More end user guide was added in `Application Deployment` section.
-
-1. add helm test to verify the chart of KubeVela have been installed successfully  (#1415)
-2. fix bug which Component/TraitDefinition won't work when contains “`_|_`” in value (#1450)
-3. add volumes definition in worker/webservice (#1459)
-4. Remove local kind binary dependency #1458
-5. ignore error not found when deleting resourceTracker (#1462)
-6. add context.appRevisionNum as runtime context (#1466)
-7. implement cli `vela system live-diff` to check diff before upgrade (#1419)
-8. add webhook validation on CUE template outputs name (#1460)
-9. Fix helm chart about wrong webhook policy (#1483)
-10. Remove trait-injector from controller options (#1490)
-12. add app name as label for AppRevision (#1488)
-13. Introduce vela as a kubectl plugin (#1485)
-14. update status of appContext by patch to avoid resourceVersion conflict error (#1500)
-15. add workloadDefinitionRef to application status.services (#1471)
-16. Add garbage collection mechanism for AppRevision, it will only keep 10 revisions by default (#1501)
-17. Remove AGE in definition crd print columns (#1509)
-
-
-# v1.0.2
-
-1. remove no used ingress notes in KubeVela charts (#1405)
-2. fix import inner package in the format of third party package path and add docs (#1412  #1417)
-3. vela cli support use "vela system cue-packages" to list cue-package (#1417)
-4. Fix bug that the registered k8s built-in gvk does not exist in third party package path (#1414)
-5. Fix bug that patchKey not work when strategyUnify function not work with close call (#1430)
-6. add podDisruptive to traitdefinition to notify wether a trait update will cause restart of pod or not (#1192)
-7. Add a new cloneset scale controller (#1301)
-8. Support garbage collection for across-namespace workloads and traits  (#1421)
-9. Add short name for crds && Remove redundant and ambiguous short names #1434
-10. Refresh built-in packages when component/trait definition are registered (#1402)
-
-
-**You should upgrade following CRDs to upgrade from v1.0.1, all CRDs changes are backward compatible**:
-
-```
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/standard.oam.dev_rollouttraits.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applications.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_approllouts.yaml
-kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
-```
-
-
-# v1.0.1
-
-There are some fixes contained for release v1.0.0:
-
-1. add initial finalizer and abandon support for app rollout, you can revert quickly now(#1362)
-2. fix vela show fail to get component definition (#1366)
-3. fix application context controller should not own application object (#1370)
-4. fix: "system-definition-namespace" chart args not work in vela chart (#1371)
-5. fix resources created in different namespace can not be updated (#1374)
-6. fix automatically generate schema for helm values fail in array list value (#1375)
-7. upgrade API version of mutate/validate webhook to v1 (#1383)
-8. fix webhook not work by helm install kubevela without cert-manager #1267
-7. remove create cert-manager issuer in vela CLI env command (#1267)
-8. refine CRD print results: add additional print column and short Name for CRD (#1377)
-
-Many other docs improvements.
-
-Thanks for all the contributors!
-
-# v1.0.0
-
-We're excited to announce the release of KubeVela 1.0.0! 🎉🎉🎉🎉
-
-Thanks to all the new and existing contributors who helped make this release happen!
-
-You may already noticed the awesome community has shipped a brand new KubeVela website https://kubevela.io ! 🎉🎉
-
-If you're new to KubeVela, feel free to start with its [getting started page](https://kubevela.io/docs/quick-start) and learning about [its core concepts](https://kubevela.io/docs/concepts). The full feature of vela is explained in [platform builder guide](https://kubevela.io/docs/platform-engineers/overview).
-
-For existing adopters, please follow the [installing](https://kubevela.io/docs/install) or [upgrading](https://kubevela.io/docs/install#upgrade) KubeVela to version 1.0.0.
-
-## Acknowledgements ❤️
-
-Thanks to everyone who made this release possible!
-
-@captainroy-hy @sunny0826 @leejanee  @yangsoon @wangyikewxgm @hongchaodeng @zzxwill @ryanzhang-oss @resouer @wonderflow  @hprotzek @vnzongzna  @majian159 @Cweiping @mengjiao-liu @kushthedude @unknwon @Ghostbaby @mosesyou @dylandee @wangkai1994 @LeoLiuYan @just-do1 @hoopoe61 @Incubator4th @TomorJM @hahchenchen @zeed-w-beez @allenhaozi @mason1kwok @kinsolee @shikanon @96RadhikaJadhav
-
-# What's New
-
-## API version upgraded to `v1beta1`
-
-All user facing APIs have been upgraded to `v1beta1`, you could learn more details in the [API Changes](#API-Changes) section below.
-
-## `ComponentDefinition`
-
-The [`ComponentDefinition`](https://kubevela.io/docs/platform-engineers/definition-and-templates) now takes the responsibility of defining encapsulation and abstraction for your app components. And you are free to choose to use Helm chart or CUE to define them. This leaves `WorkloadDefinition` focusing on declaring workload characteristic such as `replicable`, `childResource`  etc, so the `spec.schematic` field in `WorkloadDefinition` could be deprecated in next few releases.
-
-## Application Versioning and Progressive Rollout
-
-* A rolling style upgrade was supported by the object called [`AppRollout`](https://kubevela.io/docs/rollout/rollout/). It can help you to upgrade an Application from source revision to the target and support Blue/Green, Canary and A/B testing rollout strategy.
-* Multi-Version, Multi-Cluster Application Deployment was supported by the object called [`AppDeployment`](https://kubevela.io/docs/rollout/appdeploy). It can help you to deploy multiple revision apps to multiple clusters with leverage of Service Mesh.
-
-## Visualization Enhancement
-
-KubeVela now automatically generates Open-API-v3 Schema for all the definition abstractions including CUE, Helm and raw Kubernetes resource templates. You can integrate KubeVela with your own dashboard and [generate forms from definitions](https://kubevela.io/docs/platform-engineers/openapi-v3-json-schema) at ease!
-
-## Application Abstraction
-
-There're several major updates on the `Application` abstraction itself:
-* [Helm based abstraction](https://kubevela.io/docs/helm/component) was supported with few [limitations](https://kubevela.io/docs/helm/known-issues). In other words, you can now declare any existing Helm chart as an app component in KubeVela. The most exciting part is the trait system of KubeVela works seamlessly with the Helm based components, yes, just [attach trait](https://kubevela.io/docs/helm/trait) to it!
-* [Raw Kubernetes resource templates](https://kubevela.io/docs/kube/component) was still supported, that's simpler but less powerful comparing to [the CUE way](https://kubevela.io/docs/cue/component). Of course, the trait system also [works seamless](https://kubevela.io/docs/kube/trait) with it.
-
-
-## CUE Template Enhancement
-
-* [Runtime information context](https://kubevela.io/docs/cue/component#full-available-information-in-cue-context) was supported, you could use this information to render the resources in CUE template.
-* [Data passing](https://kubevela.io/docs/cue/advanced#data-passing) was supported during CUE rendering. Specifically, the `context.output` contains the rendered workload API resource and the `context.outputs.<xx>` contains all the other rendered API resources.
-* [K8s API resources are now built-in packages](https://kubevela.io/docs/cue/basic#import-kube-package): the K8s built-in API including CRD will be discovered by KubeVela and automatically built as CUE packages, you can use it in your CUE template. This is very helpful in validation especially on writing new CUE templates.
-* [Dry-run Application](https://kubevela.io/docs/platform-engineers/debug-test-cue) was supported along with a debug and test guide for building CUE template. You can create CUE based definitions with confidence now!
-* [Deploy resources in different namespaces](https://kubevela.io/docs/cue/cross-namespace-resource/) was supported now, you can specify namespace in your CUE template.
-
-## Declare and Consume Cloud Resources
-
-* [Declare and consume cloud resources](https://kubevela.io/docs/platform-engineers/cloud-services/) were supported now in KubeVela, you can easily register cloud resources by `ComponentDefinition` and bind the service into the applications.
-
-## A brand new website
-
-We have upgraded our website [kubevela.io](https://github.com/oam-dev/kubevela.io) based on "Docusaurus". All docs is automatically generated from [KubeVela](https://github.com/oam-dev/kubevela/tree/master/docs) while the blogs are on [kubevela.io/blogs](https://github.com/oam-dev/kubevela.io/tree/main/blog).
-
-
-# Changes
-
-## API Changes
-
-1. Change definition from cluster scope to namespace scope #1085 the cluster scope CRD was still compatible.
-2. Application Spec changes.
-    - `spec.components[x].settings` in v1alpha2 was changed to `spec.components[x].properties` in v1beta1
-    - `spec.components[x].traits[x].name` in v1alpha2 was changed to `spec.components[x].traits[x].type` in v1beta1
-
-Example of the v1alpha2 Spec:
-
-```
-apiVersion: core.oam.dev/v1alpha2
-kind: Application
-metadata:
-  name: first-vela-app
-spec:
-  components:
-    - name: express-server
-      type: webservice
-      settings:
-        ...
-      traits:
-        - name: ingress
-          properties:
-            ...
-```
-
-Example of the v1beta1 Spec:
-
-```
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: first-vela-app
-spec:
-  components:
-    - name: express-server
-      type: webservice
-      properties:
-        ...
-      traits:
-        - type: ingress
-          properties:
-            ...
-```
-
-
-## Deprecation
-
-1. route/autoscaler/metrics these three traits and their controllers were moved out from the vela core.  #1172 You could still find and use them from https://github.com/oam-dev/catalog.
-2. the dashboard was deprecated in KubeVela and we will merge these features and create a new in [velacp](https://github.com/oam-dev/velacp) soon.
-3. vela CLI will only support run/modify an app from appfile by using `vela up`, so some other commands related were deprecated, such as `vela svc deploy`, `vela <trait> ...`
-
-
-## Other Notable changes
-
-1. `prometheus` and `certmanager` CRD are not required in installation #1005
-2. Parent overrides child when annotation/labels conflicts && one revision will apply once only in force mode && AC.status CRD updated #1109
-3. `ApplicationRevision` CRD Object was introduced as revision of Application #1214
-4. KubeVela chart image pull policy was changed to `Always` from `IfNotPresent` #1228
-   5.` Application` Controller will use `AppContext` to manage the resources generation #1245, in other word, you can run KubeVela `Application Controller` without any `v1apha2 Object`.
-6. The regular time for all events automatically sync changed from 5min to 1 hour   #1285
-7. `vela system dry-run` will print raw K8s resources in a better format  #1246
-
-
-# Known Issues
-
-1. Built-in CUE package was not supported now for K8s Cluster v1.20, we will support in the next release. #1313
-2. Resources created in different namespace from application will only be garbage collected (GC) when the application deleted, an update will not trigger GC for now, we will fix it in the next release. #1339
-
-
-Thanks again to all the contributors!

CHANGELOG/CHANGELOG-1.1.md

@@ -1,243 +0,0 @@
-# v1.1.3
-
-## What's Changed
-* Fix: remove ocm addon enable in Makefile by @Somefive in https://github.com/oam-dev/kubevela/pull/2327
-* Chore(cli): remove useless deploy.yaml by @chivalryq in https://github.com/oam-dev/kubevela/pull/2335
-* Fix: do not override the workload name if its specified by @FogDong in https://github.com/oam-dev/kubevela/pull/2336
-* Fix: remove appcontext CRD and controller by @wonderflow in https://github.com/oam-dev/kubevela/pull/2270
-* Feat: add revisionHistoryLimit to helm chart by @haugom in https://github.com/oam-dev/kubevela/pull/2343
-* Chore: deprecate 'vela dashboard' apiserver by @chivalryq in https://github.com/oam-dev/kubevela/pull/2341
-* Chore: remove e2e-api-test in rollout test to speed up by @chivalryq in https://github.com/oam-dev/kubevela/pull/2345
-* Docs: rollout demo by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2348
-* Feat: add vela minimal chart by @FogDong in https://github.com/oam-dev/kubevela/pull/2340
-* Fix: runc security issue by @Somefive in https://github.com/oam-dev/kubevela/pull/2350
-* Docs: add a WeChat QR code by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2351
-* Feat: Initialize api for vela dashboard and CLI by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2339
-* Fix(helm chart): fix startup args for apiserver by @yangsoon in https://github.com/oam-dev/kubevela/pull/2362
-* Fix: dockerfile e2e test command lack environment configuration by @Somefive in https://github.com/oam-dev/kubevela/pull/2231
-* Feat: inputs support setting value in array by @leejanee in https://github.com/oam-dev/kubevela/pull/2358
-* Feat: support rollout controller for StatefulSet by @whichxjy in https://github.com/oam-dev/kubevela/pull/1969
-* Fix: delete deprecated vela dashboard in e2e setup by @FogDong in https://github.com/oam-dev/kubevela/pull/2379
-* Fix: try fix CI unit test by @wonderflow in https://github.com/oam-dev/kubevela/pull/2376
-* Feat: Addon REST API by @hongchaodeng in https://github.com/oam-dev/kubevela/pull/2369
-* Fix: fix built in workflow steps by @FogDong in https://github.com/oam-dev/kubevela/pull/2378
-* Feat: add vela minimal in make manifests by @FogDong in https://github.com/oam-dev/kubevela/pull/2389
-* Chore(deps): bump go.mongodb.org/mongo-driver from 1.3.2 to 1.5.1 by @wonderflow in https://github.com/oam-dev/kubevela/pull/2391
-* Fix: use aliyun oss istio chart by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2392
-* Support remote git repo for Terraform configuration by @zzxwill in https://github.com/oam-dev/kubevela/pull/2337
-* Feat: add inputs test cases and optimize code by @leejanee in https://github.com/oam-dev/kubevela/pull/2388
-* Fix: pass owner to workload if rollout failed by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2397
-* Feat: bootstrap multicluster testing by @Somefive in https://github.com/oam-dev/kubevela/pull/2368
-* Feat(workflow): add depends on in workflow by @FogDong in https://github.com/oam-dev/kubevela/pull/2387
-* Fix: make the name of Terraform credential secret same to component name by @zzxwill in https://github.com/oam-dev/kubevela/pull/2399
-* Fix: revision GC in workflow mode by @FogDong in https://github.com/oam-dev/kubevela/pull/2355
-* Fix: Applied Resources Statistics  Error by @leejanee in https://github.com/oam-dev/kubevela/pull/2398
-
-
-# v1.1.2
-
-This is a bug fix release.
-Since the big v1.1.1 release, many users had given it try for our new features. We sincerely appreciate your enthusiasm and amazing feedback.
-
-There are some small issues found by our users and we have fixed them. Most notably:
-
-- The Charts of addons (prometheus, etc.) are moved to OSS to provide better accessibility and network speed.
-- The FluxCD and Terraform addons are not enabled by default. Users can install them via `vela addon enable ...`.
-
-We have located more small issues around templates as well and fixed them, and decided a bug fix release ASAP.
-
-Users are highly recommended to use the v1.1.2 release instead. We want to thank all of our users sincerely! ❤️ ❤️ ❤️
-
-## What's Changed
-* Fix(rollout): improve rollback experience by @hongchaodeng in https://github.com/oam-dev/kubevela/pull/2294
-* Fix: fix typo by @hughxia in https://github.com/oam-dev/kubevela/pull/2317
-* Fix: fix cluster-gateway image tag in chart by @Somefive in https://github.com/oam-dev/kubevela/pull/2318
-* Fix: workflow example by @leejanee in https://github.com/oam-dev/kubevela/pull/2323
-* Fix: fix multicluster values bug by @Somefive in https://github.com/oam-dev/kubevela/pull/2326
-* Fix(helm): Do not install fluxcd and terraform by default by @yangsoon in https://github.com/oam-dev/kubevela/pull/2328
-* Fix: move charts from github repo to Alibaba Cloud OSS repo by @zzxwill in https://github.com/oam-dev/kubevela/pull/2324
-* Fix: add comments and adjust helm typed component's spec by @zzxwill in https://github.com/oam-dev/kubevela/pull/2332
-* Fix: fix multicluster template bug by @Somefive in https://github.com/oam-dev/kubevela/pull/2333
-* Feat: add args for init-contianer and sidecar by @Gallardot in https://github.com/oam-dev/kubevela/pull/2331
-
-# v1.1.1
-
-Users are highly recommended to use the v1.1.2 release instead.
-
-# Changes since v1.1.0
-
-1. rollout trait change IncreaseFirst to DecreaseFirst (#2142)
-2. Feat(definition): add built-in dingtalk workflow step definition (#2152)
-3. Fix(dryrun): add default name and namespace in dry run (#2150)
-4. Docs: fix typo about workflow rollout (#2163)
-5. Fix: traitdefinition controller reconcile in a infinite loop (#2157)
-6. Refactor: change the ownerReference of configMap which store the parameter for each revision to definitionRevision (#2164)
-7. Fix: add fluxcd dashbaords (#2130)
-8. Feat: modify apply component cue action to support skipWorkload trait (#2167)
-9.  Trait: Add TraitDefinition for PVC (#2158)
-10. initilize KubeVela codeowner file (#2178)
-11. Feat(cue): support access components artifacts in cue template context (#2161)
-12. Feat(addon): add default enable addon (#2172)
-13. Feat(envbinding): add resourceTracker for envBinding (#2179)
-14. Fix: align all CUE template keyword to use parameter (#2181)
-15. Feat: add vela live-diff , dry-run, cue-packages into vela commands (#2182)
-16. Fix: move Terraform defintions charts/vela-core/templates/definitions (#2176)
-17. Fix: add patchkey to volumes (#2191)
-18. Feat(workflow): add depends-on workflow step definition (#2190)
-19. Feat: add pprof (#2192)
-20. Feat: add more registry traits as internal ones (#2184)
-21. Fix: support more Terraform variable types (#2194)
-22. Fix: update help message of ingress trait (#2198)
-23. Refactor(#2185): remove unused config options in Makefile (#2200)
-24. Docs: update environment design (#2199)
-25. Fix: modify service-binding with more accurate type (#2209)
-26. Feat(healthscope): add health-scope-binding policy and e2e test for health scope (#2205)
-27. Feat(workflow): support dingding and slack in webhook notification (#2213)
-28. Feat(workflow): add apply application workflow step definition (#2186)
-29. Feat(workflow): input.ParameterKey described like paths notation (#2214)
-30. Fix(upgrade): upgrade controller-tools from 0.2 to 0.6.2 (#2215)
-31. Fix(app): When only the policy is specified, the resources in the app need to be rendered and created (#2197)
-32. Feat(workflow): outputs support script notation (#2218)
-33. Fix(addon): rename clonset-service to clonse (#2219)
-34. Feat(workflow): Add op.#Task action (#2220)
-35. Fix(webhook): only check the uniqueness of component names under the same namespace (#2222)
-36. Feat(apiserver): add apiserver service to helm chart (#2225)
-37. Fix: add flag --label to filer components and traits (#2217)
-38. Fix(addons): remove kruise addon (#2226)
-39. Feat: add pressure-test parameter optimize (#2230)
-40. Fix: align the envbind-app name with the original application name (#2232)
-41. Feat(workflow): add status check for workflow mutil-env deploy (#2229)
-42. Refactor: move from io/ioutil to io and os package (#2234)
-43. Feat(trait): annotation and labels trait should also affect the workload object along with pod (#2237)
-44. Feat(app): show health status from HealthScope in application (#2228)
-45. Fix: kustomize json patch trait definition (#2239)
-46. Docs: canary rollout demo (rollout part only) (#2177)
-47. Feat: vela show annotations display undefined should be refined (#2244)
-48. Feat: support code-generator and sync to kubevela-core-api (#2174)
-49. Feat: add image auto update for gitops (#2251)
-50. Fix: fix the output DB_PASSWORD for rds definition (#2267)
-51. Fix: add alibaba eip cloud resource (#2268)
-52. Refactor application code to make it run as Dag workflow (#2236)
-53. Fix: remove podspecworkload controller and CRD (#2269)
-54. Feat: add more options for leader election configuration to avoid pressure on apiserver
-55. Feat: istio addon and use case demo (#2276)
-56. Fix: patch any key using retainKeys strategy (#2280)
-57. Fix: add exponential backoff wait time for workflow reconciling (#2279)
-58. Refactor: change field exportKey to valueFrom (#2284)
-59. Fix(helm): enable apiserver by default (#2249)
-60. Feat: alibaba provider addon (#2243)
-61. Support MultiCluster EnvBinding with cluster-gateway (#2247)
-62. Fix: fix apply application workflow step (#2288)
-63. Fix: fix alibaba cloud rds module (#2293)
-64. Feat: add commit msg in kustomize (#2296)
-65. Feat: allow user specify alibaba provider addon's region (#2297)
-66. Fix: generate service in canary-traffic trait (#2300)
-67. Fix: imagePullSecrets error from cloneset (#2305)
-68. Fix: add application logging dashboard (#2301)
-69. Feat: Make applicationComponent can be modified in step (#2304)
-70. Fix: generate service in canary-traffic trait (#2307)
-
-
-# v1.1.0
-
-Note: the documents (https://kubevela.io/)  for v1.1.0 is still WIP, so we mark it as pre-release. The ETA for documents is next 2 weeks.
-
-We would like to extend our thanks to all [the new and existing contributors](https://github.com/oam-dev/kubevela/graphs/contributors) who helped make this release happen.
-
-Please follow the guide to [install](https://kubevela.io/docs/next/getting-started/quick-install) or [upgrade](https://kubevela.io/docs/next/platform-engineers/advanced-install/) KubeVela to version v1.1.0.
-
-## What's New
-
-- **Hybrid Environment App Delivery Control plane**
-    - In the new release, we have fully upgraded KubeVela to a multi-cluster/hybrid-cloud/multi-cloud app delivery control plane with leverage of OAM as the consistent app delivery model across clouds and infrastructures.
-- **Workflow**
-    - KubeVela has added a Workflow mechanism that empowers users to glue any operational tasks to customize the control logic to build more complex operations. Workflow is modular by design and each module is mainly composed in CUE -- so you can define complex operations in a declarative, data-driven manner.
-- **Environment**
-    - KubeVela added an Initializer which allow users to define what constructs the environment. The environment Initialized by the Initilizer could contain different kinds of resources include K8s cluster, system components, policies and almost everything. Of course, you can destry an environment very easily with the help of Initializer.
-- **Out of Box Addons**
-    - With the help of Initilizer, KubeVela has support lots of out of box addons. You can list/enable/disable them by `vela addon` command. Each addon is an Initializer that deloy the CRD Controllers and other resources related.
-- **Cloud Resources Support**
-    - We also support terraform to provision almost every cloud resources and pass through to other components defined in KubeVela application.
-- **Tools to edit and manage X-Definition**
-    - We also provide the `vela def` tool sets to provide unified CUE based capability to manage X-Definition.
-- **Others**
-    - Allow specify name for component revision auto-generated by Application. Allow specify name for auto generated Definition revision.
-    - Controller runtime dependency upgrade that can compatible with Kubernetes v1.21 . KubeVela support Kubernetes v1.18~v1.21.
-    - Other details you could read changelog in the release history.
-    
-## Change log since v1.1-rc2
-
-1. fix configmap patchkey bug (#2080)
-2. Merge velacp to apiserver branch in oam repo (#2039) (#2127)  (#2087)
-3. support rollout controller seprated and install as helm chart in runtime cluster  (#2075)
-4. fix bug that KubeVela can not be installed in specified namespace (#2083)
-5. enable vela def to use import decl (#2084)
-6. enhance envbinding: support apply resources to cluster (#2093)
-7. Add obsevability addon (#2091)
-8. Feat(vela): add vela workflow suspend command (#2108)
-9. feat(def): add built-in workflow definitions (#2094)
-10. Feat(vela): add vela workflow resume command (#2114)
-11. upgrade openkruise version to v0.9.0 (#2076)
-12. Fix(workflow): set workload name in configmap if the name is not specified (#2119)
-13. helm component support OSS bucket (#2104)
-14. add rollout demo with Workflow (#2121)
-15. Support script as parameter and make the WorkflowStepDefinition more universal  (#2124)
-16. fix(cli) fix bug when vela show componetdefinition's workload type is AutoDetectWorkloadDefinition (#2125)
-17. Fix(workflow): set the namespace to app's ns if it's not specified (#2133)
-18. fix specify external revision bug (#2126)
-19. add CUE-based health check in HealthScope controller (#1956)
-20. Feat(addon): Add source and patch to kustomize definition (#2138)
-21. Feat(vela): add vela workflow terminate and restart command (#2131)
-
-
-# v1.1.0-rc.2
-
-1. Allow users to specify component revision name in Application (#1929) the new field `externalRevision` can specify the revision name.
-
-```
-kind: Application
-spec:
-  components:
-  - name: mycomp
-    type: webservice
-    externalRevision: my-revision-v1
-    properties:
-      ...
-```
-
-2. Add more workflow demo and fix some demos #2042  #2059 #2060 #2064
-3. Add cloneset ComponentDefinition into kruise addon (#2050)
-4. definitions support specify the revision name (#2044), you can specify the name by adding an annotation `definitionrevision.oam.dev/name`
-
-```
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  name: worker
-  annotations:
-    # you can specify the revision name in annotations
-    definitionrevision.oam.dev/name: "1.1.3"
-spec:
-  ...
-```
-
-5. fix definition controller log error cause by openapi schema generation error (#2063)
-6. Add add-on input go-template implementation (#2049)
-
-# v1.1.0-rc.1
-
-
-1. Workflow support specify Order Steps by Field Tag (#2022)
-2. support application policy (#2011)
-3. add OCM multi cluster demo (#1992)
-4. Fix(volume): seperate volume to trait (#2027)
-5. allow application skip gc resource and leave workload ownerReference controlled by rollout(#2024)
-6. Store component parameters in context (#2030)
-7. Allow specify chart values for helm trait(#2033)
-8. workflow support http provider (#2029)
-9.  Use vela def commands to replace mergedef.sh for internal definition generation (#2031)
-
-
-# Other release histories
-
-Refer to https://github.com/oam-dev/kubevela/releases

CHANGELOG/CHANGELOG-1.2.md

@@ -1,205 +0,0 @@
-# v1.2.2
-
-
-## What's Changed
-* Feat: add JFrog webhook trigger by @chwetion in https://github.com/oam-dev/kubevela/pull/3104
-* Fix: trait/comp command output without a new line by @chivalryq in https://github.com/oam-dev/kubevela/pull/3112
-* Feat: support wild match for env patch by @Somefive in https://github.com/oam-dev/kubevela/pull/3111
-* Fix: fix revision will change when add new trait with skiprevisionaffect to application by @chwetion in https://github.com/oam-dev/kubevela/pull/3032
-* Fix: add app samples for Terraform definition by @zzxwill in https://github.com/oam-dev/kubevela/pull/3118
-* Feat: add port name in webservice by @FogDong in https://github.com/oam-dev/kubevela/pull/3110
-* Fix: add imagePullSecrets for helm templates  to support private docker registry by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3122
-* Fix: workflow skip executing all steps occasionally by @leejanee in https://github.com/oam-dev/kubevela/pull/3025
-* Fix: support generate Terraform ComponentDefinition from local HCL file by @zzxwill in https://github.com/oam-dev/kubevela/pull/3132
-* Fix: prioritize namespace flag for `vela up` by @devholic in https://github.com/oam-dev/kubevela/pull/3135
-* Fix: handle workflow cache reconcile by @FogDong in https://github.com/oam-dev/kubevela/pull/3128
-* Feat: extend gateway trait to set class in spec by @devholic in https://github.com/oam-dev/kubevela/pull/3138
-* Fix: add providerRef in generated ComponentDefinition by @zzxwill in https://github.com/oam-dev/kubevela/pull/3142
-* Fix: retrieve Terraform variables from variables.tf by @zzxwill in https://github.com/oam-dev/kubevela/pull/3149
-* Feat: addon parameter support ui-shcema by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3154
-* Fix: vela addnon enable cannot support '=' by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3156
-* Fix: add context parameters into the error message by @zeed-w-beez in https://github.com/oam-dev/kubevela/pull/3145
-* Feat: support vela show for workflow step definition by @FogDong in https://github.com/oam-dev/kubevela/pull/3140
-
-## New Contributors
-* @devholic made their first contribution in https://github.com/oam-dev/kubevela/pull/3135
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.2.1...v1.2.2
-
-# v1.2.1
-
-## What's Changed
-
-* Fix: can't query data from the MongoDB by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3095
-* Fix: use personal token of vela-bot instead of github token for homebrew update by @wonderflow in https://github.com/oam-dev/kubevela/pull/3096
-* Fix: acr image no version by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3100
-* Fix: support generate cloud resource docs in Chinese by @zzxwill in https://github.com/oam-dev/kubevela/pull/3079
-* Fix: clear old data in mongodb unit test case by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3103
-* Feat: support external revision in patch component by @Somefive in https://github.com/oam-dev/kubevela/pull/3106
-* Fix:  file under the path of github addon registry is not ignored by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3099
-* Fix: Vela is crashed, when disabling addon, which needs namespace vela-system by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3109
-* Fix: rollout workload namespace not aligned with rollout by @Somefive in https://github.com/oam-dev/kubevela/pull/3107
-
-## New Contributors
-* @StevenLeiZhang made their first contribution in https://github.com/oam-dev/kubevela/pull/3099
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.2.0...v1.2.1
-
-
-# v1.2.0
-
-❤️  KubeVela v1.2.0 released ! ❤️
-
-Docs have been updated about the release at https://kubevela.io/docs/next/ .
-
-**Changelog Between v1.2.0-rc.2~v1.2.0**: https://github.com/oam-dev/kubevela/compare/v1.2.0-rc.2...v1.2.0
-
-## What's New
-
-### UI Console Supported
-
-Check how to use the GUI by this [how-to document](https://kubevela.io/docs/next/how-to/dashboard/application/create-application).
-
-**GUI frontend code repo is here: https://github.com/oam-dev/velaux**
-**API Server Code is here: https://github.com/oam-dev/kubevela/tree/master/pkg/apiserver**
-
-We also add a [VelaQL](https://kubevela.io/docs/next/platform-engineers/system-operation/velaql) feature that could allow apiserver to interact with K8s Object in an extended way.
-
-### Addon System
-
-We add a new addon system in v1.2, this helps KubeVela install it's extension including more than X-Definition files.
-
-The community has already supported some built-in addons here（https://github.com/oam-dev/catalog/tree/master/addons ）, there're also some experimental addons here （https://github.com/oam-dev/catalog/tree/master/experimental/addons）。
-
-You can learn how to use it [from docs](https://kubevela.io/docs/next/how-to/cli/addon/addon).
-
-You can [build and contribute](https://kubevela.io/docs/next/platform-engineers/addon/intro) your own addons.
-
-### CI/CD Integration
-
-You can use triggers to integrate with different CI and image registry systems on VelaUX.
-
-* Feat: add ACR webhook trigger for CI/CD (#3044)
-* Feat: add Harbor image registry webhook trigger for CI/CD (#3065)
-* Feat: add DockerHub webhook trigger for CI/CD (#3081)
-
-### Cloud Resources Enhancement
-
-* Feature: support terraform/provider-azure addon by @zzxwill in https://github.com/oam-dev/kubevela/pull/2402
-* Fix: aws/azure Terraform provider are broken by @zzxwill in https://github.com/oam-dev/kubevela/pull/2513 ,  https://github.com/oam-dev/kubevela/pull/2520 , https://github.com/oam-dev/kubevela/pull/2465
-* Feat: Add Terraform Azure Storage Account by @maciejgwizdala in https://github.com/oam-dev/kubevela/pull/2646
-* Docs: add vpc and vswitch cloud resource templates of alicloud by @lowkeyrd in https://github.com/oam-dev/kubevela/pull/2663
-* Fix: allow external cloud resources to be kept when Application is deleted by @zzxwill in https://github.com/oam-dev/kubevela/pull/2698
-* Feat: add alibaba cloud redis definition by @chivalryq in https://github.com/oam-dev/kubevela/pull/2507
-* Feat: envbinding support cloud resource deploy and share by @Somefive in https://github.com/oam-dev/kubevela/pull/2734
-* Fix: support naming a terraform provider by @zzxwill in https://github.com/oam-dev/kubevela/pull/2794
-
-
-### Multi-Cluster Enhancement
-
-* Feat: multicluster support ServiceAccountToken by @Somefive in https://github.com/oam-dev/kubevela/pull/2356
-* Feat: add secure tls for cluster-gateway by @Somefive in https://github.com/oam-dev/kubevela/pull/2426
-* Feat: add support for envbinding with namespace selector by @Somefive in https://github.com/oam-dev/kubevela/pull/2432
-* Feat: upgrade cluster gateway to support remote debug by @Somefive in https://github.com/oam-dev/kubevela/pull/2673
-* Feat: set multicluster enabled by default  by @Somefive in #2930
-
-### Workflow Enhancement
-
-* Feat: add apply raw built in workflow steps by @FogDong in https://github.com/oam-dev/kubevela/pull/2420
-* Feat: add read object step def by @FogDong in https://github.com/oam-dev/kubevela/pull/2480
-* Feat: add export config and secret def for workflow by @FogDong in https://github.com/oam-dev/kubevela/pull/2484
-* Feat: support secret in webhook notification by @FogDong in https://github.com/oam-dev/kubevela/pull/2509
-* Feat: Record workflow execution state by @leejanee in https://github.com/oam-dev/kubevela/pull/2479
-* Fix(cli): use flag instead of env in workflow cli by @FogDong in https://github.com/oam-dev/kubevela/pull/2512
-* Not update resource if render hash equal. by @leejanee in https://github.com/oam-dev/kubevela/pull/2522
-* Feat: add email support in webhook notification by @FogDong in https://github.com/oam-dev/kubevela/pull/2535
-* Feat: add render component and apply component remaining by @FogDong in https://github.com/oam-dev/kubevela/pull/2587
-* Feat: add list application records api by @FogDong in https://github.com/oam-dev/kubevela/pull/2757
-* Feat: component-pod-view support filter resource by cluster name and cluster namespace by @yangsoon in https://github.com/oam-dev/kubevela/pull/2754
-* Feat: workflow support update by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2760
-* Feat: add workflow reconciling backoff time and failed limit times by @FogDong in #2881
-
-### Component/Trait Enhancement
-
-* Feat: add health check and custom status for helm type component  by @chivalryq in https://github.com/oam-dev/kubevela/pull/2499
-* Feat: add nocalhost dev config trait definition by @yuyicai in https://github.com/oam-dev/kubevela/pull/2545
-* Feat(rollout): fill rolloutBatches if empty when scale up/down by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2569
-* Feat: allow import package in custom status cue template by @Chwetion in https://github.com/oam-dev/kubevela/pull/2585
-* Feat: add trait service-account by @yangsoon in https://github.com/oam-dev/kubevela/pull/2878
-* Fix: add ingress class as arguments by @Somefive in https://github.com/oam-dev/kubevela/pull/2445
-* Fix: add libgit2 support for gitops by @FogDong in https://github.com/oam-dev/kubevela/pull/2477
-* Fix: make nginx class to be default value and allow pvc trait to attach more than once by @wonderflow in https://github.com/oam-dev/kubevela/pull/2466
-* Feat: add imagePullPolicy/imagePullSecret to task def by @chivalryq in https://github.com/oam-dev/kubevela/pull/2503
-
-
-### Vela CLI Enhancement
-
-* Feat: add vela prob to test cluster by @wonderflow in https://github.com/oam-dev/kubevela/pull/2635
-* Feat: vela logs support multicluster by @chivalryq in https://github.com/oam-dev/kubevela/pull/2593
-* Feat: vela-cli support use ocm to join/list/detach cluster by @yangsoon in https://github.com/oam-dev/kubevela/pull/2599
-* Feat: add vela exec for multi cluster by @wonderflow in https://github.com/oam-dev/kubevela/pull/2299
-* Feat: multicluster vela status/exec/port-forward by @Somefive in https://github.com/oam-dev/kubevela/pull/2662
-* Fix: support `-n` flag for all commands to specify namespace by @chivalryq in https://github.com/oam-dev/kubevela/pull/2719
-* Feat: vela delete add wait and force options by @yangsoon in https://github.com/oam-dev/kubevela/pull/2747
-* Feat: add workflow rollback cli by @FogDong in https://github.com/oam-dev/kubevela/pull/2795
-* Refactor: refine cli commands && align kubectl-vela with vela && use getnamespaceAndEnv for all by @wonderflow in #3048
-
-
-### Overall Enhancements
-
-* Feat: ResourceTracker new architecture by @Somefive in https://github.com/oam-dev/kubevela/pull/2849
-* New Resource Management Model: Garbage Collection and Resource State Keeper [Desigin Doc](https://github.com/oam-dev/kubevela/blob/master/design/vela-core/resourcetracker_design.md)
-* Feat:  output log with structured tag & add step duration metrics by @leejanee in https://github.com/oam-dev/kubevela/pull/2683
-* Feat: support user defined image registry that allows private installation by @wonderflow in https://github.com/oam-dev/kubevela/pull/2623
-* Feat: add a built in garbage-collect policy to application by @yangsoon in https://github.com/oam-dev/kubevela/pull/2575
-* Feat: health scope controller support check trait-managing workload by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2527
-* Chore:  add homebrew bump to support `brew install kubevela` by @basefas in https://github.com/oam-dev/kubevela/pull/2434
-* Chore: Update release action to support build binaries for more platform by @basefas in https://github.com/oam-dev/kubevela/pull/2537
-* Feat: add reconcile timeout configuration for vela-core by @Somefive in https://github.com/oam-dev/kubevela/pull/2630
-* Chore: push docker images to Alibaba Cloud ACR by @zzxwill in https://github.com/oam-dev/kubevela/pull/2601
-
-
-## What's Changed/Deprecated
-
-* Deprecated: containerized workload by @reetasingh in https://github.com/oam-dev/kubevela/pull/2330
-* Deprecated: initializer CRD controller by @chivalryq in https://github.com/oam-dev/kubevela/pull/2491
-* Deprecated: remove envbinding controller, use #ApplyComponent for EnvBinding by @Somefive in https://github.com/oam-dev/kubevela/pull/2556 , https://github.com/oam-dev/kubevela/pull/2382
-* Deprecated(cli): CLI vela config by @chivalryq in https://github.com/oam-dev/kubevela/pull/2037
-* Deprecated: remove addon with no definitions by @chivalryq in https://github.com/oam-dev/kubevela/pull/2574
-* Refactor: remove apiserver component from the chart, users should use velaux addon instead by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2838
-* Refactor: all addons are migrated from initializer to application objects by @chivalryq in https://github.com/oam-dev/kubevela/pull/2444
-* Refactor: change rollout's json tag so the status of rollout will be optional by @GingoBang in https://github.com/oam-dev/kubevela/pull/2314
-* Deprecated: deprecate CRD discovery for CUE import in Definition to prevent memory leak and OOM crash (#2925)
-* Deprecated: delete approllout related code #3040
-* Deprecate: delete appDeployment related logic #3050
-
-## Bugfix
-
-* Feat: rework resource tracker to solve bugs by @Somefive in https://github.com/oam-dev/kubevela/pull/2797
-* Fix: change raw extension to pointer by @FogDong in https://github.com/oam-dev/kubevela/pull/2451
-* Fix: show reconcile error log by @wonderflow in https://github.com/oam-dev/kubevela/pull/2626
-* Fix: Closure Bug In newValue by @leejanee in https://github.com/oam-dev/kubevela/pull/2437
-* Fix: resourceTracker compatibility bug by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2467
-* Fix(application): nil pointer for component properties by @kinsolee in https://github.com/oam-dev/kubevela/pull/2481
-* Fix: Commit step-generate data  without success by @leejanee in https://github.com/oam-dev/kubevela/pull/2539
-* Fix(cli): client-side throttling in vela CLI by @chivalryq in https://github.com/oam-dev/kubevela/pull/2581
-* Fix: fix delete a component from application not delete workload by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2680
-* Fix: lookupByScript don't support `import` by @leejanee in https://github.com/oam-dev/kubevela/pull/2788
-* Fix: resourcetracker do not garbage collect legacyRTs correctly by @Somefive in https://github.com/oam-dev/kubevela/pull/2817
-* Fix: application conditions confusion. by @leejanee in https://github.com/oam-dev/kubevela/pull/2834
-
-## New Contributors
-* @GingoBang made their first contribution in https://github.com/oam-dev/kubevela/pull/2314
-* @basefas made their first contribution in https://github.com/oam-dev/kubevela/pull/2434
-* @yuyicai made their first contribution in https://github.com/oam-dev/kubevela/pull/2540
-* @maciejgwizdala made their first contribution in https://github.com/oam-dev/kubevela/pull/2646
-* @lowkeyrd made their first contribution in https://github.com/oam-dev/kubevela/pull/2663
-* @zxbyoyoyo made their first contribution in https://github.com/oam-dev/kubevela/pull/2703
-* @yue9944882 made their first contribution in https://github.com/oam-dev/kubevela/pull/2751
-* @snyk-bot made their first contribution in https://github.com/oam-dev/kubevela/pull/2857
-* @yunjianzhong made their first contribution in https://github.com/oam-dev/kubevela/pull/3005
-* @songminglong made their first contribution in https://github.com/oam-dev/kubevela/pull/3064
-* @basuotian made their first contribution in https://github.com/oam-dev/kubevela/pull/3059
-* @K1ngram4 made their first contribution in https://github.com/oam-dev/kubevela/pull/3065
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.1.3...v1.2.0

CHANGELOG/README.md

@@ -1,13 +0,0 @@
-# CHANGELOGs
-
-## Development release
-
-- [CHANGELOG-1.2.md](./CHANGELOG-1.2.md)
-
-## Current release
-
-- [CHANGELOG-1.1.md](./CHANGELOG-1.1.md)
-
-## Older releases
-
-- [CHANGELOG-1.0.md](./CHANGELOG-1.0.md)

CONTRIBUTING.md

@@ -1,3 +1,186 @@
 # CONTRIBUTING Guide
 
-Please refer to https://kubevela.io/docs/contributor/overview for details.
+## 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. 
+
+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). 
+
+
+## Development
+
+### Prerequisites
+
+1. Golang version 1.13+
+2. Kubernetes version v1.16+ with `~/.kube/config` configured.
+3. ginkgo 1.14.0+ (just for [E2E test](./CONTRIBUTING.md#e2e-test))
+4. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.
+
+We also recommend you to learn about KubeVela's [design](https://kubevela.io/docs/concepts) before dive into its code.
+
+### Build
+
+* Clone this project
+
+```shell script
+git clone git@github.com:oam-dev/kubevela.git
+```
+
+KubeVela includes two parts, `vela core` and `vela cli`.
+
+- The `vela core` is actually a K8s controller, it will watch OAM Spec CRD and deploy resources.
+- The `vela cli` is a command line tool that can build, run apps(with the help of `vela core`).
+
+For local development, we probably need to build both of them.
+
+* Build Vela CLI
+
+```shell script
+make
+```
+
+After the vela cli built successfully, `make` command will create `vela` binary to `bin/` under the project.
+
+* Configure `vela` binary to System PATH
+
+```shell script
+export PATH=$PATH:/your/path/to/project/kubevela/bin
+```
+
+Then you can use `vela` command directly.
+
+* Build Vela Core
+
+```shell script
+make manager
+```
+
+* Run Vela Core
+
+Firstly make sure your cluster has CRDs, below is the command that can help install all CRDs.
+
+```shell script
+make core-install
+```
+
+Run locally:
+
+```shell script
+make core-run
+```
+
+This command will run controller locally, it will use your local KubeConfig which means you need to have a k8s cluster
+locally. If you don't have a one, we suggest that you could setup up a cluster with [kind](https://kind.sigs.k8s.io/).
+
+When you're developing `vela-core`, make sure the controller installed by helm chart is not running.
+Otherwise, it will conflict with your local running controller.
+
+You can check and uninstall it by using helm.
+
+```shell script
+helm list -A
+helm uninstall -n vela-system kubevela
+```
+
+### Use
+
+You can try use your local built binaries follow [the documentation](https://kubevela.io/docs/quick-start).
+
+## Testing
+
+### Unit test
+
+```shell script
+make test
+```
+
+### E2E test
+
+**Before e2e test start, make sure you have vela-core running.**
+
+```shell script
+make core-run
+```
+
+Start to test.
+
+```
+make e2e-test
+```
+## Logging Conventions
+
+
+### Structured logging
+
+We recommend using `klog.InfoS` to structure the log. The `msg` argument need start from a capital letter.
+and name arguments should always use lowerCamelCase.
+
+```golang
+// func InfoS(msg string, keysAndValues ...interface{})
+klog.InfoS("Reconcile traitDefinition", "traitDefinition", klog.KRef(req.Namespace, req.Name))
+// output:
+// I0605 10:10:57.308074   22276 traitdefinition_controller.go:59] "Reconcile traitDefinition" traitDefinition="vela-system/expose"
+```
+
+### Use `klog.KObj` and `klog.KRef` for Kubernetes objects
+
+`klog.KObj` and `klog.KRef` can unify the output of kubernetes object.
+
+```golang
+// KObj is used to create ObjectRef when logging information about Kubernetes objects
+klog.InfoS("Start to reconcile", "appDeployment", klog.KObj(appDeployment))
+// KRef is used to create ObjectRef when logging information about Kubernetes objects without access to metav1.Object
+klog.InfoS("Reconcile application", "application", klog.KRef(req.Namespace, req.Name))
+```
+
+### Logging Level
+
+[This file](https://github.com/oam-dev/kubevela/blob/master/pkg/controller/common/logs.go) contains KubeVela's log level,
+you can set the log level by `klog.V(level)`.
+
+```golang
+// you can use klog.V(common.LogDebug) to print debug log
+klog.V(common.LogDebug).InfoS("Successfully applied components", "workloads", len(workloads))
+```
+
+more detail in [Structured Logging Guide](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md#structured-logging-in-kubernetes).
+
+## Contribute Docs
+
+Please read [the documentation](https://github.com/oam-dev/kubevela/tree/master/docs/README.md) before contributing to the docs.
+
+- Build docs
+
+```shell script
+make docs-build
+```
+
+- Local development and preview
+
+```shell script
+make docs-start
+```
+
+## Make a pull request
+
+Remember to write unit-test and e2e-test after you have finished your code.
+ 
+Run following checks before making a pull request.
+
+```shell script
+make reviewable
+```
+
+The command will do some lint checks and clean code.
+
+After that, check in all changes and send a pull request.
+
+## Merge Regulations
+
+Before merging, the pull request should obey the following rules:
+
+- The commit title and message should be clear about what this PR does.
+- All test CI should pass green.
+- The `codecov/project` should pass. This means the coverage should not drop. See [Codecov commit status](https://docs.codecov.io/docs/commit-status#project-status).

Dockerfile

@@ -1,27 +1,19 @@
-ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-
-# It's a proxy for CN developer, please unblock it if you have network issue
-ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
-
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
 COPY cmd/core/main.go main.go
-COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
-COPY references/ references/
 
 # Build
 ARG TARGETARCH
@@ -35,9 +27,10 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-FROM ${BASE_IMAGE:-alpine:3.15}
-# This is required by daemon connecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+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 /
 

Dockerfile.apiserver

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

Dockerfile.cli

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

Dockerfile.e2e

@@ -1,6 +1,5 @@
-ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -13,12 +12,10 @@ RUN go mod download
 # Copy the go source
 COPY cmd/core/main.go main.go
 COPY cmd/core/main_e2e_test.go main_e2e_test.go
-COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY cmd/ cmd/
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
-COPY references/ references/
 
 # Build
 ARG TARGETARCH
@@ -26,27 +23,21 @@ ARG VERSION
 ARG GITVERSION
 
 RUN  apk add gcc musl-dev libc-dev ;\
-    GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .
-
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
-    -o apiserver-${TARGETARCH} cmd/apiserver/main.go
+     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`
-
-FROM ${BASE_IMAGE:-alpine:3.15}
-# This is required by daemon connecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-alpine:latest}
+# This is required by daemon connnecting with cri
+RUN apk add --no-cache ca-certificates bash
 
 WORKDIR /
 
 ARG TARGETARCH
 COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager
-COPY --from=builder /workspace/apiserver-${TARGETARCH} /usr/local/bin/apiserver
 
 COPY entrypoint.sh /usr/local/bin/
 

GOVERNANCE.md

@@ -1,16 +0,0 @@
-# Governance
-
-[Project maintainers](https://github.com/kubevela/community/blob/main/OWNERS.md#maintainers) are responsible for activities around maintaining and updating KubeVela.
-Final decisions on the project reside with the project maintainers.
-
-Maintainers **MUST** remain active. If they are unresponsive for >6 months,
-they will be automatically removed unless a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) of the other project maintainers agrees to extend the period to be greater than 6 months.
-
-New maintainers can be added to the project by a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) vote of the existing maintainers.
-A potential maintainer may be nominated by an existing maintainer.
-A vote is conducted in private between the current maintainers over the course of a one week voting period.
-At the end of the week, votes are counted and a pull request is made on the repo adding the new maintainer to the [CODEOWNERS](https://github.com/kubevela/kubevela/blob/master/.github/CODEOWNERS) file.
-
-A maintainer may step down by submitting an [issue](https://github.com/kubevela/kubevela/issues/new/choose) stating their intent.
-
-Changes to this governance document require a pull request with approval from a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) of the current maintainers.

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/kubevela/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/kubevela/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/kubevela/kubevela/discussions)
-   and explain that issue is mainly used for tracking bugs and feature requests.
-   If possible, it's usually a good idea to add some pointers to the issue author's question.
-2. Close the issue and label it with `type/question`.
-
-## 4. Prioritization of issues
-
-In general bugs and enhancement issues should be labeled with a priority.
-
-This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience
-before being able to think of and start feel comfortable adding a certain priority label.
-
-The key here is asking for help and discuss issues to understand how more experienced project members think and reason.
-By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
-
-In case there is an uncertainty around the prioritization of an issue, please ask the maintainers for help.
-
-| Label                             | Description                                                                                                              |
-| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `priority/critical`               | Highest priority. Must be actively worked on as someone's top priority right now.                                        |
-| `priority/important-soon`         | Must be staffed and worked on either currently, or very soon, ideally in time for the next release.                      |
-| `priority/important-longterm`     | Important over the long term, but may not be staffed and/or may need multiple releases to complete.                      |
-| `priority/nice-to-have`           | It's a good idea, but not scheduled for any release.                                                                     |
-| `priority/awaiting-more-evidence` | Lowest priority. Possibly useful, but not yet enough interest in it.                                                     |
-| `priority/unscheduled`            | Something to look into before and to be discussed during the planning of the next (upcoming) major/minor stable release. |
-
-**Critical bugs**
-
-1. If a bug has been categorized and any of the following criteria apply, the bug should be labeled as critical and
-   must be actively worked on as someone's top priority right now.
-
-    - Results in any crash or data loss.
-    - Critical security or performance issues
-    - Problem that makes a feature unusable
-    - Multiple users experience a severe problem affecting their business, users etc.
-
-2. Label the issue `priority/critical`.
-3. Add the issue to the next upcoming patch release milestone. Create a new milestone if there are none.
-4. Escalate the problem to the maintainers.
-5. Assign or ask a maintainer for help assigning someone to make this issue their top priority right now.
-
-**Important short-term**
-
-1. Label the issue `priority/important-soon`.
-2. Add the issue to the next upcoming patch or major/minor stable release milestone. Ask maintainers for help if unsure if it's a patch or not.
-   Create a new milestone if there are none.
-3. Make sure to add the issue to a suitable backlog of a GitHub project and prioritize it or assign someone to work on it now or very soon.
-4. Consider requesting [help from the community](#5-requesting-help-from-the-community), even though it may be problematic given a short amount of time until it should be released.
-
-**Important long-term**
-
-1. Label the issue `priority/important-longterm`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-**Nice to have**
-
-1. Label the issue `priority/nice-to-have`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-**Not critical, but unsure?**
-
-1. Label the issue `priority/unscheduled`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-## 5. Requesting help from the community
-
-Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community
-is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement.
-In general, requesting help from the community means that a contribution has a good chance of getting accepted and merged.
-
-1. Kindly and politely add a comment to signal to users subscribed to updates of the issue.
-    - Explain that the issue would be nice to get resolved, but it isn't prioritized to work on by maintainers for an unforeseen future.
-    - If possible or applicable, try to help contributors getting starting by adding pointers and references to
-      what code/files need to be changed and/or ideas of a good way to solve/implement the issue.
-2. Label the issue with `help wanted`.
-3. If applicable, label the issue with `good first issue` to denote that the issue is suitable for a beginner to work on.
-4. If possible, try to estimate the amount of work by adding `effort/small`, `effort/medium` or `effort/large`.
-
-## Investigation of issues
-
-When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported
-problem at a first glance, the issue is labeled [Needs investigation](https://github.com/oam-dev/kubevela/labels/needs%20investigation).
-Depending on the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments),
-the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor)
-picks it up and eventually starts investigating it.
-
-Investigating issues can be a very time consuming task, especially for the maintainers, provide as much related info will
-make it easier for maintainers to investigate.
-
-Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments)
-the issue if you happen to have the same problem. If you have further details that may help investigating the issue
-please provide as much information as possible.
-
-## Automation
-
-We have some automation that triggers on comments or labels being added to issues.
-Many of these automated behaviors are defined in [issue-commands.json](https://github.com/oam-dev/kubevela/blob/master/.github/issue-commands.json).
-
-* Add comment `/duplicate #<number>` to have `type/duplicate` label, the issue number is required for remind where is the other issue.
-* Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
-
-Read more bot actions on [bot.md](https://github.com/oam-dev/kubevela/blob/master/.github/bot.md)

Makefile

@@ -1,43 +1,130 @@
-include makefiles/const.mk
-include makefiles/dependency.mk
-include makefiles/release.mk
-include makefiles/develop.mk
-include makefiles/build.mk
-include makefiles/e2e.mk
+# Vela version
+VELA_VERSION ?= master
+# Repo info
+GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
+GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
+VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
+VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
+LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
+
+GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
+GOX         = go run github.com/mitchellh/gox
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
+DIST_DIRS   := find * -type d -exec
+
+TIME_LONG	= `date +%Y-%m-%d' '%H:%M:%S`
+TIME_SHORT	= `date +%H:%M:%S`
+TIME		= $(TIME_SHORT)
+
+BLUE         := $(shell printf "\033[34m")
+YELLOW       := $(shell printf "\033[33m")
+RED          := $(shell printf "\033[31m")
+GREEN        := $(shell printf "\033[32m")
+CNone        := $(shell printf "\033[0m")
+
+INFO	= echo ${TIME} ${BLUE}[ .. ]${CNone}
+WARN	= echo ${TIME} ${YELLOW}[WARN]${CNone}
+ERR		= echo ${TIME} ${RED}[FAIL]${CNone}
+OK		= echo ${TIME} ${GREEN}[ OK ]${CNone}
+FAIL	= (echo ${TIME} ${RED}[FAIL]${CNone} && false)
+
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+# Image URL to use all building/pushing image targets
+VELA_CORE_IMAGE      ?= vela-core:latest
+VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
 
-.DEFAULT_GOAL := all
 all: build
 
 # Run tests
-test: vet lint staticcheck unit-test-core test-cli-gen
+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
 
-test-cli-gen: 
-	mkdir -p ./bin/doc
-	go run ./hack/docgen/cli/gen.go ./bin/doc
-unit-test-core:
-	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... ./apis/... | grep -v apiserver | grep -v applicationconfiguration)
-	go test $(shell go list ./references/... | grep -v apiserver)
-unit-test-apiserver:
-	go test -gcflags=all=-l -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/...  | grep -E 'apiserver|velaql')
-
 # Build vela cli binary
 build: fmt vet lint staticcheck vela-cli kubectl-vela
 	@$(OK) build succeed
 
-build-cleanup:
+vela-cli:
+	go run hack/chart/generate.go
+	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
+	git checkout references/cmd/cli/fake/chart_source.go
+
+kubectl-vela:
+	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
+
+dashboard-build:
+	cd references/dashboard && npm install && cd ..
+
+doc-gen:
+	rm -r docs/en/cli/*
+	go run hack/docgen/gen.go
+
+docs-build:
+ifneq ($(wildcard git-page),)
+	rm -rf git-page
+endif
+	sh ./hack/website/test-build.sh
+
+docs-start:
+ifeq ($(wildcard git-page),)
+	git clone --single-branch --depth 1 https://github.com/oam-dev/kubevela.io.git git-page
+endif
+	rm -r git-page/docs
+	rm git-page/sidebars.js
+	cat docs/sidebars.js > git-page/sidebars.js
+	cp -R docs/en git-page/docs
+	cd git-page && yarn install && yarn start
+
+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/
+
+generate-source:
+	go run hack/frontend/source.go
+
+cross-build:
 	rm -rf _bin
+	go run hack/chart/generate.go
+	$(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
+	git checkout references/cmd/cli/fake/chart_source.go
+
+compress:
+	( \
+		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
+		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
+		cd _bin/vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
+		cd ../kubectl-vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
+		cd .. && \
+		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
+	)
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+run: fmt vet
+	go run ./cmd/core/main.go
 
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
-	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w $$(go list -f {{.Dir}} ./...)
-	$(CUE) fmt ./vela-templates/definitions/internal/*
-	$(CUE) fmt ./vela-templates/definitions/deprecated/*
-	$(CUE) fmt ./vela-templates/definitions/registry/*
-	$(CUE) fmt ./pkg/stdlib/pkgs/*
-	$(CUE) fmt ./pkg/stdlib/op.cue
-	$(CUE) fmt ./pkg/workflow/tasks/template/static/*
+	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd
+	$(CUE) fmt ./hack/vela-templates/cue/*
+
 # Run go vet against code
 vet:
 	go vet ./...
@@ -48,7 +135,7 @@ staticcheck: staticchecktool
 lint: golangci
 	$(GOLANGCILINT) run ./...
 
-reviewable: manifests fmt vet lint staticcheck helm-doc-gen
+reviewable: manifests fmt vet lint staticcheck
 	go mod tidy
 
 # Execute auto-gen code commands and ensure branch is clean.
@@ -57,79 +144,181 @@ check-diff: reviewable
 	git diff --quiet || ($(ERR) please run 'make reviewable' to include all changes && false)
 	@$(OK) branch is clean
 
+# Build the docker image
+docker-build:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
+
 # Push the docker image
 docker-push:
 	docker push $(VELA_CORE_IMAGE)
 
-build-swagger:
-	go run ./cmd/apiserver/main.go build-swagger ./docs/apidoc/swagger.json
+e2e-setup:
+	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
+	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:
+	# Run e2e test
+	ginkgo -v -skipPackage capability,setup,apiserver,application -r e2e
+	ginkgo -v -r e2e/apiserver
+	ginkgo -v -r e2e/application
 
+e2e-test:
+	# Run e2e test
+	ginkgo -v ./test/e2e-test
+	@$(OK) tests pass
+
+compatibility-test: vet lint staticcheck generate-compatibility-testdata
+	# Run compatibility test with old crd
+	COMPATIBILITY_TEST=TRUE go test -race ./pkg/...
+	@$(OK) compatibility-test pass
+
+generate-compatibility-testdata:
+	mkdir -p  ./test/compatibility-test/testdata
+	go run ./test/compatibility-test/convert/main.go ./charts/vela-core/crds ./test/compatibility-test/testdata
+
+compatibility-testdata-cleanup:
+	rm -f ./test/compatibility-test/testdata/*
+
+e2e-cleanup:
+	# Clean up
+	rm -rf ~/.vela
 
 image-cleanup:
-ifneq (, $(shell which docker))
-# Delete Docker images
-
+# Delete Docker image
 ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
 	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif
 
-ifneq ($(shell docker images -q $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)),)
-	docker rmi -f $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)
-endif
+end-e2e:
+	sh ./hack/e2e/end_e2e.sh
 
-endif
-
-
-
-# load docker image to the k3d cluster
-image-load:
+# load docker image to the kind cluster
+kind-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
-	k3d image import $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
-
-image-load-runtime-cluster:
-	/bin/sh hack/e2e/build_runtime_rollout.sh
-	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
-	rm -rf runtime/rollout/e2e/tmp
-	k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
-	k3d cluster get $(RUNTIME_CLUSTER_NAME) && k3d image import $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --cluster=$(RUNTIME_CLUSTER_NAME) || echo "no worker cluster"
+	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
 
-# Build vela core manager and apiserver binary
+# Build vela core manager binary
 manager: fmt vet lint manifests
 	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go
-	$(GOBUILD_ENV) go build -o bin/apiserver -a -ldflags $(LDFLAGS) ./cmd/apiserver/main.go
 
-vela-runtime-rollout-manager: fmt vet lint manifests
-	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go
+# Run against the configured Kubernetes cluster in ~/.kube/config
+core-run: fmt vet manifests
+	go run ./cmd/core/main.go
+
+# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
+core-debug-run: fmt vet manifests
+	go run ./cmd/core/main.go --log-debug=true
+
+# Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
+core-install: manifests
+	kubectl apply -f hack/namespace.yaml
+	kubectl apply -f charts/vela-core/crds/
+	@$(OK) install succeed
+
+# Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
+core-uninstall: manifests
+	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: installcue kustomize
+manifests: kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
 	# TODO(yangsoon): kustomize will merge all CRD into a whole file, it may not work if we want patch more than one CRD in this way
 	$(KUSTOMIZE) build config/crd -o config/crd/base/core.oam.dev_applications.yaml
+	mv config/crd/base/* charts/vela-core/crds
+	./hack/vela-templates/gen_definitions.sh
 	./hack/crd/cleanup.sh
-	go run ./hack/crd/dispatch/dispatch.go config/crd/base charts/vela-core/crds runtime/ charts/vela-minimal/crds
-	rm -f config/crd/base/*
-	./vela-templates/gen_definitions.sh
-
 
+GOLANGCILINT_VERSION ?= v1.31.0
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 HOSTARCH := $(shell uname -m)
 ifeq ($(HOSTARCH),x86_64)
 HOSTARCH := amd64
 endif
 
+golangci:
+ifeq (, $(shell which golangci-lint))
+	@{ \
+	set -e ;\
+	echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCILINT_VERSION) ;\
+	echo 'Install succeed' ;\
+	}
+GOLANGCILINT=$(GOBIN)/golangci-lint
+else
+GOLANGCILINT=$(shell which golangci-lint)
+endif
+
+.PHONY: staticchecktool
+staticchecktool:
+ifeq (, $(shell which staticcheck))
+	@{ \
+	set -e ;\
+	echo 'installing honnef.co/go/tools/cmd/staticcheck ' ;\
+	GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck ;\
+	}
+STATICCHECK=$(GOBIN)/staticcheck
+else
+STATICCHECK=$(shell which staticcheck)
+endif
+
+.PHONY: goimports
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	}
+GOIMPORTS=$(GOBIN)/goimports
+else
+GOIMPORTS=$(shell which goimports)
+endif
+
+.PHONY: installcue
+installcue:
+ifeq (, $(shell which cue))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u cuelang.org/go/cmd/cue ;\
+	}
+CUE=$(GOBIN)/cue
+else
+CUE=$(shell which cue)
+endif
+
+KUSTOMIZE_VERSION ?= 3.8.2
+
+.PHONY: kustomize
+kustomize:
+ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
+	@{ \
+	set -e ;\
+	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
+	curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(GOBIN);\
+	echo 'Install succeed' ;\
+	}
+KUSTOMIZE=$(GOBIN)/kustomize
+else
+KUSTOMIZE=$(shell which kustomize)
+endif
+
+start-dashboard:
+	go run references/cmd/apiserver/main.go &
+	cd references/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
-
-def-install:
-	./hack/utils/installdefinition.sh
-
-helm-doc-gen: helmdoc
-	readme-generator -v charts/vela-core/values.yaml -r charts/vela-core/README.md
-	readme-generator -v charts/vela-minimal/values.yaml -r charts/vela-minimal/README.md

OWNERS

@@ -0,0 +1,12 @@
+approvers:
+- kubevela-controller
+- kubevela-devex
+- kubevela-dashboard-approver
+
+reviewers:
+- kubevela-controller
+- oam-spec
+- kubevela-dashboard-reviewer
+
+members:
+- community-collaborators

OWNERS_ALIASES

@@ -1 +1,44 @@
-The owner file has been migrated to the community repo, please refer to https://github.com/kubevela/community/blob/main/OWNERS.md
+aliases:
+  kubevela-devex:
+  - hongchaodeng
+  - wonderflow
+
+  kubevela-dashboard-approver:
+  - zzxwill
+  - hongchaodeng
+
+  kubevela-dashboard-reviewer:
+  - sunny0826 
+  - hanxie-crypto
+
+  kubevela-controller:
+  - resouer
+  - wonderflow
+  - hongchaodeng
+  - zzxwill
+  - ryanzhang-oss
+  - captainroy-hy
+
+  oam-spec:                   # inherit from https://github.com/oam-dev/spec/blob/master/OWNERS.md
+  - hongchaodeng
+  - resouer
+
+  community-collaborators:
+  - Fei-Guo
+  - szihai
+
+  bootstrap-contributors:     # thank you for bootstrapping KubeVela at the very early stage!
+  - xiaoyuaiheshui
+  - Ghostbaby
+  - wenxinnnnn
+  - silenceper
+  - erdun
+  - sunny0826
+  - mosesyou
+  - artursouza
+  - wonderflow
+  - hongchaodeng
+  - ryanzhang-oss
+  - woshilanren11
+  - hanxie-crypto
+  - zzxwill

README.md

@@ -1,96 +1,56 @@
-<div style="text-align: center">
-  <p align="center">
-    <img src="https://raw.githubusercontent.com/kubevela/kubevela.io/main/docs/resources/KubeVela-03.png">
-    <br><br>
-    <i>Make shipping applications more enjoyable.</i>
-  </p>
-</div>
-
-![Build status](https://github.com/kubevela/kubevela/workflows/E2E/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kubevela/kubevela)](https://goreportcard.com/report/github.com/kubevela/kubevela)
+![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
 ![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
-[![codecov](https://codecov.io/gh/kubevela/kubevela/branch/master/graph/badge.svg)](https://codecov.io/gh/kubevela/kubevela)
-[![LICENSE](https://img.shields.io/github/license/kubevela/kubevela.svg?style=flat-square)](/LICENSE)
-[![Releases](https://img.shields.io/github/release/kubevela/kubevela/all.svg?style=flat-square)](https://github.com/kubevela/kubevela/releases)
-[![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/kubevela/kubevela)](https://www.tickgit.com/browse?repo=github.com/kubevela/kubevela)
+[![codecov](https://codecov.io/gh/oam-dev/kubevela/branch/master/graph/badge.svg)](https://codecov.io/gh/oam-dev/kubevela)
+[![LICENSE](https://img.shields.io/github/license/oam-dev/kubevela.svg?style=flat-square)](/LICENSE)
+[![Releases](https://img.shields.io/github/release/oam-dev/kubevela/all.svg?style=flat-square)](https://github.com/oam-dev/kubevela/releases)
+[![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/oam-dev/kubevela)](https://www.tickgit.com/browse?repo=github.com/oam-dev/kubevela)
 [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Foam_dev)](https://twitter.com/oam_dev)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kubevela)](https://artifacthub.io/packages/search?repo=kubevela)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4602/badge)](https://bestpractices.coreinfrastructure.org/projects/4602)
 
-## Introduction
+![alt](docs/en/resources/KubeVela-03.png)
 
-KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable.
+*Make shipping applications more enjoyable.*
 
-![kubevela](docs/resources/what-is-kubevela.png)
+# KubeVela
 
-## Highlights
+KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
 
-KubeVela practices the "render, orchestrate, deploy" workflow with below highlighted values added to existing ecosystem:
+## Features
 
-* Deployment as Code
+**Application Centric** - Leveraging Open Application Model (OAM), KubeVela introduces consistent yet higher level API to capture a full deployment of microservices on top of hybrid environments. Placement strategy and patch, traffic shifting and rolling update are all declared at application level. No infrastructure level concern, simply deploy.
 
-Declare your deployment plan as workflow, run it automatically with any CI/CD or GitOps system, extend or re-program the workflow steps with CUE. No add-hoc scripts, no dirty glue code, just deploy. The deployment workflow in KubeVela is powered by [Open Application Model](https://oam.dev/).
+**Natively Extensible** - KubeVela uses [CUE](https://github.com/cuelang/cue) to glue capabilities (e.g. workload types, operational behaviors, and cloud services) provided by runtime infrastructure and expose them to users via self-service API. When users' needs grow, these API can naturally expand in programmable approach. No restriction, fully flexible.
 
-* Built-in security and compliance building blocks
-
-Choose from the wide range of LDAP integrations we provided out-of-box, enjoy multi-cluster authorization that is fully automated, pick and apply fine-grained RBAC modules and customize them per your own supply chain requirements.
-
-* Multi-cloud/hybrid-environments app delivery as first-class citizen
-
-Progressive rollout across test/staging/production environments, automatic canary, blue-green and continuous verification, rich placement strategy across clusters and clouds, fully managed cloud environments provision.
+**Runtime Agnostic** - KubeVela is built with Kubernetes as control plane but adaptable to any runtime as data-plane. It can deploy (and manage) diverse workload types such as container, cloud functions, databases, or even EC2 instances across hybrid environments. Also, this means KubeVela seamlessly works with any Kubernetes compatible CI/CD or GitOps tools via declarative API.
 
 ## Getting Started
 
-* [Introduction](https://kubevela.io/docs)
-* [Installation](https://kubevela.io/docs/install)
-* [Deploy Your Application](https://kubevela.io/docs/quick-start)
+- [Introduction](https://kubevela.io/docs)
+- [Installation](https://kubevela.io/docs/install)
+- [Deploy an Application](https://kubevela.io/docs/application)
 
 ## Documentation
 
 Full documentation is available on the [KubeVela website](https://kubevela.io/).
 
-## Blog
-
-Official blog is available on [KubeVela blog](https://kubevela.io/blog).
-
 ## Community
 
-We want your contributions and suggestions!
-One of the easiest ways to contribute is to participate in discussions on the Github Issues/Discussion, chat on IM or the bi-weekly community calls.
-For more information on the community engagement, developer and contributing guidelines and more, head over to the [KubeVela community repo](https://github.com/kubevela/community).
-
-### Contact Us
-
-Reach out with any questions you may have and we'll make sure to answer them as soon as possible!
-
-- Slack:  [CNCF Slack kubevela channel](https://cloud-native.slack.com/archives/C01BLQ3HTJA) (*English*)
+- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel (*English*)
+- Gitter: [oam-dev](https://gitter.im/oam-dev/community) (*English*)
 - [DingTalk Group](https://page.dingtalk.com/wow/dingtalk/act/en-home): `23310022` (*Chinese*)
-- Wechat Group (*Chinese*): Broker wechat to add you into the user group.
- 
-  <img src="https://static.kubevela.net/images/barnett-wechat.jpg" width="200" />
-
-### Community Call
-
-Every two weeks we host a community call to showcase new features, review upcoming milestones, and engage in a Q&A. All are welcome!
-
-- Bi-weekly Community Call:
-  - [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs).
-  - [Video Records](https://www.youtube.com/channel/UCSCTHhGI5XJ0SEhDHVakPAA/videos).
-- Bi-weekly Chinese Community Call:
-  - [Video Records](https://space.bilibili.com/180074935/channel/seriesdetail?sid=1842207).
+- Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs)
 
 ## Talks and Conferences
 
-Check out [KubeVela videos](https://kubevela.io/videos/talks/en/oam-dapr) for these talks and conferences.
+| Engagement | Link        |
+|:-----------|:------------|
+| 🎤  Talks | - [KubeVela - The Modern App Delivery System in Alibaba](https://docs.google.com/presentation/d/1CWCLcsKpDQB3bBDTfdv2BZ8ilGGJv2E8L-iOA5HMrV0/edit?usp=sharing) <br> - [Cloud-Native Apps With Open Application Model (OAM) And KubeVela](https://www.youtube.com/watch?v=2CBu6sOTtwk)  |
+| 🌎 KubeCon | - [ [NA 2020] Standardizing Cloud Native Application Delivery Across Different Clouds](https://www.youtube.com/watch?v=0yhVuBIbHcI) <br> - [ [EU 2021] Zero Pain Microservice Development and Deployment with Dapr and KubeVela](https://sched.co/iE4S) |
+| 📺 Conferences | - [Dapr, Rudr, OAM: Mark Russinovich presents next gen app development & deployment](https://www.youtube.com/watch?v=eJCu6a-x9uo) <br> - [Mark Russinovich presents "The Future of Cloud Native Applications with OAM and Dapr"](https://myignite.techcommunity.microsoft.com/sessions/82059)|
 
 ## Contributing
-
-Check out [CONTRIBUTING](https://kubevela.io/docs/contributor/overview) 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 .
+Check out [CONTRIBUTING](./CONTRIBUTING.md) to see how to develop with KubeVela.
 
 ## Code of Conduct
-
 KubeVela adopts [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

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/core.oam.dev/common/types.go

@@ -17,18 +17,10 @@ limitations under the License.
 package common
 
 import (
-	"encoding/json"
-	"errors"
-
-	types "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 // Kube defines the encapsulation in raw Kubernetes resource format
@@ -113,28 +105,8 @@ type Terraform struct {
 
 	// Type specifies which Terraform configuration it is, HCL or JSON syntax
 	// +kubebuilder:default:=hcl
-	// +kubebuilder:validation:Enum:=hcl;json;remote
+	// +kubebuilder:validation:Enum:=hcl;json
 	Type string `json:"type,omitempty"`
-
-	// Path is the sub-directory of remote git repository. It's valid when remote is set
-	Path string `json:"path,omitempty"`
-
-	// WriteConnectionSecretToReference specifies the namespace and name of a
-	// Secret to which any connection details for this managed resource should
-	// be written. Connection details frequently include the endpoint, username,
-	// and password required to connect to the managed resource.
-	// +optional
-	WriteConnectionSecretToReference *types.SecretReference `json:"writeConnectionSecretToRef,omitempty"`
-
-	// ProviderReference specifies the reference to Provider
-	ProviderReference *types.Reference `json:"providerRef,omitempty"`
-
-	// DeleteResource will determine whether provisioned cloud resources will be deleted when CR is deleted
-	// +kubebuilder:default:=true
-	DeleteResource bool `json:"deleteResource,omitempty"`
-
-	// Region is cloud provider's region. It will override the region in the region field of ProviderReference
-	Region string `json:"customRegion,omitempty"`
 }
 
 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -183,66 +155,29 @@ type Status struct {
 	HealthPolicy string `json:"healthPolicy,omitempty"`
 }
 
-// ApplicationPhase is a label for the condition of an application at the current time
+// ApplicationPhase is a label for the condition of a application at the current time
 type ApplicationPhase string
 
 const (
 	// ApplicationRollingOut means the app is in the middle of rolling out
 	ApplicationRollingOut ApplicationPhase = "rollingOut"
-	// ApplicationStarting means the app is preparing for reconcile
-	ApplicationStarting ApplicationPhase = "starting"
 	// ApplicationRendering means the app is rendering
 	ApplicationRendering ApplicationPhase = "rendering"
-	// ApplicationPolicyGenerating means the app is generating policies
-	ApplicationPolicyGenerating ApplicationPhase = "generatingPolicy"
-	// ApplicationRunningWorkflow means the app is running workflow
-	ApplicationRunningWorkflow ApplicationPhase = "runningWorkflow"
-	// ApplicationWorkflowSuspending means the app's workflow is suspending
-	ApplicationWorkflowSuspending ApplicationPhase = "workflowSuspending"
-	// ApplicationWorkflowTerminated means the app's workflow is terminated
-	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
-	// ApplicationWorkflowFinished means the app's workflow is finished
-	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
 	// ApplicationRunning means the app finished rendering and applied result to the cluster
 	ApplicationRunning ApplicationPhase = "running"
-	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
-	ApplicationUnhealthy ApplicationPhase = "unhealthy"
-	// ApplicationDeleting means application is being deleted
-	ApplicationDeleting ApplicationPhase = "deleting"
-)
-
-// WorkflowState is a string that mark the workflow state
-type WorkflowState string
-
-const (
-	// WorkflowStateInitializing means the workflow is in initial state
-	WorkflowStateInitializing WorkflowState = "Initializing"
-	// WorkflowStateTerminated means workflow is terminated manually, and it won't be started unless the spec changed.
-	WorkflowStateTerminated WorkflowState = "Terminated"
-	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
-	WorkflowStateSuspended WorkflowState = "Suspended"
-	// WorkflowStateSucceeded means workflow is running successfully, all steps finished.
-	WorkflowStateSucceeded WorkflowState = "Succeeded"
-	// WorkflowStateFinished means workflow is end.
-	WorkflowStateFinished WorkflowState = "Finished"
-	// WorkflowStateExecuting means workflow is still running or waiting some steps.
-	WorkflowStateExecuting WorkflowState = "Executing"
-	// WorkflowStateSkipping means it will skip this reconcile and let next reconcile to handle it.
-	WorkflowStateSkipping WorkflowState = "Skipping"
+	// 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"`
-	Namespace string `json:"namespace,omitempty"`
-	Cluster   string `json:"cluster,omitempty"`
-	Env       string `json:"env,omitempty"`
+	Name string `json:"name"`
 	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
-	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
-	Healthy            bool                     `json:"healthy"`
-	Message            string                   `json:"message,omitempty"`
-	Traits             []ApplicationTraitStatus `json:"traits,omitempty"`
-	Scopes             []corev1.ObjectReference `json:"scopes,omitempty"`
+	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
@@ -268,164 +203,32 @@ type RawComponent struct {
 	Raw runtime.RawExtension `json:"raw"`
 }
 
-// StepStatus record the base status of workflow step, which could be workflow step or subStep
-type StepStatus struct {
-	ID    string            `json:"id"`
-	Name  string            `json:"name,omitempty"`
-	Type  string            `json:"type,omitempty"`
-	Phase WorkflowStepPhase `json:"phase,omitempty"`
-	// A human readable message indicating details about why the workflowStep is in this state.
-	Message string `json:"message,omitempty"`
-	// A brief CamelCase message indicating details about why the workflowStep is in this state.
-	Reason string `json:"reason,omitempty"`
-	// FirstExecuteTime is the first time this step execution.
-	FirstExecuteTime metav1.Time `json:"firstExecuteTime,omitempty"`
-	// LastExecuteTime is the last time this step execution.
-	LastExecuteTime metav1.Time `json:"lastExecuteTime,omitempty"`
-}
-
-// WorkflowStepStatus record the status of a workflow step, include step status and subStep status
-type WorkflowStepStatus struct {
-	StepStatus     `json:",inline"`
-	SubStepsStatus []WorkflowSubStepStatus `json:"subSteps,omitempty"`
-}
-
-// WorkflowSubStepStatus record the status of a workflow subStep
-type WorkflowSubStepStatus struct {
-	StepStatus `json:",inline"`
-}
-
 // AppStatus defines the observed state of Application
 type AppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
-	// The generation observed by the application controller.
-	// +optional
-	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+	Rollout AppRolloutStatus `json:"rollout,omitempty"`
 
 	Phase ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
-	Components []corev1.ObjectReference `json:"components,omitempty"`
+	Components []runtimev1alpha1.TypedReference `json:"components,omitempty"`
 
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`
 
-	// Workflow record the status of workflow
-	Workflow *WorkflowStatus `json:"workflow,omitempty"`
+	// ResourceTracker record the status of the ResourceTracker
+	ResourceTracker *runtimev1alpha1.TypedReference `json:"resourceTracker,omitempty"`
 
 	// LatestRevision of the application configuration it generates
 	// +optional
 	LatestRevision *Revision `json:"latestRevision,omitempty"`
-
-	// AppliedResources record the resources that the  workflow step apply.
-	AppliedResources []ClusterObjectReference `json:"appliedResources,omitempty"`
-
-	// PolicyStatus records the status of policy
-	PolicyStatus []PolicyStatus `json:"policy,omitempty"`
 }
 
-// PolicyStatus records the status of policy
-type PolicyStatus struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Status *runtime.RawExtension `json:"status,omitempty"`
-}
-
-// 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"`
-
-	Meta *WorkflowStepMeta `json:"meta,omitempty"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-
-	SubSteps []WorkflowSubStep `json:"subSteps,omitempty"`
-
-	If string `json:"if,omitempty"`
-
-	Timeout string `json:"timeout,omitempty"`
-
-	DependsOn []string `json:"dependsOn,omitempty"`
-
-	Inputs StepInputs `json:"inputs,omitempty"`
-
-	Outputs StepOutputs `json:"outputs,omitempty"`
-}
-
-// WorkflowStepMeta contains the meta data of a workflow step
-type WorkflowStepMeta struct {
-	Alias string `json:"alias,omitempty"`
-}
-
-// WorkflowSubStep defines how to execute a workflow subStep.
-type WorkflowSubStep struct {
-	// Name is the unique name of the workflow step.
-	Name string `json:"name"`
-
-	Type string `json:"type"`
-
-	Meta *WorkflowStepMeta `json:"meta,omitempty"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-
-	If string `json:"if,omitempty"`
-
-	Timeout string `json:"timeout,omitempty"`
-
-	DependsOn []string `json:"dependsOn,omitempty"`
-
-	Inputs StepInputs `json:"inputs,omitempty"`
-
-	Outputs StepOutputs `json:"outputs,omitempty"`
-}
-
-// WorkflowStatus record the status of workflow
-type WorkflowStatus struct {
-	AppRevision string       `json:"appRevision,omitempty"`
-	Mode        WorkflowMode `json:"mode"`
-	Message     string       `json:"message,omitempty"`
-
-	SuspendState string `json:"suspendState,omitempty"`
-
-	Suspend    bool `json:"suspend"`
-	Terminated bool `json:"terminated"`
-	Finished   bool `json:"finished"`
-
-	ContextBackend *corev1.ObjectReference `json:"contextBackend,omitempty"`
-	Steps          []WorkflowStepStatus    `json:"steps,omitempty"`
-
-	StartTime metav1.Time `json:"startTime,omitempty"`
-}
-
-// WorkflowStepPhase describes the phase of a workflow step.
-type WorkflowStepPhase string
-
-const (
-	// WorkflowStepPhaseSucceeded will make the controller run the next step.
-	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
-	// WorkflowStepPhaseFailed will report error in `message`.
-	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
-	// WorkflowStepPhaseSkipped will make the controller skip the step.
-	WorkflowStepPhaseSkipped WorkflowStepPhase = "skipped"
-	// WorkflowStepPhaseStopped will make the controller stop the workflow.
-	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
-	// WorkflowStepPhaseRunning will make the controller continue the workflow.
-	WorkflowStepPhaseRunning WorkflowStepPhase = "running"
-	// WorkflowStepPhasePending will make the controller wait for the step to run.
-	WorkflowStepPhasePending WorkflowStepPhase = "pending"
-)
-
 // DefinitionType describes the type of DefinitionRevision.
-// +kubebuilder:validation:Enum=Component;Trait;Policy;WorkflowStep
+// +kubebuilder:validation:Enum=Component;Trait
 type DefinitionType string
 
 const (
@@ -434,22 +237,6 @@ const (
 
 	// TraitType represents DefinitionRevision refer to type TraitDefinition
 	TraitType DefinitionType = "Trait"
-
-	// PolicyType represents DefinitionRevision refer to type PolicyDefinition
-	PolicyType DefinitionType = "Policy"
-
-	// WorkflowStepType represents DefinitionRevision refer to type WorkflowStepDefinition
-	WorkflowStepType DefinitionType = "WorkflowStep"
-)
-
-// WorkflowMode describes the mode of workflow
-type WorkflowMode string
-
-const (
-	// WorkflowModeDAG describes the DAG mode of workflow
-	WorkflowModeDAG WorkflowMode = "DAG"
-	// WorkflowModeStep describes the step by step mode of workflow
-	WorkflowModeStep WorkflowMode = "StepByStep"
 )
 
 // AppRolloutStatus defines the observed state of AppRollout
@@ -464,225 +251,3 @@ type AppRolloutStatus struct {
 	// We will restart the rollout if this is not the same as the spec
 	LastSourceAppRevision string `json:"LastSourceAppRevision,omitempty"`
 }
-
-// ApplicationTrait defines the trait of application
-type ApplicationTrait struct {
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-}
-
-// ApplicationComponent describe the component of application
-type ApplicationComponent struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-	// ExternalRevision specified the component revisionName
-	ExternalRevision string `json:"externalRevision,omitempty"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-
-	DependsOn []string    `json:"dependsOn,omitempty"`
-	Inputs    StepInputs  `json:"inputs,omitempty"`
-	Outputs   StepOutputs `json:"outputs,omitempty"`
-
-	// Traits define the trait of one component, the type must be array to keep the order.
-	Traits []ApplicationTrait `json:"traits,omitempty"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	// scopes in ApplicationComponent defines the component-level scopes
-	// the format is <scope-type:scope-instance-name> pairs, the key represents type of `ScopeDefinition` while the value represent the name of scope instance.
-	Scopes map[string]string `json:"scopes,omitempty"`
-}
-
-// StepOutputs defines output variable of WorkflowStep
-type StepOutputs []outputItem
-
-// StepInputs defines variable input of WorkflowStep
-type StepInputs []inputItem
-
-type inputItem struct {
-	ParameterKey string `json:"parameterKey"`
-	From         string `json:"from"`
-}
-
-type outputItem struct {
-	ValueFrom string `json:"valueFrom"`
-	Name      string `json:"name"`
-}
-
-// ClusterSelector defines the rules to select a Cluster resource.
-// Either name or labels is needed.
-type ClusterSelector struct {
-	// Name is the name of the cluster.
-	Name string `json:"name,omitempty"`
-
-	// Labels defines the label selector to select the cluster.
-	Labels map[string]string `json:"labels,omitempty"`
-}
-
-// Distribution defines the replica distribution of an AppRevision to a cluster.
-type Distribution struct {
-	// Replicas is the replica number.
-	Replicas int `json:"replicas,omitempty"`
-}
-
-// ClusterPlacement defines the cluster placement rules for an app revision.
-type ClusterPlacement struct {
-	// ClusterSelector selects the cluster to  deploy apps to.
-	// If not specified, it indicates the host cluster per se.
-	ClusterSelector *ClusterSelector `json:"clusterSelector,omitempty"`
-
-	// Distribution defines the replica distribution of an AppRevision to a cluster.
-	Distribution Distribution `json:"distribution,omitempty"`
-}
-
-// ResourceCreatorRole defines the resource creator.
-type ResourceCreatorRole string
-
-const (
-	// PolicyResourceCreator create the policy resource.
-	PolicyResourceCreator ResourceCreatorRole = "policy"
-	// WorkflowResourceCreator create the resource in workflow.
-	WorkflowResourceCreator ResourceCreatorRole = "workflow"
-	// DebugResourceCreator create the debug resource.
-	DebugResourceCreator ResourceCreatorRole = "debug"
-)
-
-// OAMObjectReference defines the object reference for an oam resource
-type OAMObjectReference struct {
-	Component string `json:"component,omitempty"`
-	Trait     string `json:"trait,omitempty"`
-	Env       string `json:"env,omitempty"`
-}
-
-// Equal check if two references are equal
-func (in OAMObjectReference) Equal(r OAMObjectReference) bool {
-	return in.Component == r.Component && in.Trait == r.Trait && in.Env == r.Env
-}
-
-// AddLabelsToObject add labels to object if properties are not empty
-func (in OAMObjectReference) AddLabelsToObject(obj client.Object) {
-	labels := obj.GetLabels()
-	if labels == nil {
-		labels = map[string]string{}
-	}
-	if in.Component != "" {
-		labels[oam.LabelAppComponent] = in.Component
-	}
-	if in.Trait != "" {
-		labels[oam.TraitTypeLabel] = in.Trait
-	}
-	if in.Env != "" {
-		labels[oam.LabelAppEnv] = in.Env
-	}
-	obj.SetLabels(labels)
-}
-
-// NewOAMObjectReferenceFromObject create OAMObjectReference from object
-func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
-	if labels := obj.GetLabels(); labels != nil {
-		return OAMObjectReference{
-			Component: labels[oam.LabelAppComponent],
-			Trait:     labels[oam.TraitTypeLabel],
-			Env:       labels[oam.LabelAppEnv],
-		}
-	}
-	return OAMObjectReference{}
-}
-
-// ClusterObjectReference defines the object reference with cluster.
-type ClusterObjectReference struct {
-	Cluster                string              `json:"cluster,omitempty"`
-	Creator                ResourceCreatorRole `json:"creator,omitempty"`
-	corev1.ObjectReference `json:",inline"`
-}
-
-// Equal check if two references are equal
-func (in ClusterObjectReference) Equal(r ClusterObjectReference) bool {
-	return in.APIVersion == r.APIVersion && in.Kind == r.Kind && in.Name == r.Name && in.Namespace == r.Namespace && in.UID == r.UID && in.Creator == r.Creator && in.Cluster == r.Cluster
-}
-
-// RawExtensionPointer is the pointer of raw extension
-type RawExtensionPointer struct {
-	RawExtension *runtime.RawExtension
-}
-
-// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value.
-// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
-func (re RawExtensionPointer) MarshalJSON() ([]byte, error) {
-	if re.RawExtension == nil {
-		return nil, nil
-	}
-	if re.RawExtension.Raw == nil {
-		// TODO: this is to support legacy behavior of JSONPrinter and YAMLPrinter, which
-		// expect to call json.Marshal on arbitrary versioned objects (even those not in
-		// the scheme). pkg/kubectl/resource#AsVersionedObjects and its interaction with
-		// kubectl get on objects not in the scheme needs to be updated to ensure that the
-		// objects that are not part of the scheme are correctly put into the right form.
-		if re.RawExtension.Object != nil {
-			return json.Marshal(re.RawExtension.Object)
-		}
-		return []byte("null"), nil
-	}
-	// TODO: Check whether ContentType is actually JSON before returning it.
-	return re.RawExtension.Raw, nil
-}
-
-// ApplicationConditionType is a valid value for ApplicationCondition.Type
-type ApplicationConditionType int
-
-const (
-	// ParsedCondition indicates whether the parsing  is successful.
-	ParsedCondition ApplicationConditionType = iota
-	// RevisionCondition indicates whether the generated revision is successful.
-	RevisionCondition
-	// PolicyCondition indicates whether policy processing is successful.
-	PolicyCondition
-	// RenderCondition indicates whether render processing is successful.
-	RenderCondition
-	// WorkflowCondition indicates whether workflow processing is successful.
-	WorkflowCondition
-	// RolloutCondition indicates whether rollout processing is successful.
-	RolloutCondition
-	// ReadyCondition indicates whether whole application processing is successful.
-	ReadyCondition
-)
-
-var conditions = map[ApplicationConditionType]string{
-	ParsedCondition:   "Parsed",
-	RevisionCondition: "Revision",
-	PolicyCondition:   "Policy",
-	RenderCondition:   "Render",
-	WorkflowCondition: "Workflow",
-	RolloutCondition:  "Rollout",
-	ReadyCondition:    "Ready",
-}
-
-// String returns the string corresponding to the condition type.
-func (ct ApplicationConditionType) String() string {
-	return conditions[ct]
-}
-
-// ParseApplicationConditionType parse ApplicationCondition Type.
-func ParseApplicationConditionType(s string) (ApplicationConditionType, error) {
-	for k, v := range conditions {
-		if v == s {
-			return k, nil
-		}
-	}
-	return -1, errors.New("unknown condition type")
-}
-
-// ReferredObject the referred Kubernetes object
-type ReferredObject struct {
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	runtime.RawExtension `json:",inline"`
-}
-
-// ReferredObjectList a list of referred Kubernetes objects
-type ReferredObjectList struct {
-	// Objects a list of Kubernetes objects.
-	// +optional
-	Objects []ReferredObject `json:"objects,omitempty"`
-}

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

@@ -1,60 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package common
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-)
-
-func TestOAMObjectReference(t *testing.T) {
-	r := require.New(t)
-	o1 := OAMObjectReference{
-		Component: "component",
-		Trait:     "trait",
-		Env:       "env",
-	}
-	obj := &unstructured.Unstructured{}
-	o2 := NewOAMObjectReferenceFromObject(obj)
-	r.False(o2.Equal(o1))
-	o1.AddLabelsToObject(obj)
-	r.Equal(3, len(obj.GetLabels()))
-	o3 := NewOAMObjectReferenceFromObject(obj)
-	r.True(o1.Equal(o3))
-	o3.Component = "comp"
-	r.False(o3.Equal(o1))
-
-	r.True(o1.Equal(*o1.DeepCopy()))
-	o4 := OAMObjectReference{}
-	o1.DeepCopyInto(&o4)
-	r.True(o4.Equal(o1))
-}
-
-func TestClusterObjectReference(t *testing.T) {
-	r := require.New(t)
-	o1 := ClusterObjectReference{
-		Cluster:         "cluster",
-		ObjectReference: v1.ObjectReference{Kind: "kind"},
-	}
-	o2 := *o1.DeepCopy()
-	r.True(o1.Equal(o2))
-	o2.Cluster = "c"
-	r.False(o2.Equal(o1))
-}

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

@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -22,9 +21,7 @@ limitations under the License.
 package common
 
 import (
-	crossplane_runtime "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	"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.
@@ -47,9 +44,10 @@ func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	in.Rollout.DeepCopyInto(&out.Rollout)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]v1.ObjectReference, len(*in))
+		*out = make([]v1alpha1.TypedReference, len(*in))
 		copy(*out, *in)
 	}
 	if in.Services != nil {
@@ -59,28 +57,16 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.Workflow != nil {
-		in, out := &in.Workflow, &out.Workflow
-		*out = new(WorkflowStatus)
-		(*in).DeepCopyInto(*out)
+	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(Revision)
 		**out = **in
 	}
-	if in.AppliedResources != nil {
-		in, out := &in.AppliedResources, &out.AppliedResources
-		*out = make([]ClusterObjectReference, len(*in))
-		copy(*out, *in)
-	}
-	if in.PolicyStatus != nil {
-		in, out := &in.PolicyStatus, &out.PolicyStatus
-		*out = make([]PolicyStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -93,55 +79,6 @@ func (in *AppStatus) DeepCopy() *AppStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationComponent) DeepCopyInto(out *ApplicationComponent) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.DependsOn != nil {
-		in, out := &in.DependsOn, &out.DependsOn
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Inputs != nil {
-		in, out := &in.Inputs, &out.Inputs
-		*out = make(StepInputs, len(*in))
-		copy(*out, *in)
-	}
-	if in.Outputs != nil {
-		in, out := &in.Outputs, &out.Outputs
-		*out = make(StepOutputs, len(*in))
-		copy(*out, *in)
-	}
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]ApplicationTrait, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Scopes != nil {
-		in, out := &in.Scopes, &out.Scopes
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationComponent.
-func (in *ApplicationComponent) DeepCopy() *ApplicationComponent {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationComponent)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStatus) {
 	*out = *in
@@ -153,7 +90,7 @@ func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStat
 	}
 	if in.Scopes != nil {
 		in, out := &in.Scopes, &out.Scopes
-		*out = make([]v1.ObjectReference, len(*in))
+		*out = make([]v1alpha1.TypedReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -168,26 +105,6 @@ func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTrait.
-func (in *ApplicationTrait) DeepCopy() *ApplicationTrait {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationTrait)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationTraitStatus) DeepCopyInto(out *ApplicationTraitStatus) {
 	*out = *in
@@ -240,65 +157,6 @@ func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterObjectReference) DeepCopyInto(out *ClusterObjectReference) {
-	*out = *in
-	out.ObjectReference = in.ObjectReference
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterObjectReference.
-func (in *ClusterObjectReference) DeepCopy() *ClusterObjectReference {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterObjectReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterPlacement) DeepCopyInto(out *ClusterPlacement) {
-	*out = *in
-	if in.ClusterSelector != nil {
-		in, out := &in.ClusterSelector, &out.ClusterSelector
-		*out = new(ClusterSelector)
-		(*in).DeepCopyInto(*out)
-	}
-	out.Distribution = in.Distribution
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacement.
-func (in *ClusterPlacement) DeepCopy() *ClusterPlacement {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterPlacement)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSelector) DeepCopyInto(out *ClusterSelector) {
-	*out = *in
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSelector.
-func (in *ClusterSelector) DeepCopy() *ClusterSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DefinitionReference) DeepCopyInto(out *DefinitionReference) {
 	*out = *in
@@ -314,21 +172,6 @@ func (in *DefinitionReference) DeepCopy() *DefinitionReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Distribution) DeepCopyInto(out *Distribution) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Distribution.
-func (in *Distribution) DeepCopy() *Distribution {
-	if in == nil {
-		return nil
-	}
-	out := new(Distribution)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Helm) DeepCopyInto(out *Helm) {
 	*out = *in
@@ -399,41 +242,6 @@ func (in *KubeParameter) DeepCopy() *KubeParameter {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OAMObjectReference) DeepCopyInto(out *OAMObjectReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OAMObjectReference.
-func (in *OAMObjectReference) DeepCopy() *OAMObjectReference {
-	if in == nil {
-		return nil
-	}
-	out := new(OAMObjectReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PolicyStatus) DeepCopyInto(out *PolicyStatus) {
-	*out = *in
-	if in.Status != nil {
-		in, out := &in.Status, &out.Status
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyStatus.
-func (in *PolicyStatus) DeepCopy() *PolicyStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(PolicyStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RawComponent) DeepCopyInto(out *RawComponent) {
 	*out = *in
@@ -450,64 +258,6 @@ func (in *RawComponent) DeepCopy() *RawComponent {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RawExtensionPointer) DeepCopyInto(out *RawExtensionPointer) {
-	*out = *in
-	if in.RawExtension != nil {
-		in, out := &in.RawExtension, &out.RawExtension
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RawExtensionPointer.
-func (in *RawExtensionPointer) DeepCopy() *RawExtensionPointer {
-	if in == nil {
-		return nil
-	}
-	out := new(RawExtensionPointer)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReferredObject) DeepCopyInto(out *ReferredObject) {
-	*out = *in
-	in.RawExtension.DeepCopyInto(&out.RawExtension)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReferredObject.
-func (in *ReferredObject) DeepCopy() *ReferredObject {
-	if in == nil {
-		return nil
-	}
-	out := new(ReferredObject)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReferredObjectList) DeepCopyInto(out *ReferredObjectList) {
-	*out = *in
-	if in.Objects != nil {
-		in, out := &in.Objects, &out.Objects
-		*out = make([]ReferredObject, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReferredObjectList.
-func (in *ReferredObjectList) DeepCopy() *ReferredObjectList {
-	if in == nil {
-		return nil
-	}
-	out := new(ReferredObjectList)
-	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
@@ -544,7 +294,7 @@ func (in *Schematic) DeepCopyInto(out *Schematic) {
 	if in.Terraform != nil {
 		in, out := &in.Terraform, &out.Terraform
 		*out = new(Terraform)
-		(*in).DeepCopyInto(*out)
+		**out = **in
 	}
 }
 
@@ -573,74 +323,9 @@ func (in *Status) DeepCopy() *Status {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in StepInputs) DeepCopyInto(out *StepInputs) {
-	{
-		in := &in
-		*out = make(StepInputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepInputs.
-func (in StepInputs) DeepCopy() StepInputs {
-	if in == nil {
-		return nil
-	}
-	out := new(StepInputs)
-	in.DeepCopyInto(out)
-	return *out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in StepOutputs) DeepCopyInto(out *StepOutputs) {
-	{
-		in := &in
-		*out = make(StepOutputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepOutputs.
-func (in StepOutputs) DeepCopy() StepOutputs {
-	if in == nil {
-		return nil
-	}
-	out := new(StepOutputs)
-	in.DeepCopyInto(out)
-	return *out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *StepStatus) DeepCopyInto(out *StepStatus) {
-	*out = *in
-	in.FirstExecuteTime.DeepCopyInto(&out.FirstExecuteTime)
-	in.LastExecuteTime.DeepCopyInto(&out.LastExecuteTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepStatus.
-func (in *StepStatus) DeepCopy() *StepStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(StepStatus)
-	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
-	if in.WriteConnectionSecretToReference != nil {
-		in, out := &in.WriteConnectionSecretToReference, &out.WriteConnectionSecretToReference
-		*out = new(crossplane_runtime.SecretReference)
-		**out = **in
-	}
-	if in.ProviderReference != nil {
-		in, out := &in.ProviderReference, &out.ProviderReference
-		*out = new(crossplane_runtime.Reference)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
@@ -653,175 +338,6 @@ func (in *Terraform) DeepCopy() *Terraform {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
-	*out = *in
-	if in.ContextBackend != nil {
-		in, out := &in.ContextBackend, &out.ContextBackend
-		*out = new(v1.ObjectReference)
-		**out = **in
-	}
-	if in.Steps != nil {
-		in, out := &in.Steps, &out.Steps
-		*out = make([]WorkflowStepStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	in.StartTime.DeepCopyInto(&out.StartTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
-func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
-	*out = *in
-	if in.Meta != nil {
-		in, out := &in.Meta, &out.Meta
-		*out = new(WorkflowStepMeta)
-		**out = **in
-	}
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.SubSteps != nil {
-		in, out := &in.SubSteps, &out.SubSteps
-		*out = make([]WorkflowSubStep, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.DependsOn != nil {
-		in, out := &in.DependsOn, &out.DependsOn
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Inputs != nil {
-		in, out := &in.Inputs, &out.Inputs
-		*out = make(StepInputs, len(*in))
-		copy(*out, *in)
-	}
-	if in.Outputs != nil {
-		in, out := &in.Outputs, &out.Outputs
-		*out = make(StepOutputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStep.
-func (in *WorkflowStep) DeepCopy() *WorkflowStep {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowStep)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStepMeta) DeepCopyInto(out *WorkflowStepMeta) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepMeta.
-func (in *WorkflowStepMeta) DeepCopy() *WorkflowStepMeta {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowStepMeta)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
-	*out = *in
-	in.StepStatus.DeepCopyInto(&out.StepStatus)
-	if in.SubStepsStatus != nil {
-		in, out := &in.SubStepsStatus, &out.SubStepsStatus
-		*out = make([]WorkflowSubStepStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// 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 *WorkflowSubStep) DeepCopyInto(out *WorkflowSubStep) {
-	*out = *in
-	if in.Meta != nil {
-		in, out := &in.Meta, &out.Meta
-		*out = new(WorkflowStepMeta)
-		**out = **in
-	}
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.DependsOn != nil {
-		in, out := &in.DependsOn, &out.DependsOn
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Inputs != nil {
-		in, out := &in.Inputs, &out.Inputs
-		*out = make(StepInputs, len(*in))
-		copy(*out, *in)
-	}
-	if in.Outputs != nil {
-		in, out := &in.Outputs, &out.Outputs
-		*out = make(StepOutputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStep.
-func (in *WorkflowSubStep) DeepCopy() *WorkflowSubStep {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowSubStep)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowSubStepStatus) DeepCopyInto(out *WorkflowSubStepStatus) {
-	*out = *in
-	in.StepStatus.DeepCopyInto(&out.StepStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStepStatus.
-func (in *WorkflowSubStepStatus) DeepCopy() *WorkflowSubStepStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowSubStepStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
 	*out = *in

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

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

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

@@ -1,221 +0,0 @@
-// This file is originally from https://github.com/crossplane/crossplane-runtime/blob/master/apis/common/v1/condition_test.go
-// We copy it here to reduce dependency
-
-/*
-Copyright 2019 The Crossplane Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package condition
-
-import (
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func TestConditionEqual(t *testing.T) {
-	cases := map[string]struct {
-		a    Condition
-		b    Condition
-		want bool
-	}{
-		"IdenticalIgnoringTimestamp": {
-			a:    Condition{Type: TypeReady, LastTransitionTime: metav1.Now()},
-			b:    Condition{Type: TypeReady, LastTransitionTime: metav1.Now()},
-			want: true,
-		},
-		"DifferentType": {
-			a:    Condition{Type: TypeReady},
-			b:    Condition{Type: TypeSynced},
-			want: false,
-		},
-		"DifferentStatus": {
-			a:    Condition{Status: corev1.ConditionTrue},
-			b:    Condition{Status: corev1.ConditionFalse},
-			want: false,
-		},
-		"DifferentReason": {
-			a:    Condition{Reason: ReasonCreating},
-			b:    Condition{Reason: ReasonDeleting},
-			want: false,
-		},
-		"DifferentMessage": {
-			a:    Condition{Message: "cool"},
-			b:    Condition{Message: "uncool"},
-			want: false,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			got := tc.a.Equal(tc.b)
-
-			if diff := cmp.Diff(tc.want, got); diff != "" {
-				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestConditionedStatusEqual(t *testing.T) {
-	cases := map[string]struct {
-		a    *ConditionedStatus
-		b    *ConditionedStatus
-		want bool
-	}{
-		"Identical": {
-			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
-			b:    NewConditionedStatus(Available(), ReconcileSuccess()),
-			want: true,
-		},
-		"IdenticalExceptOrder": {
-			a:    NewConditionedStatus(Unavailable(), ReconcileSuccess()),
-			b:    NewConditionedStatus(ReconcileSuccess(), Unavailable()),
-			want: true,
-		},
-		"DifferentLength": {
-			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
-			b:    NewConditionedStatus(ReconcileSuccess()),
-			want: false,
-		},
-		"DifferentCondition": {
-			a:    NewConditionedStatus(Creating(), ReconcileSuccess()),
-			b:    NewConditionedStatus(Creating(), ReconcileError(errors.New("boom"))),
-			want: false,
-		},
-		"AIsNil": {
-			a:    nil,
-			b:    NewConditionedStatus(Deleting(), ReconcileSuccess()),
-			want: false,
-		},
-		"BIsNil": {
-			a:    NewConditionedStatus(Available(), ReconcileSuccess()),
-			b:    nil,
-			want: false,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			got := tc.a.Equal(tc.b)
-
-			if diff := cmp.Diff(tc.want, got); diff != "" {
-				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestSetConditions(t *testing.T) {
-	cases := map[string]struct {
-		cs   *ConditionedStatus
-		c    []Condition
-		want *ConditionedStatus
-	}{
-		"TypeIsIdentical": {
-			cs:   NewConditionedStatus(Available()),
-			c:    []Condition{Available()},
-			want: NewConditionedStatus(Available()),
-		},
-		"TypeIsDifferent": {
-			cs:   NewConditionedStatus(Creating()),
-			c:    []Condition{Available()},
-			want: NewConditionedStatus(Available()),
-		},
-		"TypeDoesNotExist": {
-			cs:   NewConditionedStatus(ReconcileSuccess()),
-			c:    []Condition{Available()},
-			want: NewConditionedStatus(ReconcileSuccess(), Available()),
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			tc.cs.SetConditions(tc.c...)
-
-			got := tc.cs
-			if diff := cmp.Diff(tc.want, got); diff != "" {
-				t.Errorf("tc.cs.SetConditions(...): -want, +got:\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestGetCondition(t *testing.T) {
-	cases := map[string]struct {
-		cs   *ConditionedStatus
-		t    ConditionType
-		want Condition
-	}{
-		"ConditionExists": {
-			cs:   NewConditionedStatus(Available()),
-			t:    TypeReady,
-			want: Available(),
-		},
-		"ConditionDoesNotExist": {
-			cs: NewConditionedStatus(Available()),
-			t:  TypeSynced,
-			want: Condition{
-				Type:   TypeSynced,
-				Status: corev1.ConditionUnknown,
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			got := tc.cs.GetCondition(tc.t)
-			if diff := cmp.Diff(tc.want, got); diff != "" {
-				t.Errorf("tc.cs.GetConditions(...): -want, +got:\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestConditionWithMessage(t *testing.T) {
-	testMsg := "Something went wrong on cloud side"
-	cases := map[string]struct {
-		c    Condition
-		msg  string
-		want Condition
-	}{
-		"MessageAdded": {
-			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable},
-			msg:  testMsg,
-			want: Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
-		},
-		"MessageChanged": {
-			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: "Some other message"},
-			msg:  testMsg,
-			want: Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
-		},
-		"MessageCleared": {
-			c:    Condition{Type: TypeReady, Reason: ReasonUnavailable, Message: testMsg},
-			msg:  "",
-			want: Condition{Type: TypeReady, Reason: ReasonUnavailable},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			got := tc.c.WithMessage(tc.msg)
-
-			if diff := cmp.Diff(tc.want, got); diff != "" {
-				t.Errorf("a.Equal(b): -want, +got:\n%s", diff)
-			}
-		})
-	}
-}

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

@@ -1,60 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package condition
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Condition) DeepCopyInto(out *Condition) {
-	*out = *in
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Condition.
-func (in *Condition) DeepCopy() *Condition {
-	if in == nil {
-		return nil
-	}
-	out := new(Condition)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ConditionedStatus) DeepCopyInto(out *ConditionedStatus) {
-	*out = *in
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
-		*out = make([]Condition, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConditionedStatus.
-func (in *ConditionedStatus) DeepCopy() *ConditionedStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ConditionedStatus)
-	in.DeepCopyInto(out)
-	return out
-}

apis/core.oam.dev/groupversion_info.go

@@ -20,14 +20,13 @@ package core_oam_dev
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 )
 
 func init() {
 	// Register the types with the Scheme so the resources can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme, v1alpha2.SchemeBuilder.AddToScheme, v1beta1.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme, v1beta1.SchemeBuilder.AddToScheme)
 }
 
 // AddToSchemes may be used to add all resources defined in the project to a Scheme

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

@@ -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 v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-)
-
-const (
-	// ApplyOncePolicyType refers to the type of configuration drift policy
-	ApplyOncePolicyType = "apply-once"
-)
-
-// ApplyOncePolicySpec defines the spec of preventing configuration drift
-type ApplyOncePolicySpec struct {
-	Enable bool `json:"enable"`
-	// +optional
-	Rules []ApplyOncePolicyRule `json:"rules,omitempty"`
-}
-
-// ApplyOncePolicyRule defines a single apply-once policy rule
-type ApplyOncePolicyRule struct {
-	// +optional
-	Selector ResourcePolicyRuleSelector `json:"selector,omitempty"`
-	// +optional
-	Strategy *ApplyOnceStrategy `json:"strategy,omitempty"`
-}
-
-// ApplyOnceStrategy the strategy for resource path to allow configuration drift
-type ApplyOnceStrategy struct {
-	// Path the specified path that allow configuration drift
-	// like 'spec.template.spec.containers[0].resources' and '*' means the whole target allow configuration drift
-	Path []string `json:"path"`
-}
-
-// FindStrategy find apply-once strategy for target resource
-func (in ApplyOncePolicySpec) FindStrategy(manifest *unstructured.Unstructured) *ApplyOnceStrategy {
-	if !in.Enable {
-		return nil
-	}
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return rule.Strategy
-		}
-	}
-	return nil
-}

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

@@ -1,76 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-const (
-	// RefObjectsComponentType refers to the type of ref-objects
-	RefObjectsComponentType = "ref-objects"
-)
-
-// RefObjectsComponentSpec defines the spec of ref-objects component
-type RefObjectsComponentSpec struct {
-	// Objects the referrers to the Kubernetes objects
-	Objects []ObjectReferrer `json:"objects,omitempty"`
-	// URLs are the links that stores the referred objects
-	URLs []string `json:"urls,omitempty"`
-}
-
-// ObjectReferrer selects Kubernetes objects
-type ObjectReferrer struct {
-	// ObjectTypeIdentifier identifies the type of referred objects
-	ObjectTypeIdentifier `json:",inline"`
-	// ObjectSelector select object by name or labelSelector
-	ObjectSelector `json:",inline"`
-}
-
-// ObjectTypeIdentifier identifies the scheme of Kubernetes object
-type ObjectTypeIdentifier struct {
-	// Resource is the resource name of the Kubernetes object.
-	Resource string `json:"resource"`
-	// Group is the API Group of the Kubernetes object.
-	Group string `json:"group"`
-	// LegacyObjectTypeIdentifier is the legacy identifier
-	// Deprecated: use resource/group instead
-	LegacyObjectTypeIdentifier `json:",inline"`
-}
-
-// LegacyObjectTypeIdentifier legacy object type identifier
-type LegacyObjectTypeIdentifier struct {
-	// APIVersion is the APIVersion of the Kubernetes object.
-	APIVersion string `json:"apiVersion"`
-	// APIVersion is the Kind of the Kubernetes object.
-	Kind string `json:"kind"`
-}
-
-// ObjectSelector selector for Kubernetes object
-type ObjectSelector struct {
-	// Name is the name of the Kubernetes object.
-	// If empty, it will inherit the application component's name.
-	Name string `json:"name,omitempty"`
-	// Namespace is the namespace for selecting Kubernetes objects.
-	// If empty, it will inherit the application's namespace.
-	Namespace string `json:"namespace,omitempty"`
-	// Cluster is the cluster for selecting Kubernetes objects.
-	// If empty, it will use the local cluster
-	Cluster string `json:"cluster,omitempty"`
-	// LabelSelector selects Kubernetes objects by labels
-	// Exclusive to "name"
-	LabelSelector map[string]string `json:"labelSelector,omitempty"`
-	// DeprecatedLabelSelector a deprecated alias to LabelSelector
-	// Deprecated: use labelSelector instead.
-	DeprecatedLabelSelector map[string]string `json:"selector,omitempty"`
-}

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

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

@@ -1,142 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-const (
-	// EnvBindingPolicyType refers to the type of EnvBinding
-	EnvBindingPolicyType = "env-binding"
-)
-
-// EnvTraitPatch is the patch to trait
-type EnvTraitPatch struct {
-	Type       string                `json:"type"`
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-	Disable    bool                  `json:"disable,omitempty"`
-}
-
-// ToApplicationTrait convert EnvTraitPatch into ApplicationTrait
-func (in *EnvTraitPatch) ToApplicationTrait() *common.ApplicationTrait {
-	out := &common.ApplicationTrait{Type: in.Type}
-	if in.Properties != nil {
-		out.Properties = in.Properties.DeepCopy()
-	}
-	return out
-}
-
-// EnvComponentPatch is the patch to component
-type EnvComponentPatch struct {
-	Name             string                `json:"name"`
-	Type             string                `json:"type"`
-	Properties       *runtime.RawExtension `json:"properties,omitempty"`
-	Traits           []EnvTraitPatch       `json:"traits,omitempty"`
-	ExternalRevision string                `json:"externalRevision,omitempty"`
-}
-
-// ToApplicationComponent convert EnvComponentPatch into ApplicationComponent
-func (in *EnvComponentPatch) ToApplicationComponent() *common.ApplicationComponent {
-	out := &common.ApplicationComponent{
-		Name: in.Name,
-		Type: in.Type,
-	}
-	if in.Properties != nil {
-		out.Properties = in.Properties.DeepCopy()
-	}
-	if in.Traits != nil {
-		for _, trait := range in.Traits {
-			if !trait.Disable {
-				out.Traits = append(out.Traits, *trait.ToApplicationTrait())
-			}
-		}
-	}
-	return out
-}
-
-// EnvPatch specify the parameter configuration for different environments
-type EnvPatch struct {
-	Components []EnvComponentPatch `json:"components,omitempty"`
-}
-
-// NamespaceSelector defines the rules to select a Namespace resource.
-// Either name or labels is needed.
-type NamespaceSelector struct {
-	// Name is the name of the namespace.
-	Name string `json:"name,omitempty"`
-	// Labels defines the label selector to select the namespace.
-	Labels map[string]string `json:"labels,omitempty"`
-}
-
-// EnvPlacement defines the placement rules for an app.
-type EnvPlacement struct {
-	ClusterSelector   *common.ClusterSelector `json:"clusterSelector,omitempty"`
-	NamespaceSelector *NamespaceSelector      `json:"namespaceSelector,omitempty"`
-}
-
-// EnvSelector defines which components should this env contains
-type EnvSelector struct {
-	Components []string `json:"components,omitempty"`
-}
-
-// EnvConfig is the configuration for different environments.
-type EnvConfig struct {
-	Name      string       `json:"name"`
-	Placement EnvPlacement `json:"placement,omitempty"`
-	Selector  *EnvSelector `json:"selector,omitempty"`
-	Patch     EnvPatch     `json:"patch,omitempty"`
-}
-
-// EnvBindingSpec defines a list of envs
-type EnvBindingSpec struct {
-	Envs []EnvConfig `json:"envs"`
-}
-
-// PlacementDecision describes the placement of one application instance
-type PlacementDecision struct {
-	Cluster   string `json:"cluster"`
-	Namespace string `json:"namespace"`
-}
-
-// String encode placement decision
-func (in PlacementDecision) String() string {
-	if in.Namespace == "" {
-		return in.Cluster
-	}
-	return in.Cluster + "/" + in.Namespace
-}
-
-// EnvStatus records the status of one env
-type EnvStatus struct {
-	Env        string              `json:"env"`
-	Placements []PlacementDecision `json:"placements"`
-}
-
-// ClusterConnection records the connection with clusters and the last active app revision when they are active (still be used)
-type ClusterConnection struct {
-	ClusterName        string `json:"clusterName"`
-	LastActiveRevision string `json:"lastActiveRevision"`
-}
-
-// EnvBindingStatus records the status of all env
-type EnvBindingStatus struct {
-	Envs               []EnvStatus         `json:"envs"`
-	ClusterConnections []ClusterConnection `json:"clusterConnections"`
-}

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

@@ -1,75 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// +kubebuilder:object:root=true
-
-// Policy is the Schema for the policy API
-// +kubebuilder:storageversion
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.type`
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type Policy struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PolicyList contains a list of Policy
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type PolicyList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Policy `json:"items"`
-}
-
-// +kubebuilder:object:root=true
-
-// Workflow is the Schema for the policy API
-// +kubebuilder:storageversion
-// +kubebuilder:resource:categories={oam}
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type Workflow struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Steps []common.WorkflowStep `json:"steps,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// WorkflowList contains a list of Workflow
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type WorkflowList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Workflow `json:"items"`
-}

apis/core.oam.dev/v1alpha1/garbagecollect_types.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 v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/pointer"
-	"k8s.io/utils/strings/slices"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-const (
-	// GarbageCollectPolicyType refers to the type of garbage-collect
-	GarbageCollectPolicyType = "garbage-collect"
-)
-
-// GarbageCollectPolicySpec defines the spec of configuration drift
-type GarbageCollectPolicySpec struct {
-	// KeepLegacyResource if is set, outdated versioned resourcetracker will not be recycled automatically
-	// outdated resources will be kept until resourcetracker be deleted manually
-	KeepLegacyResource bool `json:"keepLegacyResource,omitempty"`
-
-	// Order defines the order of garbage collect
-	Order GarbageCollectOrder `json:"order,omitempty"`
-
-	// Rules defines list of rules to control gc strategy at resource level
-	// if one resource is controlled by multiple rules, first rule will be used
-	Rules []GarbageCollectPolicyRule `json:"rules,omitempty"`
-}
-
-// GarbageCollectOrder is the order of garbage collect
-type GarbageCollectOrder string
-
-const (
-	// OrderDependency is the order of dependency
-	OrderDependency GarbageCollectOrder = "dependency"
-)
-
-// GarbageCollectPolicyRule defines a single garbage-collect policy rule
-type GarbageCollectPolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-	Strategy GarbageCollectStrategy     `json:"strategy"`
-}
-
-// ResourcePolicyRuleSelector select the targets of the rule
-// if multiple conditions are specified, combination logic is AND
-type ResourcePolicyRuleSelector struct {
-	CompNames        []string `json:"componentNames,omitempty"`
-	CompTypes        []string `json:"componentTypes,omitempty"`
-	OAMResourceTypes []string `json:"oamTypes,omitempty"`
-	TraitTypes       []string `json:"traitTypes,omitempty"`
-	ResourceTypes    []string `json:"resourceTypes,omitempty"`
-	ResourceNames    []string `json:"resourceNames,omitempty"`
-}
-
-// Match check if current rule selector match the target resource
-// If at least one condition is matched and no other condition failed (could be empty), return true
-// Otherwise, return false
-func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured) bool {
-	var compName, compType, oamType, traitType, resourceType, resourceName string
-	if labels := manifest.GetLabels(); labels != nil {
-		compName = labels[oam.LabelAppComponent]
-		compType = labels[oam.WorkloadTypeLabel]
-		oamType = labels[oam.LabelOAMResourceType]
-		traitType = labels[oam.TraitTypeLabel]
-	}
-	resourceType = manifest.GetKind()
-	resourceName = manifest.GetName()
-	match := func(src []string, val string) (found *bool) {
-		if len(src) == 0 {
-			return nil
-		}
-		return pointer.Bool(val != "" && slices.Contains(src, val))
-	}
-	conditions := []*bool{
-		match(in.CompNames, compName),
-		match(in.CompTypes, compType),
-		match(in.OAMResourceTypes, oamType),
-		match(in.TraitTypes, traitType),
-		match(in.ResourceTypes, resourceType),
-		match(in.ResourceNames, resourceName),
-	}
-	hasMatched := false
-	for _, cond := range conditions {
-		// if any non-empty condition failed, return false
-		if cond != nil && !*cond {
-			return false
-		}
-		// if condition succeed, record it
-		if cond != nil && *cond {
-			hasMatched = true
-		}
-	}
-	// if at least one condition is met, return true
-	return hasMatched
-}
-
-// GarbageCollectStrategy the strategy for target resource to recycle
-type GarbageCollectStrategy string
-
-const (
-	// GarbageCollectStrategyNever do not recycle target resource, leave it
-	GarbageCollectStrategyNever GarbageCollectStrategy = "never"
-	// GarbageCollectStrategyOnAppDelete do not recycle target resource until application is deleted
-	// this means the resource will be kept even it is not used in the latest version
-	GarbageCollectStrategyOnAppDelete GarbageCollectStrategy = "onAppDelete"
-	// GarbageCollectStrategyOnAppUpdate recycle target resource when it is not inUse
-	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
-)
-
-// FindStrategy find gc strategy for target resource
-func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return &rule.Strategy
-		}
-	}
-	return nil
-}

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

@@ -1,137 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-func TestGarbageCollectPolicySpec_FindStrategy(t *testing.T) {
-	testCases := map[string]struct {
-		rules          []GarbageCollectPolicyRule
-		input          *unstructured.Unstructured
-		notFound       bool
-		expectStrategy GarbageCollectStrategy
-	}{
-		"trait type rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"trait type rule mismatch": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input:    &unstructured.Unstructured{Object: map[string]interface{}{}},
-			notFound: true,
-		},
-		"trait type rule multiple match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyOnAppDelete,
-			}, {
-				Selector: ResourcePolicyRuleSelector{TraitTypes: []string{"a"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyOnAppDelete,
-		},
-		"component type rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{CompTypes: []string{"comp"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.WorkloadTypeLabel: "comp"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"rule match both component type and trait type, component type first": {
-			rules: []GarbageCollectPolicyRule{
-				{
-					Selector: ResourcePolicyRuleSelector{CompTypes: []string{"comp"}},
-					Strategy: GarbageCollectStrategyNever,
-				},
-				{
-					Selector: ResourcePolicyRuleSelector{TraitTypes: []string{"trait"}},
-					Strategy: GarbageCollectStrategyOnAppDelete,
-				},
-			},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.WorkloadTypeLabel: "comp", oam.TraitTypeLabel: "trait"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"component name rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{CompNames: []string{"comp-name"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.LabelAppComponent: "comp-name"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"resource type rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: ResourcePolicyRuleSelector{OAMResourceTypes: []string{"TRAIT"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.LabelOAMResourceType: "TRAIT"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			spec := GarbageCollectPolicySpec{Rules: tc.rules}
-			strategy := spec.FindStrategy(tc.input)
-			if tc.notFound {
-				r.Nil(strategy)
-			} else {
-				r.Equal(tc.expectStrategy, *strategy)
-			}
-		})
-	}
-}

apis/core.oam.dev/v1alpha1/policy_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 v1alpha1
-
-import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-const (
-	// TopologyPolicyType refers to the type of topology policy
-	TopologyPolicyType = "topology"
-	// OverridePolicyType refers to the type of override policy
-	OverridePolicyType = "override"
-	// DebugPolicyType refers to the type of debug policy
-	DebugPolicyType = "debug"
-	// SharedResourcePolicyType refers to the type of shared resource policy
-	SharedResourcePolicyType = "shared-resource"
-)
-
-// TopologyPolicySpec defines the spec of topology policy
-type TopologyPolicySpec struct {
-	// Placement embeds the selectors for choosing cluster
-	Placement `json:",inline"`
-	// Namespace is the target namespace to deploy in the selected clusters.
-	// +optional
-	Namespace string `json:"namespace,omitempty"`
-}
-
-// Placement describes which clusters to be selected in this topology
-type Placement struct {
-	// Clusters is the names of the clusters to select.
-	Clusters []string `json:"clusters,omitempty"`
-
-	// ClusterLabelSelector is the label selector for clusters.
-	// Exclusive to "clusters"
-	ClusterLabelSelector map[string]string `json:"clusterLabelSelector,omitempty"`
-
-	// DeprecatedClusterSelector is a depreciated alias for ClusterLabelSelector.
-	// Deprecated: Use clusterLabelSelector instead.
-	DeprecatedClusterSelector map[string]string `json:"clusterSelector,omitempty"`
-}
-
-// OverridePolicySpec defines the spec of override policy
-type OverridePolicySpec struct {
-	Components []EnvComponentPatch `json:"components,omitempty"`
-	Selector   []string            `json:"selector,omitempty"`
-}
-
-// SharedResourcePolicySpec defines the spec of shared-resource policy
-type SharedResourcePolicySpec struct {
-	Rules []SharedResourcePolicyRule `json:"rules"`
-}
-
-// SharedResourcePolicyRule defines the rule for sharing resources
-type SharedResourcePolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-}
-
-// FindStrategy return if the target resource should be shared
-func (in SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return true
-		}
-	}
-	return false
-}

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

@@ -1,69 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-)
-
-func TestSharedResourcePolicySpec_FindStrategy(t *testing.T) {
-	testCases := map[string]struct {
-		rules   []SharedResourcePolicyRule
-		input   *unstructured.Unstructured
-		matched bool
-	}{
-		"shared resource rule resourceName match": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceNames: []string{"example"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"name": "example",
-				},
-			}},
-			matched: true,
-		},
-		"shared resource rule resourceType match": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceTypes: []string{"ConfigMap", "Namespace"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"kind": "Namespace",
-			}},
-			matched: true,
-		},
-		"shared resource rule mismatch": {
-			rules: []SharedResourcePolicyRule{{
-				Selector: ResourcePolicyRuleSelector{ResourceNames: []string{"mismatch"}},
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"kind": "Namespace",
-			}},
-			matched: false,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			spec := SharedResourcePolicySpec{Rules: tc.rules}
-			r.Equal(tc.matched, spec.FindStrategy(tc.input))
-		})
-	}
-}

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

@@ -1,58 +0,0 @@
-/*
- Copyright 2021. The KubeVela Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// Package type metadata.
-const (
-	Group   = common.Group
-	Version = "v1alpha1"
-)
-
-var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: Group, Version: Version}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
-	// AddToScheme is a global function that registers this API group & version to a scheme
-	AddToScheme = SchemeBuilder.AddToScheme
-)
-
-// Policy meta
-var (
-	PolicyKind             = "Policy"
-	PolicyGroupVersionKind = SchemeGroupVersion.WithKind(PolicyKind)
-)
-
-// Workflow meta
-var (
-	WorkflowKind             = "Workflow"
-	WorkflowGroupVersionKind = SchemeGroupVersion.WithKind(WorkflowKind)
-)
-
-func init() {
-	SchemeBuilder.Register(&Policy{}, &PolicyList{})
-	SchemeBuilder.Register(&Workflow{}, &WorkflowList{})
-}

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

@@ -1,776 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplyOncePolicyRule) DeepCopyInto(out *ApplyOncePolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-	if in.Strategy != nil {
-		in, out := &in.Strategy, &out.Strategy
-		*out = new(ApplyOnceStrategy)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOncePolicyRule.
-func (in *ApplyOncePolicyRule) DeepCopy() *ApplyOncePolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplyOncePolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplyOncePolicySpec) DeepCopyInto(out *ApplyOncePolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]ApplyOncePolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOncePolicySpec.
-func (in *ApplyOncePolicySpec) DeepCopy() *ApplyOncePolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplyOncePolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplyOnceStrategy) DeepCopyInto(out *ApplyOnceStrategy) {
-	*out = *in
-	if in.Path != nil {
-		in, out := &in.Path, &out.Path
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOnceStrategy.
-func (in *ApplyOnceStrategy) DeepCopy() *ApplyOnceStrategy {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplyOnceStrategy)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterConnection) DeepCopyInto(out *ClusterConnection) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterConnection.
-func (in *ClusterConnection) DeepCopy() *ClusterConnection {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterConnection)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvBindingSpec) DeepCopyInto(out *EnvBindingSpec) {
-	*out = *in
-	if in.Envs != nil {
-		in, out := &in.Envs, &out.Envs
-		*out = make([]EnvConfig, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingSpec.
-func (in *EnvBindingSpec) DeepCopy() *EnvBindingSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvBindingSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvBindingStatus) DeepCopyInto(out *EnvBindingStatus) {
-	*out = *in
-	if in.Envs != nil {
-		in, out := &in.Envs, &out.Envs
-		*out = make([]EnvStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ClusterConnections != nil {
-		in, out := &in.ClusterConnections, &out.ClusterConnections
-		*out = make([]ClusterConnection, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingStatus.
-func (in *EnvBindingStatus) DeepCopy() *EnvBindingStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvBindingStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvComponentPatch) DeepCopyInto(out *EnvComponentPatch) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]EnvTraitPatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvComponentPatch.
-func (in *EnvComponentPatch) DeepCopy() *EnvComponentPatch {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvComponentPatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvConfig) DeepCopyInto(out *EnvConfig) {
-	*out = *in
-	in.Placement.DeepCopyInto(&out.Placement)
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = new(EnvSelector)
-		(*in).DeepCopyInto(*out)
-	}
-	in.Patch.DeepCopyInto(&out.Patch)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvConfig.
-func (in *EnvConfig) DeepCopy() *EnvConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvPatch) DeepCopyInto(out *EnvPatch) {
-	*out = *in
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]EnvComponentPatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvPatch.
-func (in *EnvPatch) DeepCopy() *EnvPatch {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvPatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvPlacement) DeepCopyInto(out *EnvPlacement) {
-	*out = *in
-	if in.ClusterSelector != nil {
-		in, out := &in.ClusterSelector, &out.ClusterSelector
-		*out = new(common.ClusterSelector)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.NamespaceSelector != nil {
-		in, out := &in.NamespaceSelector, &out.NamespaceSelector
-		*out = new(NamespaceSelector)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvPlacement.
-func (in *EnvPlacement) DeepCopy() *EnvPlacement {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvPlacement)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvSelector) DeepCopyInto(out *EnvSelector) {
-	*out = *in
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvSelector.
-func (in *EnvSelector) DeepCopy() *EnvSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvStatus) DeepCopyInto(out *EnvStatus) {
-	*out = *in
-	if in.Placements != nil {
-		in, out := &in.Placements, &out.Placements
-		*out = make([]PlacementDecision, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvStatus.
-func (in *EnvStatus) DeepCopy() *EnvStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvTraitPatch) DeepCopyInto(out *EnvTraitPatch) {
-	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvTraitPatch.
-func (in *EnvTraitPatch) DeepCopy() *EnvTraitPatch {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvTraitPatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GarbageCollectPolicyRule) DeepCopyInto(out *GarbageCollectPolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRule.
-func (in *GarbageCollectPolicyRule) DeepCopy() *GarbageCollectPolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(GarbageCollectPolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GarbageCollectPolicySpec) DeepCopyInto(out *GarbageCollectPolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]GarbageCollectPolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicySpec.
-func (in *GarbageCollectPolicySpec) DeepCopy() *GarbageCollectPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(GarbageCollectPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *LegacyObjectTypeIdentifier) DeepCopyInto(out *LegacyObjectTypeIdentifier) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LegacyObjectTypeIdentifier.
-func (in *LegacyObjectTypeIdentifier) DeepCopy() *LegacyObjectTypeIdentifier {
-	if in == nil {
-		return nil
-	}
-	out := new(LegacyObjectTypeIdentifier)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *NamespaceSelector) DeepCopyInto(out *NamespaceSelector) {
-	*out = *in
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamespaceSelector.
-func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(NamespaceSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ObjectReferrer) DeepCopyInto(out *ObjectReferrer) {
-	*out = *in
-	out.ObjectTypeIdentifier = in.ObjectTypeIdentifier
-	in.ObjectSelector.DeepCopyInto(&out.ObjectSelector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ObjectReferrer.
-func (in *ObjectReferrer) DeepCopy() *ObjectReferrer {
-	if in == nil {
-		return nil
-	}
-	out := new(ObjectReferrer)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ObjectSelector) DeepCopyInto(out *ObjectSelector) {
-	*out = *in
-	if in.LabelSelector != nil {
-		in, out := &in.LabelSelector, &out.LabelSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.DeprecatedLabelSelector != nil {
-		in, out := &in.DeprecatedLabelSelector, &out.DeprecatedLabelSelector
-		*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 ObjectSelector.
-func (in *ObjectSelector) DeepCopy() *ObjectSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(ObjectSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ObjectTypeIdentifier) DeepCopyInto(out *ObjectTypeIdentifier) {
-	*out = *in
-	out.LegacyObjectTypeIdentifier = in.LegacyObjectTypeIdentifier
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ObjectTypeIdentifier.
-func (in *ObjectTypeIdentifier) DeepCopy() *ObjectTypeIdentifier {
-	if in == nil {
-		return nil
-	}
-	out := new(ObjectTypeIdentifier)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OverridePolicySpec) DeepCopyInto(out *OverridePolicySpec) {
-	*out = *in
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]EnvComponentPatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OverridePolicySpec.
-func (in *OverridePolicySpec) DeepCopy() *OverridePolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(OverridePolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Placement) DeepCopyInto(out *Placement) {
-	*out = *in
-	if in.Clusters != nil {
-		in, out := &in.Clusters, &out.Clusters
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.ClusterLabelSelector != nil {
-		in, out := &in.ClusterLabelSelector, &out.ClusterLabelSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.DeprecatedClusterSelector != nil {
-		in, out := &in.DeprecatedClusterSelector, &out.DeprecatedClusterSelector
-		*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 Placement.
-func (in *Placement) DeepCopy() *Placement {
-	if in == nil {
-		return nil
-	}
-	out := new(Placement)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PlacementDecision) DeepCopyInto(out *PlacementDecision) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementDecision.
-func (in *PlacementDecision) DeepCopy() *PlacementDecision {
-	if in == nil {
-		return nil
-	}
-	out := new(PlacementDecision)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Policy) DeepCopyInto(out *Policy) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Policy.
-func (in *Policy) DeepCopy() *Policy {
-	if in == nil {
-		return nil
-	}
-	out := new(Policy)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Policy) 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 *PolicyList) DeepCopyInto(out *PolicyList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Policy, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyList.
-func (in *PolicyList) DeepCopy() *PolicyList {
-	if in == nil {
-		return nil
-	}
-	out := new(PolicyList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *PolicyList) 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 *RefObjectsComponentSpec) DeepCopyInto(out *RefObjectsComponentSpec) {
-	*out = *in
-	if in.Objects != nil {
-		in, out := &in.Objects, &out.Objects
-		*out = make([]ObjectReferrer, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.URLs != nil {
-		in, out := &in.URLs, &out.URLs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RefObjectsComponentSpec.
-func (in *RefObjectsComponentSpec) DeepCopy() *RefObjectsComponentSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RefObjectsComponentSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourcePolicyRuleSelector) DeepCopyInto(out *ResourcePolicyRuleSelector) {
-	*out = *in
-	if in.CompNames != nil {
-		in, out := &in.CompNames, &out.CompNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.CompTypes != nil {
-		in, out := &in.CompTypes, &out.CompTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.OAMResourceTypes != nil {
-		in, out := &in.OAMResourceTypes, &out.OAMResourceTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.TraitTypes != nil {
-		in, out := &in.TraitTypes, &out.TraitTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.ResourceTypes != nil {
-		in, out := &in.ResourceTypes, &out.ResourceTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.ResourceNames != nil {
-		in, out := &in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourcePolicyRuleSelector.
-func (in *ResourcePolicyRuleSelector) DeepCopy() *ResourcePolicyRuleSelector {
-	if in == nil {
-		return nil
-	}
-	out := new(ResourcePolicyRuleSelector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SharedResourcePolicyRule) DeepCopyInto(out *SharedResourcePolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharedResourcePolicyRule.
-func (in *SharedResourcePolicyRule) DeepCopy() *SharedResourcePolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(SharedResourcePolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SharedResourcePolicySpec) DeepCopyInto(out *SharedResourcePolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]SharedResourcePolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SharedResourcePolicySpec.
-func (in *SharedResourcePolicySpec) DeepCopy() *SharedResourcePolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(SharedResourcePolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TopologyPolicySpec) DeepCopyInto(out *TopologyPolicySpec) {
-	*out = *in
-	in.Placement.DeepCopyInto(&out.Placement)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TopologyPolicySpec.
-func (in *TopologyPolicySpec) DeepCopy() *TopologyPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(TopologyPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Workflow) DeepCopyInto(out *Workflow) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Steps != nil {
-		in, out := &in.Steps, &out.Steps
-		*out = make([]common.WorkflowStep, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Workflow.
-func (in *Workflow) DeepCopy() *Workflow {
-	if in == nil {
-		return nil
-	}
-	out := new(Workflow)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Workflow) 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 *WorkflowList) DeepCopyInto(out *WorkflowList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Workflow, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowList.
-func (in *WorkflowList) DeepCopy() *WorkflowList {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *WorkflowList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}

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

@@ -17,10 +17,11 @@ limitations under the License.
 package v1alpha2
 
 import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
@@ -37,13 +38,13 @@ type AppStatus struct {
 	Phase common.ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
-	Components []corev1.ObjectReference `json:"components,omitempty"`
+	Components []runtimev1alpha1.TypedReference `json:"components,omitempty"`
 
 	// Services record the status of the application services
 	Services []common.ApplicationComponentStatus `json:"services,omitempty"`
 
 	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
+	ResourceTracker *runtimev1alpha1.TypedReference `json:"resourceTracker,omitempty"`
 
 	// LatestRevision of the application configuration it generates
 	// +optional
@@ -54,7 +55,7 @@ type AppStatus struct {
 type ApplicationTrait struct {
 	Name string `json:"name"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
+	Properties runtime.RawExtension `json:"properties,omitempty"`
 }
 
 // ApplicationComponent describe the component of application
@@ -87,7 +88,7 @@ type ApplicationSpec struct {
 
 // Application is the Schema for the applications API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName={app,velaapp}
+// +kubebuilder:resource:categories={oam},shortName=app
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
 // +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`

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

@@ -0,0 +1,48 @@
+/*
+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/approllout_types.go

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

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

@@ -17,11 +17,10 @@ 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/condition"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
@@ -60,7 +59,7 @@ type ComponentDefinitionSpec struct {
 // ComponentDefinitionStatus is the status of ComponentDefinition
 type ComponentDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
+	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
@@ -84,12 +83,12 @@ type ComponentDefinition struct {
 }
 
 // SetConditions set condition for WorkloadDefinition
-func (cd *ComponentDefinition) SetConditions(c ...condition.Condition) {
+func (cd *ComponentDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	cd.Status.SetConditions(c...)
 }
 
 // GetCondition gets condition from WorkloadDefinition
-func (cd *ComponentDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+func (cd *ComponentDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return cd.Status.GetCondition(conditionType)
 }
 

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

@@ -20,11 +20,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 )
 
@@ -41,11 +39,11 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 	for _, comp := range v1a2.Spec.Components {
 
 		// convert trait, especially for `.name` -> `.type`
-		var traits = make([]common.ApplicationTrait, len(comp.Traits))
+		var traits = make([]v1beta1.ApplicationTrait, len(comp.Traits))
 		for j, trait := range comp.Traits {
-			traits[j] = common.ApplicationTrait{
+			traits[j] = v1beta1.ApplicationTrait{
 				Type:       trait.Name,
-				Properties: trait.Properties.DeepCopy(),
+				Properties: *trait.Properties.DeepCopy(),
 			}
 		}
 
@@ -56,14 +54,16 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 		}
 		// convert component
 		// `.settings` -> `.properties`
-		v1b1.Spec.Components = append(v1b1.Spec.Components, common.ApplicationComponent{
+		v1b1.Spec.Components = append(v1b1.Spec.Components, v1beta1.ApplicationComponent{
 			Name:       comp.Name,
 			Type:       comp.WorkloadType,
-			Properties: comp.Settings.DeepCopy(),
+			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()
@@ -103,7 +103,7 @@ func (app *Application) ConvertFrom(src conversion.Hub) error {
 			for j, trait := range comp.Traits {
 				traits[j] = ApplicationTrait{
 					Name:       trait.Type,
-					Properties: trait.Properties.DeepCopy(),
+					Properties: *trait.Properties.DeepCopy(),
 				}
 			}
 
@@ -114,21 +114,16 @@ func (app *Application) ConvertFrom(src conversion.Hub) error {
 			}
 			// convert component
 			//  `.properties` -> `.settings`
-
-			var compProperties runtime.RawExtension
-
-			if comp.Properties != nil {
-				compProperties = *comp.Properties.DeepCopy()
-			}
-
 			app.Spec.Components = append(app.Spec.Components, ApplicationComponent{
 				Name:         comp.Name,
 				WorkloadType: comp.Type,
-				Settings:     compProperties,
+				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()

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

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

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

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

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

@@ -17,11 +17,9 @@ limitations under the License.
 package v1alpha2
 
 import (
-	corev1 "k8s.io/api/core/v1"
+	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/condition"
-
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
@@ -33,13 +31,13 @@ type ManualScalerTraitSpec struct {
 	ReplicaCount int32 `json:"replicaCount"`
 
 	// WorkloadReference to the workload this trait applies to.
-	WorkloadReference corev1.ObjectReference `json:"workloadRef"`
+	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef"`
 }
 
 // A ManualScalerTraitStatus represents the observed state of a
 // ManualScalerTrait.
 type ManualScalerTraitStatus struct {
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -17,13 +17,11 @@ limitations under the License.
 package v1alpha2
 
 import (
-	corev1 "k8s.io/api/core/v1"
+	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/condition"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/types"
 )
@@ -62,7 +60,7 @@ type WorkloadDefinitionSpec struct {
 
 // WorkloadDefinitionStatus is the status of WorkloadDefinition
 type WorkloadDefinitionStatus struct {
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 }
 
 // +kubebuilder:object:root=true
@@ -82,12 +80,12 @@ type WorkloadDefinition struct {
 }
 
 // SetConditions set condition for WorkloadDefinition
-func (wd *WorkloadDefinition) SetConditions(c ...condition.Condition) {
+func (wd *WorkloadDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	wd.Status.SetConditions(c...)
 }
 
 // GetCondition gets condition from WorkloadDefinition
-func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+func (wd *WorkloadDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return wd.Status.GetCondition(conditionType)
 }
 
@@ -153,7 +151,7 @@ type TraitDefinitionSpec struct {
 // TraitDefinitionStatus is the status of TraitDefinition
 type TraitDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
+	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
@@ -180,12 +178,12 @@ type TraitDefinition struct {
 }
 
 // SetConditions set condition for TraitDefinition
-func (td *TraitDefinition) SetConditions(c ...condition.Condition) {
+func (td *TraitDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	td.Status.SetConditions(c...)
 }
 
 // GetCondition gets condition from TraitDefinition
-func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+func (td *TraitDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return td.Status.GetCondition(conditionType)
 }
 
@@ -291,7 +289,7 @@ type ComponentStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration"`
 
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
 	// LatestRevision of component
 	// +optional
@@ -353,7 +351,7 @@ type ComponentTrait struct {
 // A ComponentScope specifies a scope in which a component should exist.
 type ComponentScope struct {
 	// A ScopeReference must refer to an OAM scope resource.
-	ScopeReference corev1.ObjectReference `json:"scopeRef"`
+	ScopeReference runtimev1alpha1.TypedReference `json:"scopeRef"`
 }
 
 // An ApplicationConfigurationComponent specifies a component of an
@@ -410,7 +408,7 @@ type WorkloadTrait struct {
 	Status TraitStatus `json:"status,omitempty"`
 
 	// Reference to a trait created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"traitRef"`
+	Reference runtimev1alpha1.TypedReference `json:"traitRef"`
 
 	// Message will allow controller to leave some additional information for this trait
 	Message string `json:"message,omitempty"`
@@ -436,7 +434,7 @@ type WorkloadScope struct {
 	Status ScopeStatus `json:"status,omitempty"`
 
 	// Reference to a scope created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"scopeRef"`
+	Reference runtimev1alpha1.TypedReference `json:"scopeRef"`
 }
 
 // A WorkloadStatus represents the status of a workload.
@@ -458,7 +456,7 @@ type WorkloadStatus struct {
 	AppliedComponentRevision string `json:"appliedComponentRevision,omitempty"`
 
 	// Reference to a workload created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
+	Reference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
 
 	// Traits associated with this workload.
 	Traits []WorkloadTrait `json:"traits,omitempty"`
@@ -473,7 +471,7 @@ type HistoryWorkload struct {
 	Revision string `json:"revision,omitempty"`
 
 	// Reference to running workload.
-	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
+	Reference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
 }
 
 // A ApplicationStatus represents the state of the entire application.
@@ -482,7 +480,7 @@ type ApplicationStatus string
 // An ApplicationConfigurationStatus represents the observed state of a
 // ApplicationConfiguration.
 type ApplicationConfigurationStatus struct {
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
 	// Status is a place holder for a customized controller to fill
 	// if it needs a single place to summarize the status of the entire application
@@ -520,14 +518,14 @@ type UnstaifiedDependency struct {
 
 // DependencyFromObject represents the object that dependency data comes from.
 type DependencyFromObject struct {
-	corev1.ObjectReference `json:",inline"`
-	FieldPath              string `json:"fieldPath,omitempty"`
+	runtimev1alpha1.TypedReference `json:",inline"`
+	FieldPath                      string `json:"fieldPath,omitempty"`
 }
 
 // DependencyToObject represents the object that dependency data goes to.
 type DependencyToObject struct {
-	corev1.ObjectReference `json:",inline"`
-	FieldPaths             []string `json:"fieldPaths,omitempty"`
+	runtimev1alpha1.TypedReference `json:",inline"`
+	FieldPaths                     []string `json:"fieldPaths,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -571,7 +569,7 @@ type DataOutput struct {
 
 // StoreReference specifies the referenced object in DataOutput or DataInput
 type StoreReference struct {
-	corev1.ObjectReference `json:",inline"`
+	runtimev1alpha1.TypedReference `json:",inline"`
 	// Operations specify the data processing operations
 	Operations []DataOperation `json:"operations,omitempty"`
 }

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

@@ -19,8 +19,12 @@ limitations under the License.
 package v1alpha2
 
 import (
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 // An OperatingSystem required by a containerised workload.
@@ -353,3 +357,53 @@ type Container struct {
 	// +optional
 	ImagePullSecret *string `json:"imagePullSecret,omitempty"`
 }
+
+// A ContainerizedWorkloadSpec defines the desired state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadSpec struct {
+	// OperatingSystem required by this workload.
+	// +kubebuilder:validation:Enum=linux;windows
+	// +optional
+	OperatingSystem *OperatingSystem `json:"osType,omitempty"`
+
+	// CPUArchitecture required by this workload.
+	// +kubebuilder:validation:Enum=i386;amd64;arm;arm64
+	// +optional
+	CPUArchitecture *CPUArchitecture `json:"arch,omitempty"`
+
+	// Containers of which this workload consists.
+	Containers []Container `json:"containers"`
+}
+
+// A ContainerizedWorkloadStatus represents the observed state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadStatus struct {
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+
+	// Resources managed by this containerised workload.
+	Resources []runtimev1alpha1.TypedReference `json:"resources,omitempty"`
+}
+
+var _ oam.Workload = &ContainerizedWorkload{}
+
+// +kubebuilder:object:root=true
+
+// A ContainerizedWorkload is a workload that runs OCI containers.
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type ContainerizedWorkload struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ContainerizedWorkloadSpec   `json:"spec,omitempty"`
+	Status ContainerizedWorkloadStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ContainerizedWorkloadList contains a list of ContainerizedWorkload.
+type ContainerizedWorkloadList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ContainerizedWorkload `json:"items"`
+}

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

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

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

@@ -21,13 +21,11 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Package type metadata.
 const (
-	Group   = common.Group
+	Group   = "core.oam.dev"
 	Version = "v1alpha2"
 )
 
@@ -87,6 +85,22 @@ 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()
+	ContainerizedWorkloadGroupKind        = schema.GroupKind{Group: Group, Kind: ContainerizedWorkloadKind}.String()
+	ContainerizedWorkloadKindAPIVersion   = ContainerizedWorkloadKind + "." + SchemeGroupVersion.String()
+	ContainerizedWorkloadGroupVersionKind = SchemeGroupVersion.WithKind(ContainerizedWorkloadKind)
+)
+
 // ManualScalerTrait type metadata.
 var (
 	ManualScalerTraitKind             = reflect.TypeOf(ManualScalerTrait{}).Name()
@@ -111,6 +125,14 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
+// AppRollout type metadata.
+var (
+	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
+	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
+	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
+)
+
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -126,8 +148,11 @@ func init() {
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Component{}, &ComponentList{})
 	SchemeBuilder.Register(&ApplicationConfiguration{}, &ApplicationConfigurationList{})
+	SchemeBuilder.Register(&ContainerizedWorkload{}, &ContainerizedWorkloadList{})
 	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
+	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
+	SchemeBuilder.Register(&ApplicationContext{}, &ApplicationContextList{})
 }

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

@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -22,57 +21,109 @@ limitations under the License.
 package v1alpha2
 
 import (
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
+	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	standard_oam_devv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppHealthCondition) DeepCopyInto(out *AppHealthCondition) {
+func (in *AppRollout) DeepCopyInto(out *AppRollout) {
 	*out = *in
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]*WorkloadHealthCondition, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(WorkloadHealthCondition)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
+	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 AppHealthCondition.
-func (in *AppHealthCondition) DeepCopy() *AppHealthCondition {
+// 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(AppHealthCondition)
+	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 *AppReference) DeepCopyInto(out *AppReference) {
+func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
 	*out = *in
-	if in.CompReferences != nil {
-		in, out := &in.CompReferences, &out.CompReferences
-		*out = make([]CompReference, len(*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 AppReference.
-func (in *AppReference) DeepCopy() *AppReference {
+// 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(AppReference)
+	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
 }
@@ -83,7 +134,7 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]v1.ObjectReference, len(*in))
+		*out = make([]v1alpha1.TypedReference, len(*in))
 		copy(*out, *in)
 	}
 	if in.Services != nil {
@@ -95,7 +146,7 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	}
 	if in.ResourceTracker != nil {
 		in, out := &in.ResourceTracker, &out.ResourceTracker
-		*out = new(v1.ObjectReference)
+		*out = new(v1alpha1.TypedReference)
 		**out = **in
 	}
 	if in.LatestRevision != nil {
@@ -328,6 +379,80 @@ func (in *ApplicationConfigurationStatus) DeepCopy() *ApplicationConfigurationSt
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationContext) DeepCopyInto(out *ApplicationContext) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContext.
+func (in *ApplicationContext) DeepCopy() *ApplicationContext {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationContext)
+	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 {
+	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 *ApplicationContextList) DeepCopyInto(out *ApplicationContextList) {
+	*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))
+		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 {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationContextList)
+	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 {
+	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 *ApplicationContextSpec) DeepCopyInto(out *ApplicationContextSpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContextSpec.
+func (in *ApplicationContextSpec) DeepCopy() *ApplicationContextSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationContextSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationList) DeepCopyInto(out *ApplicationList) {
 	*out = *in
@@ -482,7 +607,7 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	}
 	if in.RolloutPlan != nil {
 		in, out := &in.RolloutPlan, &out.RolloutPlan
-		*out = new(v1alpha1.RolloutPlan)
+		*out = new(standard_oam_devv1alpha1.RolloutPlan)
 		(*in).DeepCopyInto(*out)
 	}
 }
@@ -500,11 +625,7 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
 	*out = *in
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
+	in.Properties.DeepCopyInto(&out.Properties)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTrait.
@@ -533,27 +654,6 @@ 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 *CompReference) DeepCopyInto(out *CompReference) {
-	*out = *in
-	out.Workload = in.Workload
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]v1.ObjectReference, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CompReference.
-func (in *CompReference) DeepCopy() *CompReference {
-	if in == nil {
-		return nil
-	}
-	out := new(CompReference)
-	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
@@ -1113,6 +1213,118 @@ func (in *ContainerResources) DeepCopy() *ContainerResources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkload) DeepCopyInto(out *ContainerizedWorkload) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkload.
+func (in *ContainerizedWorkload) DeepCopy() *ContainerizedWorkload {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkload)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkload) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadList) DeepCopyInto(out *ContainerizedWorkloadList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ContainerizedWorkload, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadList.
+func (in *ContainerizedWorkloadList) DeepCopy() *ContainerizedWorkloadList {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkloadList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadSpec) DeepCopyInto(out *ContainerizedWorkloadSpec) {
+	*out = *in
+	if in.OperatingSystem != nil {
+		in, out := &in.OperatingSystem, &out.OperatingSystem
+		*out = new(OperatingSystem)
+		**out = **in
+	}
+	if in.CPUArchitecture != nil {
+		in, out := &in.CPUArchitecture, &out.CPUArchitecture
+		*out = new(CPUArchitecture)
+		**out = **in
+	}
+	if in.Containers != nil {
+		in, out := &in.Containers, &out.Containers
+		*out = make([]Container, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadSpec.
+func (in *ContainerizedWorkloadSpec) DeepCopy() *ContainerizedWorkloadSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadStatus) DeepCopyInto(out *ContainerizedWorkloadStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Resources != nil {
+		in, out := &in.Resources, &out.Resources
+		*out = make([]v1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadStatus.
+func (in *ContainerizedWorkloadStatus) DeepCopy() *ContainerizedWorkloadStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataInput) DeepCopyInto(out *DataInput) {
 	*out = *in
@@ -1205,7 +1417,7 @@ func (in *DataOutput) DeepCopy() *DataOutput {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DependencyFromObject) DeepCopyInto(out *DependencyFromObject) {
 	*out = *in
-	out.ObjectReference = in.ObjectReference
+	out.TypedReference = in.TypedReference
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DependencyFromObject.
@@ -1243,7 +1455,7 @@ func (in *DependencyStatus) DeepCopy() *DependencyStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DependencyToObject) DeepCopyInto(out *DependencyToObject) {
 	*out = *in
-	out.ObjectReference = in.ObjectReference
+	out.TypedReference = in.TypedReference
 	if in.FieldPaths != nil {
 		in, out := &in.FieldPaths, &out.FieldPaths
 		*out = make([]string, len(*in))
@@ -1441,16 +1653,9 @@ func (in *HealthScopeSpec) DeepCopyInto(out *HealthScopeSpec) {
 		*out = new(int32)
 		**out = **in
 	}
-	if in.AppRefs != nil {
-		in, out := &in.AppRefs, &out.AppRefs
-		*out = make([]AppReference, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 	if in.WorkloadReferences != nil {
 		in, out := &in.WorkloadReferences, &out.WorkloadReferences
-		*out = make([]v1.ObjectReference, len(*in))
+		*out = make([]v1alpha1.TypedReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -1470,17 +1675,6 @@ func (in *HealthScopeStatus) DeepCopyInto(out *HealthScopeStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
 	out.ScopeHealthCondition = in.ScopeHealthCondition
-	if in.AppHealthConditions != nil {
-		in, out := &in.AppHealthConditions, &out.AppHealthConditions
-		*out = make([]*AppHealthCondition, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(AppHealthCondition)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
 	if in.WorkloadHealthConditions != nil {
 		in, out := &in.WorkloadHealthConditions, &out.WorkloadHealthConditions
 		*out = make([]*WorkloadHealthCondition, len(*in))
@@ -1488,7 +1682,7 @@ func (in *HealthScopeStatus) DeepCopyInto(out *HealthScopeStatus) {
 			if (*in)[i] != nil {
 				in, out := &(*in)[i], &(*out)[i]
 				*out = new(WorkloadHealthCondition)
-				(*in).DeepCopyInto(*out)
+				**out = **in
 			}
 		}
 	}
@@ -1739,7 +1933,7 @@ 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) {
 	*out = *in
-	out.ObjectReference = in.ObjectReference
+	out.TypedReference = in.TypedReference
 	if in.Operations != nil {
 		in, out := &in.Operations, &out.Operations
 		*out = make([]DataOperation, len(*in))
@@ -1895,21 +2089,6 @@ func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TraitHealthCondition) DeepCopyInto(out *TraitHealthCondition) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitHealthCondition.
-func (in *TraitHealthCondition) DeepCopy() *TraitHealthCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(TraitHealthCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *UnstaifiedDependency) DeepCopyInto(out *UnstaifiedDependency) {
 	*out = *in
@@ -2089,17 +2268,6 @@ func (in *WorkloadDefinitionStatus) DeepCopy() *WorkloadDefinitionStatus {
 func (in *WorkloadHealthCondition) DeepCopyInto(out *WorkloadHealthCondition) {
 	*out = *in
 	out.TargetWorkload = in.TargetWorkload
-	if in.Traits != nil {
-		in, out := &in.Traits, &out.Traits
-		*out = make([]*TraitHealthCondition, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(TraitHealthCondition)
-				**out = **in
-			}
-		}
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadHealthCondition.

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

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

@@ -17,71 +17,49 @@
 package v1beta1
 
 import (
-	"encoding/json"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
-const (
-	// TypeHealthy application are believed to be determined as healthy by a health scope.
-	TypeHealthy condition.ConditionType = "Healthy"
-)
-
-// Reasons an application is or is not healthy
-const (
-	ReasonHealthy        condition.ConditionReason = "AllComponentsHealthy"
-	ReasonUnhealthy      condition.ConditionReason = "UnhealthyOrUnknownComponents"
-	ReasonHealthCheckErr condition.ConditionReason = "HealthCheckeError"
-)
-
-// AppPolicy defines a global policy for all components in the app.
-type AppPolicy struct {
-	// Name is the unique name of the policy.
-	Name string `json:"name"`
+// 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"`
+	Properties runtime.RawExtension `json:"properties,omitempty"`
 }
 
-// WorkflowStep defines how to execute a workflow step.
-type WorkflowStep common.WorkflowStep
+// 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"`
 
-// Workflow defines workflow steps and other attributes
-type Workflow struct {
-	Ref   string               `json:"ref,omitempty"`
-	Mode  *WorkflowExecuteMode `json:"mode,omitempty"`
-	Steps []WorkflowStep       `json:"steps,omitempty"`
-}
+	// Traits define the trait of one component, the type must be array to keep the order.
+	Traits []ApplicationTrait `json:"traits,omitempty"`
 
-// WorkflowExecuteMode defines the mode of workflow execution
-type WorkflowExecuteMode struct {
-	Steps    common.WorkflowMode `json:"steps,omitempty"`
-	SubSteps common.WorkflowMode `json:"subSteps,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"`
 }
 
 // ApplicationSpec is the spec of Application
 type ApplicationSpec struct {
-	Components []common.ApplicationComponent `json:"components"`
-
-	// Policies defines the global policies for all components in the app, e.g. security, metrics, gitops,
-	// multi-cluster placement rules, etc.
-	// Policies are applied after components are rendered and before workflow steps are executed.
-	Policies []AppPolicy `json:"policies,omitempty"`
-
-	// Workflow defines how to customize the control logic.
-	// If workflow is specified, Vela won't apply any resource, but provide rendered output in AppRevision.
-	// Workflow steps are executed in array order, and each step:
-	// - will have a context in annotation.
-	// - should mark "finish" phase in status.conditions.
-	Workflow *Workflow `json:"workflow,omitempty"`
+	Components []ApplicationComponent `json:"components"`
 
 	// TODO(wonderflow): we should have application level scopes supported here
+
+	// RolloutPlan is the details on how to rollout the resources
+	// The controller simply replace the old resources with the new one if there is no rollout plan involved
+	// +optional
+	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -89,15 +67,13 @@ type ApplicationSpec struct {
 // Application is the Schema for the applications API
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={oam},shortName={app,velaapp}
+// +kubebuilder:resource:categories={oam},shortName=app
 // +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
 // +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
 // +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
 // +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
 // +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -109,25 +85,14 @@ type Application struct {
 // +kubebuilder:object:root=true
 
 // ApplicationList contains a list of Application
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Application `json:"items"`
 }
 
-// SetConditions set condition to application
-func (app *Application) SetConditions(c ...condition.Condition) {
-	app.Status.SetConditions(c...)
-}
-
-// GetCondition get condition by given condition type
-func (app *Application) GetCondition(t condition.ConditionType) condition.Condition {
-	return app.Status.GetCondition(t)
-}
-
 // GetComponent get the component from the application based on its workload type
-func (app *Application) GetComponent(workloadType string) *common.ApplicationComponent {
+func (app *Application) GetComponent(workloadType string) *ApplicationComponent {
 	for _, c := range app.Spec.Components {
 		if c.Type == workloadType {
 			return &c
@@ -135,36 +100,3 @@ func (app *Application) GetComponent(workloadType string) *common.ApplicationCom
 	}
 	return nil
 }
-
-// Unstructured convert application to unstructured.Unstructured.
-func (app *Application) Unstructured() (*unstructured.Unstructured, error) {
-	var obj = &unstructured.Unstructured{}
-	app.SetGroupVersionKind(ApplicationKindVersionKind)
-	bt, err := json.Marshal(app)
-	if err != nil {
-		return nil, err
-	}
-	if err := obj.UnmarshalJSON(bt); err != nil {
-		return nil, err
-	}
-
-	if app.Status.Services == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "services"); err != nil {
-			return nil, err
-		}
-	}
-
-	if app.Status.AppliedResources == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "appliedResources"); err != nil {
-			return nil, err
-		}
-	}
-
-	if wfStatus := app.Status.Workflow; wfStatus != nil && wfStatus.Steps == nil {
-		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "workflow", "steps"); err != nil {
-			return nil, err
-		}
-	}
-
-	return obj, nil
-}

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

@@ -18,9 +18,9 @@ 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/core.oam.dev/v1alpha1"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -42,32 +42,14 @@ type ApplicationRevisionSpec struct {
 	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
 	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
 
-	// PolicyDefinitions records the snapshot of the PolicyDefinitions related with the created/modified Application
-	PolicyDefinitions map[string]PolicyDefinition `json:"policyDefinitions,omitempty"`
+	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
+	Components []common.RawComponent `json:"components,omitempty"`
 
-	// WorkflowStepDefinitions records the snapshot of the WorkflowStepDefinitions related with the created/modified Application
-	WorkflowStepDefinitions map[string]WorkflowStepDefinition `json:"workflowStepDefinitions,omitempty"`
-
-	// ScopeGVK records the apiVersion to GVK mapping
-	ScopeGVK map[string]metav1.GroupVersionKind `json:"scopeGVK,omitempty"`
-
-	// Policies records the external policies
-	Policies map[string]v1alpha1.Policy `json:"policies,omitempty"`
-
-	// Workflow records the external workflow
-	Workflow *v1alpha1.Workflow `json:"workflow,omitempty"`
-
-	// ReferredObjects records the referred objects used in the ref-object typed components
+	// 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
-	ReferredObjects []common.ReferredObject `json:"referredObjects,omitempty"`
-}
-
-// ApplicationRevisionStatus is the status of ApplicationRevision
-type ApplicationRevisionStatus struct {
-	// Succeeded records if the workflow finished running with success
-	Succeeded bool `json:"succeeded"`
-	// Workflow the running status of the workflow
-	Workflow *common.WorkflowStatus `json:"workflow,omitempty"`
+	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
 }
 
 // +kubebuilder:object:root=true
@@ -75,24 +57,17 @@ type ApplicationRevisionStatus struct {
 // ApplicationRevision is the Schema for the ApplicationRevision API
 // +kubebuilder:storageversion
 // +kubebuilder:resource:categories={oam},shortName=apprev
-// +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-// +kubebuilder:printcolumn:name="PUBLISH_VERSION",type=string,JSONPath=`.metadata.annotations['app\.oam\.dev\/publishVersion']`
-// +kubebuilder:printcolumn:name="SUCCEEDED",type=string,JSONPath=`.status.succeeded`
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ApplicationRevisionSpec   `json:"spec,omitempty"`
-	Status ApplicationRevisionStatus `json:"status,omitempty"`
+	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
 // ApplicationRevisionList contains a list of ApplicationRevision
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationRevisionList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

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

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

@@ -17,11 +17,10 @@
 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/condition"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
@@ -60,7 +59,7 @@ type ComponentDefinitionSpec struct {
 // ComponentDefinitionStatus is the status of ComponentDefinition
 type ComponentDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
+	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
@@ -76,8 +75,6 @@ type ComponentDefinitionStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -86,18 +83,17 @@ type ComponentDefinition struct {
 	Status ComponentDefinitionStatus `json:"status,omitempty"`
 }
 
-// SetConditions set condition for ComponentDefinition
-func (cd *ComponentDefinition) SetConditions(c ...condition.Condition) {
+// SetConditions set condition for WorkloadDefinition
+func (cd *ComponentDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	cd.Status.SetConditions(c...)
 }
 
-// GetCondition gets condition from ComponentDefinition
-func (cd *ComponentDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+// GetCondition gets condition from WorkloadDefinition
+func (cd *ComponentDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return cd.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ComponentDefinitionList contains a list of ComponentDefinition
 type ComponentDefinitionList struct {

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

@@ -17,10 +17,10 @@
 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/condition"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
@@ -59,7 +59,7 @@ type WorkloadDefinitionSpec struct {
 
 // WorkloadDefinitionStatus is the status of WorkloadDefinition
 type WorkloadDefinitionStatus struct {
-	condition.ConditionedStatus `json:",inline"`
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
 }
 
 // +kubebuilder:object:root=true
@@ -72,8 +72,6 @@ type WorkloadDefinitionStatus struct {
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -83,19 +81,18 @@ type WorkloadDefinition struct {
 }
 
 // SetConditions set condition for WorkloadDefinition
-func (wd *WorkloadDefinition) SetConditions(c ...condition.Condition) {
+func (wd *WorkloadDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	wd.Status.SetConditions(c...)
 }
 
 // GetCondition gets condition from WorkloadDefinition
-func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+func (wd *WorkloadDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return wd.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
 
 // WorkloadDefinitionList contains a list of WorkloadDefinition.
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type WorkloadDefinitionList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
@@ -120,7 +117,7 @@ type TraitDefinitionSpec struct {
 	PodDisruptive bool `json:"podDisruptive,omitempty"`
 
 	// AppliesToWorkloads specifies the list of workload kinds this trait
-	// applies to. Workload kinds are specified in resource.group/version format,
+	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
 	// all workload kinds.
 	// +optional
@@ -150,22 +147,12 @@ type TraitDefinitionSpec struct {
 	// +optional
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
-
-	// ManageWorkload defines the trait would be responsible for creating the workload
-	// +optional
-	ManageWorkload bool `json:"manageWorkload,omitempty"`
-	// SkipRevisionAffect defines the update this trait will not generate a new application Revision
-	// +optional
-	SkipRevisionAffect bool `json:"skipRevisionAffect,omitempty"`
-	// ControlPlaneOnly defines which cluster is dispatched to
-	// +optional
-	ControlPlaneOnly bool `json:"controlPlaneOnly,omitempty"`
 }
 
 // TraitDefinitionStatus is the status of TraitDefinition
 type TraitDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
+	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
@@ -184,8 +171,6 @@ type TraitDefinitionStatus struct {
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -195,17 +180,16 @@ type TraitDefinition struct {
 }
 
 // SetConditions set condition for TraitDefinition
-func (td *TraitDefinition) SetConditions(c ...condition.Condition) {
+func (td *TraitDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
 	td.Status.SetConditions(c...)
 }
 
 // GetCondition gets condition from TraitDefinition
-func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
+func (td *TraitDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return td.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // TraitDefinitionList contains a list of TraitDefinition.
 type TraitDefinitionList struct {
@@ -241,8 +225,6 @@ type ScopeDefinitionSpec struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
 // +kubebuilder:storageversion
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -251,7 +233,6 @@ type ScopeDefinition struct {
 }
 
 // +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ScopeDefinitionList contains a list of ScopeDefinition.
 type ScopeDefinitionList struct {
@@ -259,3 +240,50 @@ type ScopeDefinitionList struct {
 	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

@@ -38,23 +38,15 @@ type DefinitionRevisionSpec struct {
 
 	// TraitDefinition records the snapshot of the created/modified TraitDefinition
 	TraitDefinition TraitDefinition `json:"traitDefinition,omitempty"`
-
-	// PolicyDefinition records the snapshot of the created/modified PolicyDefinition
-	PolicyDefinition PolicyDefinition `json:"policyDefinition,omitempty"`
-
-	// WorkflowStepDefinition records the snapshot of the created/modified WorkflowStepDefinition
-	WorkflowStepDefinition WorkflowStepDefinition `json:"workflowStepDefinition,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
 // DefinitionRevision is the Schema for the DefinitionRevision API
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=defrev
+// +kubebuilder: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"
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type DefinitionRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -63,7 +55,6 @@ type DefinitionRevision struct {
 }
 
 // +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // DefinitionRevisionList contains a list of DefinitionRevision
 type DefinitionRevisionList struct {

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

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

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

@@ -21,13 +21,11 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Package type metadata.
 const (
-	Group   = common.Group
+	Group   = "core.oam.dev"
 	Version = "v1beta1"
 )
 
@@ -37,9 +35,6 @@ var (
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
-	// AddToScheme is a global function that registers this API group & version to a scheme
-	AddToScheme = SchemeBuilder.AddToScheme
 )
 
 // ComponentDefinition type metadata.
@@ -66,22 +61,6 @@ var (
 	TraitDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(TraitDefinitionKind)
 )
 
-// PolicyDefinition type metadata.
-var (
-	PolicyDefinitionKind             = reflect.TypeOf(PolicyDefinition{}).Name()
-	PolicyDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: PolicyDefinitionKind}.String()
-	PolicyDefinitionKindAPIVersion   = PolicyDefinitionKind + "." + SchemeGroupVersion.String()
-	PolicyDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(PolicyDefinitionKind)
-)
-
-// WorkflowStepDefinition type metadata.
-var (
-	WorkflowStepDefinitionKind             = reflect.TypeOf(WorkflowStepDefinition{}).Name()
-	WorkflowStepDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkflowStepDefinitionKind}.String()
-	WorkflowStepDefinitionKindAPIVersion   = WorkflowStepDefinitionKind + "." + SchemeGroupVersion.String()
-	WorkflowStepDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkflowStepDefinitionKind)
-)
-
 // DefinitionRevision type metadata.
 var (
 	DefinitionRevisionKind             = reflect.TypeOf(DefinitionRevision{}).Name()
@@ -98,6 +77,14 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
+// AppRollout type metadata.
+var (
+	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
+	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
+	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
+)
+
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -122,20 +109,32 @@ var (
 	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
 )
 
+// AppDeployment type metadata.
+var (
+	AppDeploymentKind            = reflect.TypeOf(AppDeployment{}).Name()
+	AppDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: AppDeploymentKind}.String()
+	AppDeploymentKindAPIVersion  = AppDeploymentKind + "." + SchemeGroupVersion.String()
+	AppDeploymentKindVersionKind = SchemeGroupVersion.WithKind(AppDeploymentKind)
+)
+
+// Cluster type metadata.
+var (
+	ClusterKind            = reflect.TypeOf(Cluster{}).Name()
+	ClusterGroupKind       = schema.GroupKind{Group: Group, Kind: ClusterKind}.String()
+	ClusterKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	ClusterKindVersionKind = SchemeGroupVersion.WithKind(ClusterKind)
+)
+
 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{})
 }
-
-// Resource takes an unqualified resource and returns a Group qualified GroupResource
-func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
-}

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

@@ -1,300 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"encoding/json"
-	"reflect"
-	"strings"
-
-	errors2 "github.com/pkg/errors"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/interfaces"
-	velatypes "github.com/oam-dev/kubevela/apis/types"
-	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/errors"
-)
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.type`
-// +kubebuilder:printcolumn:name="APP",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/name']`
-// +kubebuilder:printcolumn:name="APP-NS",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/namespace']`
-// +kubebuilder:printcolumn:name="APP-GEN",type=number,JSONPath=`.spec.applicationGeneration`
-// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=rt
-type ResourceTracker struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ResourceTrackerSpec   `json:"spec,omitempty"`
-	Status ResourceTrackerStatus `json:"status,omitempty"`
-}
-
-// ResourceTrackerType defines the type of resourceTracker
-type ResourceTrackerType string
-
-const (
-	// ResourceTrackerTypeRoot means resources in this resourceTracker will only be recycled when application is deleted
-	ResourceTrackerTypeRoot = ResourceTrackerType("root")
-	// ResourceTrackerTypeVersioned means resources in this resourceTracker will be recycled when this version is unused and this resource is not managed by latest RT
-	ResourceTrackerTypeVersioned = ResourceTrackerType("versioned")
-	// ResourceTrackerTypeComponentRevision stores all component revisions used
-	ResourceTrackerTypeComponentRevision = ResourceTrackerType("component-revision")
-)
-
-// ResourceTrackerSpec define the spec of resourceTracker
-type ResourceTrackerSpec struct {
-	Type                  ResourceTrackerType `json:"type,omitempty"`
-	ApplicationGeneration int64               `json:"applicationGeneration"`
-	ManagedResources      []ManagedResource   `json:"managedResources,omitempty"`
-}
-
-// ManagedResource define the resource to be managed by ResourceTracker
-type ManagedResource struct {
-	common.ClusterObjectReference `json:",inline"`
-	common.OAMObjectReference     `json:",inline"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Data *runtime.RawExtension `json:"raw,omitempty"`
-	// Deleted marks the resource to be deleted
-	Deleted bool `json:"deleted,omitempty"`
-	// SkipGC marks the resource to skip gc
-	SkipGC bool `json:"skipGC,omitempty"`
-}
-
-// Equal check if two managed resource equals
-func (in ManagedResource) Equal(r ManagedResource) bool {
-	if !in.ClusterObjectReference.Equal(r.ClusterObjectReference) {
-		return false
-	}
-	if !in.OAMObjectReference.Equal(r.OAMObjectReference) {
-		return false
-	}
-	return reflect.DeepEqual(in.Data, r.Data)
-}
-
-// DisplayName readable name for locating resource
-func (in ManagedResource) DisplayName() string {
-	s := in.Kind + " " + in.Name
-	if in.Namespace != "" || in.Cluster != "" {
-		s += " ("
-		if in.Cluster != "" {
-			s += "Cluster: " + in.Cluster
-			if in.Namespace != "" {
-				s += ", "
-			}
-		}
-		if in.Namespace != "" {
-			s += "Namespace: " + in.Namespace
-		}
-		s += ")"
-	}
-	return s
-}
-
-// NamespacedName namespacedName
-func (in ManagedResource) NamespacedName() types.NamespacedName {
-	return types.NamespacedName{Namespace: in.Namespace, Name: in.Name}
-}
-
-// ResourceKey computes the key for managed resource, resources with the same key points to the same resource
-func (in ManagedResource) ResourceKey() string {
-	group := in.GroupVersionKind().Group
-	kind := in.GroupVersionKind().Kind
-	cluster := in.Cluster
-	if cluster == "" {
-		cluster = velatypes.ClusterLocalName
-	}
-	return strings.Join([]string{group, kind, cluster, in.Namespace, in.Name}, "/")
-}
-
-// ComponentKey computes the key for the component which managed resource belongs to
-func (in ManagedResource) ComponentKey() string {
-	return strings.Join([]string{in.Env, in.Component}, "/")
-}
-
-// UnmarshalTo unmarshal ManagedResource into target object
-func (in ManagedResource) UnmarshalTo(obj interface{}) error {
-	if in.Data == nil || in.Data.Raw == nil {
-		return errors.ManagedResourceHasNoDataError{}
-	}
-	return json.Unmarshal(in.Data.Raw, obj)
-}
-
-// ToUnstructured converts managed resource into unstructured
-func (in ManagedResource) ToUnstructured() *unstructured.Unstructured {
-	obj := &unstructured.Unstructured{}
-	obj.SetGroupVersionKind(in.GroupVersionKind())
-	obj.SetName(in.Name)
-	if in.Namespace != "" {
-		obj.SetNamespace(in.Namespace)
-	}
-	oam.SetCluster(obj, in.Cluster)
-	return obj
-}
-
-// ToUnstructuredWithData converts managed resource into unstructured and unmarshal data
-func (in ManagedResource) ToUnstructuredWithData() (*unstructured.Unstructured, error) {
-	obj := in.ToUnstructured()
-	if err := in.UnmarshalTo(obj); err != nil {
-		if errors2.Is(err, errors.ManagedResourceHasNoDataError{}) {
-			return nil, err
-		}
-	}
-	return obj, nil
-}
-
-// ResourceTrackerStatus define the status of resourceTracker
-// For backward-compatibility
-type ResourceTrackerStatus struct {
-	// Deprecated
-	TrackedResources []common.ClusterObjectReference `json:"trackedResources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ResourceTrackerList contains a list of ResourceTracker
-type ResourceTrackerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ResourceTracker `json:"items"`
-}
-
-func (in *ResourceTracker) findMangedResourceIndex(mr ManagedResource) int {
-	for i, _mr := range in.Spec.ManagedResources {
-		if mr.ClusterObjectReference.Equal(_mr.ClusterObjectReference) {
-			return i
-		}
-	}
-	return -1
-}
-
-func newManagedResourceFromResource(rsc client.Object) ManagedResource {
-	gvk := rsc.GetObjectKind().GroupVersionKind()
-	return ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
-				APIVersion: gvk.GroupVersion().String(),
-				Kind:       gvk.Kind,
-				Name:       rsc.GetName(),
-				Namespace:  rsc.GetNamespace(),
-			},
-			Cluster: oam.GetCluster(rsc),
-		},
-		OAMObjectReference: common.NewOAMObjectReferenceFromObject(rsc),
-		Deleted:            false,
-	}
-}
-
-// ContainsManagedResource check if resource exists in ResourceTracker
-func (in *ResourceTracker) ContainsManagedResource(rsc client.Object) bool {
-	mr := newManagedResourceFromResource(rsc)
-	return in.findMangedResourceIndex(mr) >= 0
-}
-
-// AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, skipGC bool, creator common.ResourceCreatorRole) (updated bool) {
-	mr := newManagedResourceFromResource(rsc)
-	mr.SkipGC = skipGC
-	if !metaOnly {
-		mr.Data = &runtime.RawExtension{Object: rsc}
-	}
-	if creator != "" {
-		mr.ClusterObjectReference.Creator = creator
-	}
-	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
-		if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
-			return false
-		}
-		in.Spec.ManagedResources[idx] = mr
-	} else {
-		in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
-	}
-	return true
-}
-
-// DeleteManagedResource if remove flag is on, it will remove the object from recorded resources.
-// otherwise, it will mark the object as deleted instead of removing it
-// workflow   stage: resources are marked as deleted (and execute the deletion action)
-// state-keep stage: resources marked as deleted and successfully deleted will be removed from resourcetracker
-func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool) (updated bool) {
-	gvk := rsc.GetObjectKind().GroupVersionKind()
-	mr := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			ObjectReference: v1.ObjectReference{
-				APIVersion: gvk.GroupVersion().String(),
-				Kind:       gvk.Kind,
-				Name:       rsc.GetName(),
-				Namespace:  rsc.GetNamespace(),
-			},
-			Cluster: oam.GetCluster(rsc),
-		},
-		Deleted: true,
-	}
-	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
-		if remove {
-			in.Spec.ManagedResources = append(in.Spec.ManagedResources[:idx], in.Spec.ManagedResources[idx+1:]...)
-		} else {
-			if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
-				return false
-			}
-			in.Spec.ManagedResources[idx] = mr
-		}
-	} else {
-		if !remove {
-			in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
-		}
-	}
-	return true
-}
-
-// addClusterObjectReference
-// Deprecated
-func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectReference) bool {
-	for _, _rsc := range in.Status.TrackedResources {
-		if _rsc.Equal(ref) {
-			return true
-		}
-	}
-	in.Status.TrackedResources = append(in.Status.TrackedResources, ref)
-	return false
-}
-
-// AddTrackedResource add new object reference into tracked resources, return if already exists
-// Deprecated
-func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
-	return in.addClusterObjectReference(common.ClusterObjectReference{
-		ObjectReference: v1.ObjectReference{
-			APIVersion: rsc.GetAPIVersion(),
-			Kind:       rsc.GetKind(),
-			Name:       rsc.GetName(),
-			Namespace:  rsc.GetNamespace(),
-			UID:        rsc.GetUID(),
-		},
-	})
-}

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

@@ -1,184 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	v12 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/pointer"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/pkg/oam"
-	"github.com/oam-dev/kubevela/pkg/utils/errors"
-)
-
-func TestManagedResource_DeepCopyEqual(t *testing.T) {
-	r := require.New(t)
-	mr := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-		OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-		Data:                   &runtime.RawExtension{Raw: []byte("data")},
-	}
-	r.True(mr.Equal(*mr.DeepCopy()))
-}
-
-func TestManagedResource_Equal(t *testing.T) {
-	testCases := map[string]struct {
-		input1 ManagedResource
-		input2 ManagedResource
-		equal  bool
-	}{
-		"equal": {
-			input1: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-				Data:                   &runtime.RawExtension{Raw: []byte("data")},
-			},
-			input2: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
-				Data:                   &runtime.RawExtension{Raw: []byte("data")},
-			},
-			equal: true,
-		},
-		"ClusterObjectReference not equal": {
-			input1: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
-			},
-			input2: ManagedResource{
-				ClusterObjectReference: common.ClusterObjectReference{Cluster: "c"},
-			},
-			equal: false,
-		},
-		"OAMObjectReference not equal": {
-			input1: ManagedResource{
-				OAMObjectReference: common.OAMObjectReference{Component: "component"},
-			},
-			input2: ManagedResource{
-				OAMObjectReference: common.OAMObjectReference{Component: "c"},
-			},
-			equal: false,
-		},
-		"Data content not equal": {
-			input1: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("data")},
-			},
-			input2: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("d")},
-			},
-			equal: false,
-		},
-		"one data empty, one data not empty": {
-			input1: ManagedResource{Data: nil},
-			input2: ManagedResource{
-				Data: &runtime.RawExtension{Raw: []byte("d")},
-			},
-			equal: false,
-		},
-	}
-	for name, tc := range testCases {
-		t.Run(name, func(t *testing.T) {
-			r := require.New(t)
-			r.Equal(tc.equal, tc.input1.Equal(tc.input2))
-			r.Equal(tc.equal, tc.input2.Equal(tc.input1))
-		})
-	}
-}
-
-func TestManagedResourceKeys(t *testing.T) {
-	r := require.New(t)
-	input := ManagedResource{
-		ClusterObjectReference: common.ClusterObjectReference{
-			Cluster: "cluster",
-			ObjectReference: v1.ObjectReference{
-				Namespace:  "namespace",
-				Name:       "name",
-				APIVersion: v12.SchemeGroupVersion.String(),
-				Kind:       "Deployment",
-			},
-		},
-		OAMObjectReference: common.OAMObjectReference{
-			Env:       "env",
-			Component: "component",
-			Trait:     "trait",
-		},
-	}
-	r.Equal("namespace/name", input.NamespacedName().String())
-	r.Equal("apps/Deployment/cluster/namespace/name", input.ResourceKey())
-	r.Equal("env/component", input.ComponentKey())
-	r.Equal("Deployment name (Cluster: cluster, Namespace: namespace)", input.DisplayName())
-	var deploy1, deploy2 v12.Deployment
-	deploy1.Spec.Replicas = pointer.Int32(5)
-	bs, err := json.Marshal(deploy1)
-	r.NoError(err)
-	r.ErrorIs(input.UnmarshalTo(&deploy2), errors.ManagedResourceHasNoDataError{})
-	_, err = input.ToUnstructuredWithData()
-	r.ErrorIs(err, errors.ManagedResourceHasNoDataError{})
-	input.Data = &runtime.RawExtension{Raw: bs}
-	r.NoError(input.UnmarshalTo(&deploy2))
-	r.Equal(deploy1, deploy2)
-	obj := input.ToUnstructured()
-	r.Equal("Deployment", obj.GetKind())
-	r.Equal("apps/v1", obj.GetAPIVersion())
-	r.Equal("name", obj.GetName())
-	r.Equal("namespace", obj.GetNamespace())
-	r.Equal("cluster", oam.GetCluster(obj))
-	obj, err = input.ToUnstructuredWithData()
-	r.NoError(err)
-	val, correct, err := unstructured.NestedInt64(obj.Object, "spec", "replicas")
-	r.NoError(err)
-	r.True(correct)
-	r.Equal(int64(5), val)
-}
-
-func TestResourceTracker_ManagedResource(t *testing.T) {
-	r := require.New(t)
-	input := &ResourceTracker{}
-	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true, false, "")
-	r.Equal(1, len(input.Spec.ManagedResources))
-	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false, false, "")
-	r.Equal(2, len(input.Spec.ManagedResources))
-	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false, false, "")
-	r.Equal(3, len(input.Spec.ManagedResources))
-	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false, false, "")
-	r.Equal(3, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&cm2, false)
-	r.Equal(3, len(input.Spec.ManagedResources))
-	r.True(input.Spec.ManagedResources[1].Deleted)
-	input.DeleteManagedResource(&cm2, true)
-	r.Equal(2, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&deploy1, true)
-	r.Equal(1, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&pod3, true)
-	r.Equal(0, len(input.Spec.ManagedResources))
-	secret4 := v1.Secret{ObjectMeta: v13.ObjectMeta{Name: "secret4"}}
-	input.DeleteManagedResource(&secret4, true)
-	r.Equal(0, len(input.Spec.ManagedResources))
-	input.DeleteManagedResource(&secret4, false)
-	r.Equal(1, len(input.Spec.ManagedResources))
-}

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

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

apis/generate.go

@@ -1,4 +1,3 @@
-//go:build generate
 // +build generate
 
 /*
@@ -23,12 +22,14 @@ limitations under the License.
 // 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,generateEmbeddedObjectMeta=true 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=../config/crd/base
 
 // Generate legacy_support for K8s 1.12~1.15 versions CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:generateEmbeddedObjectMeta=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd output:artifacts:config=../legacy/charts/vela-core-legacy/crds
 //go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
 
+//go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml
+
 package apis
 
 import (

apis/interfaces/resourcetracker.go

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

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

@@ -0,0 +1,85 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	cpv1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
+)
+
+// PodSpecWorkloadSpec defines the desired state of PodSpecWorkload
+type PodSpecWorkloadSpec struct {
+	// Replicas is the desired number of replicas of the given podSpec.
+	// These are replicas in the sense that they are instantiations of the same podSpec.
+	// If unspecified, defaults to 1.
+	Replicas *int32 `json:"replicas,omitempty"`
+
+	// PodSpec describes the pods that will be created,
+	// we omit the meta part as it will be exactly the same as the PodSpecWorkload
+	PodSpec v1.PodSpec `json:"podSpec"`
+}
+
+// PodSpecWorkloadStatus defines the observed state of PodSpecWorkload
+type PodSpecWorkloadStatus struct {
+	cpv1alpha1.ConditionedStatus `json:",inline"`
+
+	// Resources managed by this workload.
+	Resources []cpv1alpha1.TypedReference `json:"resources,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// PodSpecWorkload is the Schema for the PodSpec API
+// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
+// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type PodSpecWorkload struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   PodSpecWorkloadSpec   `json:"spec,omitempty"`
+	Status PodSpecWorkloadStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// PodSpecWorkloadList contains a list of PodSpecWorkload
+type PodSpecWorkloadList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []PodSpecWorkload `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&PodSpecWorkload{}, &PodSpecWorkloadList{})
+}
+
+var _ oam.Workload = &PodSpecWorkload{}
+
+// SetConditions set condition for this CR
+func (in *PodSpecWorkload) SetConditions(c ...cpv1alpha1.Condition) {
+	in.Status.SetConditions(c...)
+}
+
+// GetCondition set condition for this CR
+func (in *PodSpecWorkload) GetCondition(c cpv1alpha1.ConditionType) cpv1alpha1.Condition {
+	return in.Status.GetCondition(c)
+}

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

@@ -17,10 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
 // RolloutStrategyType defines strategies for pods rollout
@@ -230,7 +228,7 @@ type CanaryMetric struct {
 
 	// TemplateRef references a metric template object
 	// +optional
-	TemplateRef *corev1.ObjectReference `json:"templateRef,omitempty"`
+	TemplateRef *runtimev1alpha1.TypedReference `json:"templateRef,omitempty"`
 }
 
 // MetricsExpectedRange defines the range used for metrics validation
@@ -247,7 +245,7 @@ type MetricsExpectedRange struct {
 // RolloutStatus defines the observed state of a rollout plan
 type RolloutStatus struct {
 	// Conditions represents the latest available observations of a CloneSet's current state.
-	condition.ConditionedStatus `json:",inline"`
+	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

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

@@ -20,8 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
@@ -82,40 +81,40 @@ const (
 // These are valid conditions of the rollout.
 const (
 	// RolloutSpecVerifying indicates that the rollout just started with verification
-	RolloutSpecVerifying condition.ConditionType = "RolloutSpecVerifying"
+	RolloutSpecVerifying runtimev1alpha1.ConditionType = "RolloutSpecVerifying"
 	// RolloutInitializing means we start to initialize the cluster
-	RolloutInitializing condition.ConditionType = "RolloutInitializing"
+	RolloutInitializing runtimev1alpha1.ConditionType = "RolloutInitializing"
 	// RolloutInProgress means we are upgrading resources.
-	RolloutInProgress condition.ConditionType = "RolloutInProgress"
+	RolloutInProgress runtimev1alpha1.ConditionType = "RolloutInProgress"
 	// RolloutFinalizing means the rollout is finalizing
-	RolloutFinalizing condition.ConditionType = "RolloutFinalizing"
+	RolloutFinalizing runtimev1alpha1.ConditionType = "RolloutFinalizing"
 	// RolloutFailing means the rollout is failing
-	RolloutFailing condition.ConditionType = "RolloutFailing"
+	RolloutFailing runtimev1alpha1.ConditionType = "RolloutFailing"
 	// RolloutAbandoning means that the rollout is being abandoned.
-	RolloutAbandoning condition.ConditionType = "RolloutAbandoning"
+	RolloutAbandoning runtimev1alpha1.ConditionType = "RolloutAbandoning"
 	// RolloutDeleting means that the rollout is being deleted.
-	RolloutDeleting condition.ConditionType = "RolloutDeleting"
+	RolloutDeleting runtimev1alpha1.ConditionType = "RolloutDeleting"
 	// RolloutFailed means that the rollout failed.
-	RolloutFailed condition.ConditionType = "RolloutFailed"
+	RolloutFailed runtimev1alpha1.ConditionType = "RolloutFailed"
 	// RolloutSucceed means that the rollout is done.
-	RolloutSucceed condition.ConditionType = "RolloutSucceed"
+	RolloutSucceed runtimev1alpha1.ConditionType = "RolloutSucceed"
 	// BatchInitializing
-	BatchInitializing condition.ConditionType = "BatchInitializing"
+	BatchInitializing runtimev1alpha1.ConditionType = "BatchInitializing"
 	// BatchPaused
-	BatchPaused condition.ConditionType = "BatchPaused"
+	BatchPaused runtimev1alpha1.ConditionType = "BatchPaused"
 	// BatchVerifying
-	BatchVerifying condition.ConditionType = "BatchVerifying"
+	BatchVerifying runtimev1alpha1.ConditionType = "BatchVerifying"
 	// BatchRolloutFailed
-	BatchRolloutFailed condition.ConditionType = "BatchRolloutFailed"
+	BatchRolloutFailed runtimev1alpha1.ConditionType = "BatchRolloutFailed"
 	// BatchFinalizing
-	BatchFinalizing condition.ConditionType = "BatchFinalizing"
+	BatchFinalizing runtimev1alpha1.ConditionType = "BatchFinalizing"
 	// BatchReady
-	BatchReady condition.ConditionType = "BatchReady"
+	BatchReady runtimev1alpha1.ConditionType = "BatchReady"
 )
 
 // NewPositiveCondition creates a positive condition type
-func NewPositiveCondition(condType condition.ConditionType) condition.Condition {
-	return condition.Condition{
+func NewPositiveCondition(condType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+	return runtimev1alpha1.Condition{
 		Type:               condType,
 		Status:             v1.ConditionTrue,
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -123,8 +122,8 @@ func NewPositiveCondition(condType condition.ConditionType) condition.Condition
 }
 
 // NewNegativeCondition creates a false condition type
-func NewNegativeCondition(condType condition.ConditionType, message string) condition.Condition {
-	return condition.Condition{
+func NewNegativeCondition(condType runtimev1alpha1.ConditionType, message string) runtimev1alpha1.Condition {
+	return runtimev1alpha1.Condition{
 		Type:               condType,
 		Status:             v1.ConditionFalse,
 		LastTransitionTime: metav1.NewTime(time.Now()),
@@ -136,7 +135,7 @@ const invalidRollingStateTransition = "the rollout state transition from `%s` st
 
 const invalidBatchRollingStateTransition = "the batch rolling state transition from `%s` state  with `%s` is invalid"
 
-func (r *RolloutStatus) getRolloutConditionType() condition.ConditionType {
+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:
@@ -221,7 +220,7 @@ func (r *RolloutStatus) ResetStatus() {
 
 // SetRolloutCondition sets the supplied condition, replacing any existing condition
 // of the same type unless they are identical.
-func (r *RolloutStatus) SetRolloutCondition(new condition.Condition) {
+func (r *RolloutStatus) SetRolloutCondition(new runtimev1alpha1.Condition) {
 	exists := false
 	for i, existing := range r.Conditions {
 		if existing.Type != new.Type {

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

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

@@ -0,0 +1,88 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
+)
+
+// RolloutTraitSpec defines the desired state of RolloutTrait
+type RolloutTraitSpec struct {
+	// TargetRef references a target resource that contains the newer version
+	// of the software. We assumed that new resource already exists.
+	// This is the only resource we work on if the resource is a stateful resource (cloneset/statefulset)
+	TargetRef runtimev1alpha1.TypedReference `json:"targetRef"`
+
+	// SourceRef references the list of resources that contains the older version
+	// of the software. We assume that it's the first time to deploy when we cannot find any source.
+	// +optional
+	SourceRef []runtimev1alpha1.TypedReference `json:"sourceRef,omitempty"`
+
+	// RolloutPlan is the details on how to rollout the resources
+	RolloutPlan RolloutPlan `json:"rolloutPlan"`
+}
+
+// RolloutTrait is the Schema for the RolloutTrait API
+// +kubebuilder:object:root=true
+// +genclient
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type RolloutTrait struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RolloutTraitSpec `json:"spec,omitempty"`
+	Status RolloutStatus    `json:"status,omitempty"`
+}
+
+// RolloutTraitList contains a list of RolloutTrait
+// +kubebuilder:object:root=true
+// +genclient
+type RolloutTraitList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []RolloutTrait `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&RolloutTrait{}, &RolloutTraitList{})
+}
+
+var _ oam.Trait = &RolloutTrait{}
+
+// SetConditions for set CR condition
+func (tr *RolloutTrait) SetConditions(c ...runtimev1alpha1.Condition) {
+	tr.Status.SetConditions(c...)
+}
+
+// GetCondition for get CR condition
+func (tr *RolloutTrait) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+	return tr.Status.GetCondition(c)
+}
+
+// GetWorkloadReference of this MetricsTrait.
+func (tr *RolloutTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
+	return tr.Spec.TargetRef
+}
+
+// SetWorkloadReference of this MetricsTrait.
+func (tr *RolloutTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
+	tr.Spec.TargetRef = r
+}

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

@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -22,7 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
+	corev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -37,7 +36,7 @@ func (in *CanaryMetric) DeepCopyInto(out *CanaryMetric) {
 	}
 	if in.TemplateRef != nil {
 		in, out := &in.TemplateRef, &out.TemplateRef
-		*out = new(v1.ObjectReference)
+		*out = new(corev1alpha1.TypedReference)
 		**out = **in
 	}
 }
@@ -52,22 +51,6 @@ func (in *CanaryMetric) DeepCopy() *CanaryMetric {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CompRolloutStatus) DeepCopyInto(out *CompRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CompRolloutStatus.
-func (in *CompRolloutStatus) DeepCopy() *CompRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(CompRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MetricsExpectedRange) DeepCopyInto(out *MetricsExpectedRange) {
 	*out = *in
@@ -94,7 +77,7 @@ func (in *MetricsExpectedRange) DeepCopy() *MetricsExpectedRange {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Rollout) DeepCopyInto(out *Rollout) {
+func (in *PodSpecWorkload) DeepCopyInto(out *PodSpecWorkload) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -102,24 +85,98 @@ func (in *Rollout) DeepCopyInto(out *Rollout) {
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Rollout.
-func (in *Rollout) DeepCopy() *Rollout {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkload.
+func (in *PodSpecWorkload) DeepCopy() *PodSpecWorkload {
 	if in == nil {
 		return nil
 	}
-	out := new(Rollout)
+	out := new(PodSpecWorkload)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Rollout) DeepCopyObject() runtime.Object {
+func (in *PodSpecWorkload) 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 *PodSpecWorkloadList) DeepCopyInto(out *PodSpecWorkloadList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]PodSpecWorkload, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadList.
+func (in *PodSpecWorkloadList) DeepCopy() *PodSpecWorkloadList {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *PodSpecWorkloadList) 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 *PodSpecWorkloadSpec) DeepCopyInto(out *PodSpecWorkloadSpec) {
+	*out = *in
+	if in.Replicas != nil {
+		in, out := &in.Replicas, &out.Replicas
+		*out = new(int32)
+		**out = **in
+	}
+	in.PodSpec.DeepCopyInto(&out.PodSpec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadSpec.
+func (in *PodSpecWorkloadSpec) DeepCopy() *PodSpecWorkloadSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PodSpecWorkloadStatus) DeepCopyInto(out *PodSpecWorkloadStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Resources != nil {
+		in, out := &in.Resources, &out.Resources
+		*out = make([]corev1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadStatus.
+func (in *PodSpecWorkloadStatus) DeepCopy() *PodSpecWorkloadStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutBatch) DeepCopyInto(out *RolloutBatch) {
 	*out = *in
@@ -165,38 +222,6 @@ func (in *RolloutBatch) DeepCopy() *RolloutBatch {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutList) DeepCopyInto(out *RolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Rollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutList.
-func (in *RolloutList) DeepCopy() *RolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RolloutList) 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 *RolloutPlan) DeepCopyInto(out *RolloutPlan) {
 	*out = *in
@@ -248,22 +273,6 @@ func (in *RolloutPlan) DeepCopy() *RolloutPlan {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutSpec) DeepCopyInto(out *RolloutSpec) {
-	*out = *in
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutSpec.
-func (in *RolloutSpec) DeepCopy() *RolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutStatus) DeepCopyInto(out *RolloutStatus) {
 	*out = *in
@@ -280,6 +289,87 @@ func (in *RolloutStatus) DeepCopy() *RolloutStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RolloutTrait) DeepCopyInto(out *RolloutTrait) {
+	*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 RolloutTrait.
+func (in *RolloutTrait) DeepCopy() *RolloutTrait {
+	if in == nil {
+		return nil
+	}
+	out := new(RolloutTrait)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RolloutTrait) 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 *RolloutTraitList) DeepCopyInto(out *RolloutTraitList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]RolloutTrait, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutTraitList.
+func (in *RolloutTraitList) DeepCopy() *RolloutTraitList {
+	if in == nil {
+		return nil
+	}
+	out := new(RolloutTraitList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RolloutTraitList) 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 *RolloutTraitSpec) DeepCopyInto(out *RolloutTraitSpec) {
+	*out = *in
+	out.TargetRef = in.TargetRef
+	if in.SourceRef != nil {
+		in, out := &in.SourceRef, &out.SourceRef
+		*out = make([]corev1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
+	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutTraitSpec.
+func (in *RolloutTraitSpec) DeepCopy() *RolloutTraitSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(RolloutTraitSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // 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

apis/types/capability.go

@@ -20,10 +20,8 @@ import (
 	"encoding/json"
 
 	"cuelang.org/go/cue"
+	"github.com/google/go-cmp/cmp"
 	"github.com/spf13/pflag"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Source record the source of Capability
@@ -38,6 +36,34 @@ type CRDInfo struct {
 	Kind       string `json:"kind"`
 }
 
+// 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"`
+
+	// 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"`
+}
+
 // Chart defines all necessary information to install a whole chart
 type Chart struct {
 	Repo      string                 `json:"repo"`
@@ -66,10 +92,6 @@ const (
 	TypeTrait CapType = "trait"
 	// TypeScope represent OAM Scope
 	TypeScope CapType = "scope"
-	// TypeWorkflowStep represent OAM Workflow
-	TypeWorkflowStep CapType = "workflowstep"
-	// TypePolicy represent OAM Policy
-	TypePolicy CapType = "policy"
 )
 
 // CapabilityConfigMapNamePrefix is the prefix for capability ConfigMap name
@@ -78,10 +100,6 @@ const CapabilityConfigMapNamePrefix = "schema-"
 const (
 	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
 	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
-	// UISchema is the key to store ui custom schema
-	UISchema string = "ui-schema"
-	// VelaQLConfigmapKey is the key to store velaql view
-	VelaQLConfigmapKey string = "template"
 )
 
 // CapabilityCategory defines the category of a capability
@@ -105,7 +123,6 @@ 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"`
@@ -154,38 +171,72 @@ func SetFlagBy(flags *pflag.FlagSet, v Parameter) {
 	}
 }
 
-// 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"`
-	Example        string             `json:"example,omitempty"`
-	Labels         map[string]string  `json:"labels,omitempty"`
-	Category       CapabilityCategory `json:"category,omitempty"`
+// CapabilityCmpOptions will set compare option
+var CapabilityCmpOptions = []cmp.Option{
+	cmp.Comparer(func(a, b Parameter) bool {
+		if a.Name != b.Name || a.Short != b.Short || a.Required != b.Required ||
+			a.Usage != b.Usage || a.Type != b.Type {
+			return false
+		}
+		// nolint:exhaustive
+		switch a.Type {
+		case cue.IntKind:
+			var va, vb int64
+			switch vala := a.Default.(type) {
+			case int64:
+				va = vala
+			case json.Number:
+				va, _ = vala.Int64()
+			case int:
+				va = int64(vala)
+			case float64:
+				va = int64(vala)
+			}
+			switch valb := b.Default.(type) {
+			case int64:
+				vb = valb
+			case json.Number:
+				vb, _ = valb.Int64()
+			case int:
+				vb = int64(valb)
+			case float64:
+				vb = int64(valb)
+			}
+			return va == vb
+		case cue.StringKind:
+			return a.Default.(string) == b.Default.(string)
+		case cue.BoolKind:
+			return a.Default.(bool) == b.Default.(bool)
+		case cue.NumberKind, cue.FloatKind:
+			var va, vb float64
+			switch vala := a.Default.(type) {
+			case int64:
+				va = float64(vala)
+			case json.Number:
+				va, _ = vala.Float64()
+			case int:
+				va = float64(vala)
+			case float64:
+				va = vala
+			}
+			switch valb := b.Default.(type) {
+			case int64:
+				vb = float64(valb)
+			case json.Number:
+				vb, _ = valb.Float64()
+			case int:
+				vb = float64(valb)
+			case float64:
+				vb = valb
+			}
+			return va == vb
+		default:
+			// complex type not supported, will regard them as not changed.
+		}
+		return true
+	})}
 
-	// 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"`
-	ConfigurationType      string `json:"configurationType,omitempty"`
-	Path                   string `json:"path,omitempty"`
-
-	// KubeTemplate
-	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`
-	KubeParameter []common.KubeParameter `json:"kubeparameter,omitempty"`
+// EqualCapability will check whether two capabilities is equal
+func EqualCapability(a, b Capability) bool {
+	return cmp.Equal(a, b, CapabilityCmpOptions...)
 }

apis/types/componentmanifest.go

@@ -1,39 +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
-	Namespace        string
-	RevisionName     string
-	RevisionHash     string
-	ExternalRevision 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

@@ -18,41 +18,32 @@ package types
 
 // reason for Application
 const (
-	ReasonParsed          = "Parsed"
-	ReasonRendered        = "Rendered"
-	ReasonPolicyGenerated = "PolicyGenerated"
-	ReasonRevisoned       = "Revisioned"
-	ReasonApplied         = "Applied"
-	ReasonHealthCheck     = "HealthChecked"
-	ReasonDeployed        = "Deployed"
-	ReasonRollout         = "Rollout"
+	ReasonParsed      = "Parsed"
+	ReasonRendered    = "Rendered"
+	ReasonApplied     = "Applied"
+	ReasonHealthCheck = "HealthChecked"
+	ReasonDeployed    = "Deployed"
+	ReasonRollout     = "Rollout"
 
 	ReasonFailedParse       = "FailedParse"
 	ReasonFailedRender      = "FailedRender"
-	ReasonFailedRevision    = "FailedRevision"
-	ReasonFailedWorkflow    = "FailedWorkflow"
 	ReasonFailedApply       = "FailedApply"
 	ReasonFailedHealthCheck = "FailedHealthCheck"
-	ReasonFailedStateKeep   = "FailedStateKeep"
 	ReasonFailedGC          = "FailedGC"
 	ReasonFailedRollout     = "FailedRollout"
 )
 
 // event message for Application
 const (
-	MessageParsed           = "Parsed successfully"
-	MessageRendered         = "Rendered successfully"
-	MessagePolicyGenerated  = "Policy generated successfully"
-	MessageRevisioned       = "Revisioned successfully"
-	MessageApplied          = "Applied successfully"
-	MessageWorkflowFinished = "Workflow finished"
-	MessageHealthCheck      = "Health checked healthy"
-	MessageDeployed         = "Deployed successfully"
-	MessageRollout          = "Rollout successfully"
+	MessageParsed      = "Parsed successfully"
+	MessageRendered    = "Rendered 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/multicluster.go

@@ -1,42 +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 (
-	"github.com/oam-dev/cluster-gateway/pkg/apis/cluster/v1alpha1"
-	"github.com/oam-dev/cluster-gateway/pkg/config"
-)
-
-const (
-	// ClusterLocalName the name for the hub cluster
-	ClusterLocalName = "local"
-
-	// CredentialTypeInternal identifies the virtual cluster from internal kubevela system
-	CredentialTypeInternal v1alpha1.CredentialType = "Internal"
-	// CredentialTypeOCMManagedCluster identifies the virtual cluster from ocm
-	CredentialTypeOCMManagedCluster v1alpha1.CredentialType = "ManagedCluster"
-	// ClusterBlankEndpoint identifies the endpoint of a cluster as blank (not available)
-	ClusterBlankEndpoint = "-"
-
-	// ClustersArg indicates the argument for specific clusters to install addon
-	ClustersArg = "clusters"
-)
-
-var (
-	// AnnotationClusterAlias the annotation key for cluster alias
-	AnnotationClusterAlias = config.MetaApiGroupName + "/cluster-alias"
-)

apis/types/types.go

@@ -16,16 +16,9 @@ limitations under the License.
 
 package types
 
-import "github.com/oam-dev/kubevela/pkg/oam"
-
-const (
-	// KubeVelaName name of kubevela
-	KubeVelaName = "kubevela"
-	// VelaCoreName name of vela-core
-	VelaCoreName = "vela-core"
-)
-
 const (
+	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
+	DefaultKubeVelaNS = "vela-system"
 	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
 	DefaultKubeVelaReleaseName = "kubevela"
 	// DefaultKubeVelaChartName defines the default chart name of KubeVela, this variable MUST align to the chart name of this repo
@@ -36,60 +29,11 @@ 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"
-	// KubeVelaControllerDeployment defines the KubeVela controller's deployment name
-	KubeVelaControllerDeployment = "kubevela-vela-core"
 )
 
-// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
-var DefaultKubeVelaNS = "vela-system"
-
 const (
-	// AnnoDefinitionDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
-	AnnoDefinitionDescription = "definition.oam.dev/description"
-	// AnnoDefinitionExampleURL is the annotation which describe url of usage examples of the capability, it will be loaded in documentation generate.
-	AnnoDefinitionExampleURL = "definition.oam.dev/example-url"
-	// AnnoDefinitionAlias is the annotation for definition alias
-	AnnoDefinitionAlias = "definition.oam.dev/alias"
-	// AnnoDefinitionIcon is the annotation which describe the icon url
-	AnnoDefinitionIcon = "definition.oam.dev/icon"
-	// AnnoDefinitionAppliedWorkloads is the annotation which describe what is the workloads used for in a TraitDefinition Object
-	AnnoDefinitionAppliedWorkloads = "definition.oam.dev/appliedWorkloads"
-	// LabelDefinition is the label for definition
-	LabelDefinition = "definition.oam.dev"
-	// LabelDefinitionName is the label for definition name
-	LabelDefinitionName = "definition.oam.dev/name"
-	// LabelDefinitionDeprecated is the label which describe whether the capability is deprecated
-	LabelDefinitionDeprecated = "custom.definition.oam.dev/deprecated"
-	// LabelDefinitionHidden is the label which describe whether the capability is hidden by UI
-	LabelDefinitionHidden = "custom.definition.oam.dev/ui-hidden"
-	// LabelNodeRoleGateway gateway role of node
-	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
-	// LabelNodeRoleWorker worker role of node
-	LabelNodeRoleWorker = "node-role.kubernetes.io/worker"
-	// AnnoIngressControllerHTTPSPort define ingress controller listen port for https
-	AnnoIngressControllerHTTPSPort = "ingress.controller/https-port"
-	// AnnoIngressControllerHTTPPort define ingress controller listen port for http
-	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
-	// AnnoIngressControllerHost define ingress controller externally host
-	AnnoIngressControllerHost = "ingress.controller/host"
-	// LabelConfigType is the label for config type
-	LabelConfigType = "config.oam.dev/type"
-	// LabelConfigCatalog is the label for config catalog
-	LabelConfigCatalog = "config.oam.dev/catalog"
-	// LabelConfigSubType is the sub-type for a config type
-	LabelConfigSubType = "config.oam.dev/sub-type"
-	// LabelConfigProject is the label for config project
-	LabelConfigProject = "config.oam.dev/project"
-	// LabelConfigSyncToMultiCluster is the label to decide whether a config will be synchronized to multi-cluster
-	LabelConfigSyncToMultiCluster = "config.oam.dev/multi-cluster"
-	// LabelConfigIdentifier is the label for config identifier
-	LabelConfigIdentifier = "config.oam.dev/identifier"
-	// AnnotationConfigDescription is the annotation for config description
-	AnnotationConfigDescription = "config.oam.dev/description"
-	// AnnotationConfigAlias is the annotation for config alias
-	AnnotationConfigAlias = "config.oam.dev/alias"
+	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
+	AnnDescription = "definition.oam.dev/description"
 )
 
 const (
@@ -99,78 +43,27 @@ const (
 	StatusStaging = "Staging"
 )
 
-// Config contains key/value pairs
-type Config map[string]string
-
-// EnvMeta stores the namespace for app environment
+// EnvMeta stores the info for app environment
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
-	Labels    string `json:"labels"`
-	Current   string `json:"current"`
+	Email     string `json:"email,omitempty"`
+	Domain    string `json:"domain,omitempty"`
+
+	Current string `json:"current,omitempty"`
 }
 
 const (
 	// TagCommandType used for tag cli category
 	TagCommandType = "commandType"
-
-	// TagCommandOrder defines the order
-	TagCommandOrder = "commandOrder"
-
 	// TypeStart defines one category
 	TypeStart = "Getting Started"
-
 	// TypeApp defines one category
 	TypeApp = "Managing Applications"
-
-	// TypeCD defines workflow Management operations
-	TypeCD = "Continuous Delivery"
-
-	// TypeExtension defines one category
-	TypeExtension = "Managing Extension"
-
+	// TypeCap defines one category
+	TypeCap = "Managing Capabilities"
 	// TypeSystem defines one category
-	TypeSystem = "Others"
-
+	TypeSystem = "System"
 	// TypePlugin defines one category used in Kubectl Plugin
-	TypePlugin = "Plugin Command"
-)
-
-// LabelArg is the argument `label` of a definition
-const LabelArg = "label"
-
-// DefaultFilterAnnots are annotations that won't pass to workload or trait
-var DefaultFilterAnnots = []string{
-	oam.AnnotationAppRollout,
-	oam.AnnotationRollingComponent,
-	oam.AnnotationInplaceUpgrade,
-	oam.AnnotationFilterLabelKeys,
-	oam.AnnotationFilterAnnotationKeys,
-	oam.AnnotationLastAppliedConfiguration,
-}
-
-// ConfigType is the type of config
-type ConfigType string
-
-const (
-	// TerraformProvider is the config type for terraform provider
-	TerraformProvider = "terraform-provider"
-	// DexConnector is the config type for dex connector
-	DexConnector = "config-dex-connector"
-	// ImageRegistry is the config type for image registry
-	ImageRegistry = "config-image-registry"
-	// HelmRepository is the config type for Helm chart repository
-	HelmRepository = "config-helm-repository"
-)
-
-const (
-	// TerraformComponentPrefix is the prefix of component type of terraform-xxx
-	TerraformComponentPrefix = "terraform-"
-
-	// ProviderAppPrefix is the prefix of the application to create a Terraform Provider
-	ProviderAppPrefix = "config-terraform-provider"
-	// ProviderNamespace is the namespace of Terraform Cloud Provider
-	ProviderNamespace = "default"
-	// VelaCoreConfig is to mark application, config and its secret or Terraform provider lelong to a KubeVela config
-	VelaCoreConfig = "velacore-config"
+	TypePlugin = "Debug and Test"
 )