Fix: env trait error when existing env exists (#4039)

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
(cherry picked from commit 2d5a16d45f)

Co-authored-by: Somefive <yd219913@alibaba-inc.com>

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
 
-*                                  @hongchaodeng @wonderflow @leejanee
-design/                            @hongchaodeng @resouer @wonderflow
+*                                  @barnettZQG @wonderflow @leejanee
+design/                            @barnettZQG @leejanee @wonderflow
 
 # Owner of CUE
 pkg/cue                            @leejanee @FogDong

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,36 +1,37 @@
-<!--
 
-Thank you for sending a pull request! Here are some tips:
-
-1. If this is your first time, please read our contribution guide at https://github.com/oam-dev/kubevela/blob/master/CONTRIBUTING.md
-
-2. Ensure you include and run the appropriate tests as part of your Pull Request.
-
-3. In a new feature or configuration option, an update to the documentation is necessary. Everything related to the documentation is under the docs folder in the root of the repository.
-
-4. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such.
-
-5. If you can not merge your Pull Request due to a merge conflict, Rebase it. This gets it in sync with the master branch.
-
-6. Name your PR as "<FeatureArea>: Describe your change", e.g. Application: Add health check for application.
-   If it's a fix or feature relevant for the changelog describe the user impact in the title.
-   The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label.
-
--->
-
-**What this PR does / why we need it**:
-
-**Which issue(s) this PR fixes**:
+### Description of your changes
 
 <!--
 
-- Automatically closes linked issue when the Pull Request is merged.
-
-Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
+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 #
 
-**Special notes for your reviewer**:
+I have:
 
+- [ ] Read and followed KubeVela's [contribution process](https://github.com/oam-dev/kubevela/blob/master/contribute/create-pull-request.md).
+- [ ] [Related Docs](https://github.com/oam-dev/kubevela.io) updated properly. In a new feature or configuration option, an update to the documentation is necessary. 
+- [ ] Run `make reviewable` to ensure this PR is ready for review.
+- [ ] Added `backport release-x.y` labels to auto-backport this PR if necessary.
+
+### How has this code been tested
+
+<!--
+Before reviewers can be confident in the correctness of this pull request, it
+needs to tested and shown to be correct. Briefly describe the testing that has
+already been done or which is planned for this change.
+-->
+
+
+### Special notes for your reviewer
+
+<!--
+
+Be sure to direct your reviewers'
+attention to anything that needs special consideration.
+
+-->

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

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

.github/workflows/apiserver-test.yaml

@@ -0,0 +1,121 @@
+name: APIServer Unit Test & E2E Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+      - apiserver
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+      - apiserver
+
+env:
+  # Common versions
+  GO_VERSION: '1.17'
+  GOLANGCI_VERSION: 'v1.38'
+  KIND_VERSION: 'v0.7.0'
+
+jobs:
+
+  detect-noop:
+    runs-on: ubuntu-20.04
+    outputs:
+      noop: ${{ steps.noop.outputs.should_skip }}
+    steps:
+      - name: Detect No-op Changes
+        id: noop
+        uses: fkirc/skip-duplicate-actions@v3.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
+          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
+          concurrent_skipping: false
+
+  apiserver-unit-tests:
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
+
+      - name: Setup Kind Cluster (Worker)
+        run: |
+          kind delete cluster --name worker
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca --name worker
+          kubectl version
+          kubectl cluster-info
+          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
+          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
+
+      - name: Setup Kind Cluster (Hub)
+        run: |
+          kind delete cluster
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
+          kubectl version
+          kubectl cluster-info
+
+      - name: Load Image to kind cluster
+        run: make kind-load
+
+      - name: Cleanup for e2e tests
+        run: |
+          make e2e-cleanup
+          make vela-cli
+          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 unit test
+        run: make unit-test-apiserver
+
+      - 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: ./coverage.txt,/tmp/e2e_apiserver_test.out
+          flags: apiserver-unittests
+          name: codecov-umbrella
+
+      - name: Clean e2e profile
+        run: rm /tmp/e2e-profile.out
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup

.github/workflows/back-port.yaml

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

.github/workflows/codeql-analysis.yml

@@ -5,6 +5,30 @@ on:
     branches: [ master, release-* ]
 
 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'
+
   analyze:
     name: Analyze
     runs-on: ubuntu-latest

.github/workflows/commit-lint.yml

@@ -1,13 +1,19 @@
-name: Lint Commit Messages
-on: [push, pull_request]
+name: PR Title Checker
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
 
 jobs:
-  commitlint:
+  check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: thehanimo/pr-title-checker@v1.3.1
         with:
-          fetch-depth: 0
-      - uses: wagoid/commitlint-github-action@v4
-        with:
-          helpURL: https://github.com/oam-dev/kubevela/blob/master/contribute/create-pull-request.md#commit-message-format
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pass_on_octokit_error: true
+          configuration_path: ".github/pr-title-checker-config.json"

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

@@ -13,7 +13,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
+  GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
@@ -60,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster (Worker)
         run: |
           kind delete cluster --name worker
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4 --name worker
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca --name worker
           kubectl version
           kubectl cluster-info
           kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
@@ -69,7 +69,7 @@ jobs:
       - name: Setup Kind Cluster (Hub)
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 
@@ -79,10 +79,15 @@ jobs:
       - name: Cleanup for e2e tests
         run: |
           make e2e-cleanup
+          make vela-cli
           make e2e-setup-core
+          make
+          make setup-runtime-e2e-cluster
 
       - name: Run e2e multicluster tests
-        run: make e2e-multicluster-test
+        run: |
+          export PATH=$(pwd)/bin:$PATH
+          make e2e-multicluster-test
 
       - name: Stop kubevela, get profile
         run: make end-e2e-core

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

@@ -13,7 +13,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
+  GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
@@ -60,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 
@@ -90,12 +90,12 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
+          files: /tmp/e2e-profile.out
           flags: e2e-rollout-tests
           name: codecov-umbrella
 
       - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out
+        run: rm /tmp/e2e-profile.out
 
       - name: Cleanup image
         if: ${{ always() }}

.github/workflows/e2e-test.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
+  GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
@@ -60,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 
@@ -83,6 +83,9 @@ jobs:
       - name: Run api e2e tests
         run: make e2e-api-test
 
+      - name: Run addons e2e tests
+        run: make e2e-addon-test
+
       - name: Run e2e tests
         run: make e2e-test
 
@@ -93,12 +96,12 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
+          files: /tmp/e2e-profile.out
           flags: e2etests
           name: codecov-umbrella
 
       - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out
+        run: rm /tmp/e2e-profile.out
 
       - name: Cleanup image
         if: ${{ always() }}

.github/workflows/go.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
+  GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
@@ -33,52 +33,6 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  compatibility-test:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v2
-        with:
-          path: .work/pkg
-          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-pkg-
-
-      - name: Install ginkgo
-        run: |
-          sudo apt-get install -y golang-ginkgo-dev
-
-      - name: Setup Kind Cluster
-        uses: engineerd/setup-kind@v0.5.0
-        with:
-          version: ${{ env.KIND_VERSION }}
-
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 3.1.0
-          kubebuilderOnly: false
-          kubernetesVersion: v1.21.2
-
-      - name: Run Make compatibility-test
-        run: make compatibility-test
-
-      - name: Clean up testdata
-        run: make compatibility-testdata-cleanup
-
   staticcheck:
     runs-on: ubuntu-20.04
     needs: detect-noop
@@ -103,7 +57,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Install StaticCheck
-        run: GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck
+        run: GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@v0.3.0
 
       - name: Static Check
         run: staticcheck ./...
@@ -117,6 +71,11 @@ 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:
@@ -134,7 +93,7 @@ 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@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 
@@ -154,6 +113,11 @@ 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:

.github/workflows/issue-commands.yml

@@ -6,7 +6,7 @@ on:
     types: [created]
 
 jobs:
-  main:
+  bot:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
@@ -14,11 +14,56 @@ jobs:
         with:
           repository: "oam-dev/kubevela-github-actions"
           path: ./actions
-          ref: v0.4.1
+          ref: v0.4.2
       - name: Install Actions
-        run: npm install --production --prefix ./actions
+        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

@@ -44,12 +44,23 @@ jobs:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login Alibaba Cloud ACR
+        uses: docker/login-action@v1
+        with:
+          registry: kubevela-registry.cn-hangzhou.cr.aliyuncs.com
+          username: ${{ secrets.ACR_USERNAME }}@aliyun-inner.com
+          password: ${{ secrets.ACR_PASSWORD }}
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
         with:
           driver-opts: image=moby/buildkit:master
+
+      - name: Build & Pushing vela-core for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }} .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
-        name: Build & Pushing
+        name: Build & Pushing vela-core for Dockerhub and GHCR
         with:
           context: .
           file: Dockerfile
@@ -61,11 +72,39 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
           tags: |-
-            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
             docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
+
+      - name: Build & Pushing vela-apiserver for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }} -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.apiserver .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
-        name: Build & Pushing runtime rollout
+        name: Build & Pushing vela-apiserver for Dockerhub and GHCR
+        with:
+          context: .
+          file: Dockerfile.apiserver
+          labels: |-
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
+            VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
+          tags: |-
+            docker.io/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
+
+      - name: Build & Pushing vela runtime rollout for ACR
+        run: |
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }} .
+          docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+      - uses: docker/build-push-action@v2
+        name: Build & Pushing runtime rollout for Dockerhub and GHCR
         with:
           context: .
           file: runtime/rollout/Dockerfile
@@ -77,9 +116,10 @@ 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-rollout:${{ steps.get_version.outputs.VERSION }}
             docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}
 
   publish-charts:
     env:
@@ -102,6 +142,13 @@ jobs:
         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
@@ -115,7 +162,7 @@ jobs:
           releases-only: true
         id: latest_tag
       - name: Tag helm chart image
-        run:  |
+        run: |
           latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
           sub="."
           major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
@@ -147,10 +194,9 @@ jobs:
         run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
       - name: add artifacthub stuff to the repo
         run: |
-          rsync README.md $HELM_CHART/README.md
-          rsync README.md $LEGACY_HELM_CHART/README.md
-          rsync README.md $OAM_RUNTIME_HELM_CHART/README.md
-          rsync README.md $VELA_ROLLOUT_HELM_CHART/README.md
+          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
+          rsync $HELM_CHART/README.md $OAM_RUNTIME_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
@@ -179,6 +225,6 @@ jobs:
       - name: sync capabilities bucket to local
         run: ./ossutil --config-file .ossutilconfig sync oss://$CAPABILITY_BUCKET $CAPABILITY_DIR
       - name: rsync all capabilites
-        run:  rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
+        run: rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
       - name: sync local to cloud
         run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f

.github/workflows/release.yml

@@ -4,126 +4,167 @@ on:
   push:
     tags:
       - "v*"
-  workflow_dispatch: {}
+  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 }}
 
 jobs:
-  publish-cli:
+  build:
     runs-on: ubuntu-latest
+    name: build
+    strategy:
+      matrix:
+        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
     env:
-      VELA_VERSION: ${{ github.ref }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VELA_VERSION_KEY: github.com/oam-dev/kubevela/version.VelaVersion
+      VELA_GITVERSION_KEY: github.com/oam-dev/kubevela/version.GitRevision
+      GO_BUILD_ENV: GO111MODULE=on CGO_ENABLED=0
+      DIST_DIRS: find * -type d -exec
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
-      - name: Check out code into the Go module directory
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-      - name: 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: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Upload Vela Linux amd64 tar.gz
+      - name: Get version
+        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+      - name: Get matrix
+        id: get_matrix
+        run: |
+          TARGETS=${{matrix.TARGETS}}
+          echo ::set-output name=OS::${TARGETS%/*}
+          echo ::set-output name=ARCH::${TARGETS#*/}
+      - name: Get ldflags
+        id: get_ldflags
+        run: |
+          LDFLAGS="-s -w -X ${{ env.VELA_VERSION_KEY }}=${{ env.VELA_VERSION }} -X ${{ env.VELA_GITVERSION_KEY }}=git-$(git rev-parse --short HEAD)"
+          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV
+      - name: Build
+        run: |
+          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
+            go build -ldflags "${{ env.LDFLAGS }}" \
+            -o _bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/vela -v \
+            ./references/cmd/cli/main.go
+          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
+            go build -ldflags "${{ env.LDFLAGS }}" \
+            -o _bin/kubectl-vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/kubectl-vela -v \
+            ./cmd/plugin/main.go
+      - name: Compress
+        run: |
+          echo "\n## Release Info\nVERSION: ${{ env.VELA_VERSION }}" >> README.md && \
+          echo "GIT_COMMIT: ${GITHUB_SHA}\n" >> README.md && \
+          cd _bin/vela && \
+          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
+          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
+          ${{ env.DIST_DIRS }} tar -zcf vela-{}.tar.gz {} \; && \
+          ${{ env.DIST_DIRS }} zip -r vela-{}.zip {} \; && \
+          cd ../kubectl-vela && \
+          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
+          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
+          ${{ env.DIST_DIRS }} tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+          ${{ env.DIST_DIRS }} zip -r kubectl-vela-{}.zip {} \; && \
+          cd .. && \
+          sha256sum vela/vela-* kubectl-vela/kubectl-vela-* >> sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt \
+      - name: Upload Vela tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-linux-amd64.tar.gz
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela Linux amd64 zip
+      - name: Upload Vela zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-linux-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Vela MacOS tar.gz
+      - name: Upload Kubectl-Vela tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload Vela MacOS zip
+      - name: Upload Kubectl-Vela zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-darwin-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Vela Windows tar.gz
-        uses: actions/upload-release-asset@v1.0.2
+      - name: Post sha256
+        uses: actions/upload-artifact@v2
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/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
+          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
+        run: |
+          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
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-windows-amd64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela Linux amd64 tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela Linux amd64 zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela MacOS tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela MacOS zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela Windows tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Kubectl-Vela Windows zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
-          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
-          asset_content_type: binary/octet-stream
+          name: sha256sums
+          path: cli-artifacts
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: cli-artifacts
+      - shell: bash
+        working-directory: cli-artifacts
+        run: |
+          for file in *
+          do
+            cat ${file} >> sha256sums.txt
+          done
       - name: Upload Checksums
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/sha256sums.txt
+          asset_path: cli-artifacts/sha256sums.txt
           asset_name: sha256sums.txt
           asset_content_type: text/plain
       - name: Update kubectl plugin version in krew-index
         uses: rajatjindal/krew-release-bot@v0.0.38
+      - name: Update Homebrew formula
+        uses: dawidd6/action-homebrew-bump-formula@v3
+        with:
+          token: ${{ secrets.HOMEBREW_TOKEN }}
+          formula: kubevela
+          tag: ${{ github.ref }}
+          revision: ${{ github.sha }}
+          force: false

.github/workflows/sync-api.yml

@@ -11,10 +11,10 @@ jobs:
   sync-core-api:
     runs-on: ubuntu-20.04
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         env:
-          GO_VERSION: '1.16'
+          GO_VERSION: '1.17'
           GOLANGCI_VERSION: 'v1.38'
         with:
           go-version: ${{ env.GO_VERSION }}

.github/workflows/timed-task.yml

@@ -1,7 +1,7 @@
 name: Timed Task
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '* * * * *'
 jobs:
   clean-image:
     runs-on: aliyun

.github/workflows/unit-test.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.16'
+  GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
 
@@ -72,7 +72,7 @@ jobs:
           version: 3.1.0
           kubebuilderOnly: false
           kubernetesVersion: v1.21.2
-
+      
       - name: Run Make test
         run: make test
 
@@ -81,5 +81,5 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt
-          flags: unittests
+          flags: core-unittests
           name: codecov-umbrella

.gitignore

@@ -41,8 +41,12 @@ 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/
+git-page/
+
+# e2e rollout runtime image build
+runtime/rollout/e2e/tmp

.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.exe"
-      to: "."
+    - from: "*/kubectl-vela"
+      to: "kubectl-vela.exe"
     - from: "*/LICENSE"
       to: "."
     bin: "kubectl-vela.exe"

CHANGELOG/CHANGELOG-1.0.md

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

CHANGELOG/CHANGELOG-1.1.md

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

CHANGELOG/CHANGELOG-1.2.md

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

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

Dockerfile

@@ -1,10 +1,16 @@
+ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-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
@@ -15,6 +21,7 @@ COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
+COPY references/ references/
 
 # Build
 ARG TARGETARCH
@@ -24,24 +31,18 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
     go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
     -o manager-${TARGETARCH} main.go
 
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
-    -o apiserver-${TARGETARCH} cmd/apiserver/main.go
-
 # Use alpine as base image due to the discussion in issue #1448
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE:-alpine:latest}
+FROM ${BASE_IMAGE:-alpine:3.15}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash
+RUN apk add --no-cache ca-certificates bash expat
 
 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/
 

Dockerfile.apiserver

@@ -0,0 +1,49 @@
+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 connnecting with cri
+RUN apk add --no-cache ca-certificates bash expat
+
+WORKDIR /
+
+ARG TARGETARCH
+COPY --from=builder /workspace/apiserver-${TARGETARCH} /usr/local/bin/apiserver
+
+COPY entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["apiserver"]

Dockerfile.e2e

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

Makefile

@@ -1,108 +1,39 @@
-# Vela version
-VELA_VERSION ?= master
-# Repo info
-GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
-GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
-VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
-VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
-LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
-
-GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
-GOX         = go run github.com/mitchellh/gox
-TARGETS     := darwin/amd64 linux/amd64 windows/amd64
-DIST_DIRS   := find * -type d -exec
-
-TIME_LONG	= `date +%Y-%m-%d' '%H:%M:%S`
-TIME_SHORT	= `date +%H:%M:%S`
-TIME		= $(TIME_SHORT)
-
-BLUE         := $(shell printf "\033[34m")
-YELLOW       := $(shell printf "\033[33m")
-RED          := $(shell printf "\033[31m")
-GREEN        := $(shell printf "\033[32m")
-CNone        := $(shell printf "\033[0m")
-
-INFO	= echo ${TIME} ${BLUE}[ .. ]${CNone}
-WARN	= echo ${TIME} ${YELLOW}[WARN]${CNone}
-ERR		= echo ${TIME} ${RED}[FAIL]${CNone}
-OK		= echo ${TIME} ${GREEN}[ OK ]${CNone}
-FAIL	= (echo ${TIME} ${RED}[FAIL]${CNone} && false)
-
-# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
-ifeq (,$(shell go env GOBIN))
-GOBIN=$(shell go env GOPATH)/bin
-else
-GOBIN=$(shell go env GOBIN)
-endif
-
-# Image URL to use all building/pushing image targets
-VELA_CORE_IMAGE      ?= vela-core:latest
-VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
-VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest
+include makefiles/const.mk
+include makefiles/dependency.mk
+include makefiles/release.mk
+include makefiles/develop.mk
+include makefiles/build.mk
+include makefiles/e2e.mk
 
+.DEFAULT_GOAL := all
 all: build
 
 # Run tests
-test: vet lint staticcheck
-	go test -coverprofile=coverage.txt ./pkg/... ./cmd/...
-	go test ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
+test: vet lint staticcheck unit-test-core test-cli-gen
 	@$(OK) unit-tests pass
 
+test-cli-gen: 
+	mkdir -p ./bin/doc
+	go run ./hack/docgen/gen.go ./bin/doc
+unit-test-core:
+	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... ./apis/... | grep -v apiserver)
+	go test $(shell go list ./references/... | grep -v apiserver)
+unit-test-apiserver:
+	go test -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
 
-vela-cli:
-	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
-
-kubectl-vela:
-	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
-
-doc-gen:
-	rm -r docs/en/cli/*
-	go run hack/docgen/gen.go
-
-PWD := $(shell pwd)	
-cross-build:
-	rm -rf _bin
-	go get github.com/mitchellh/gox@v0.4.0
-	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/vela/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli
-	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/kubectl-vela/{{.OS}}-{{.Arch}}/kubectl-vela" -osarch='$(TARGETS)' ./cmd/plugin
-	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/apiserver/{{.OS}}-{{.Arch}}/apiserver" -osarch="$(TARGETS)" ./cmd/apiserver
-
 build-cleanup:
 	rm -rf _bin
 
-compress:
-	( \
-		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
-		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
-		cd _bin/vela && \
-		$(DIST_DIRS) cp ../../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../../README.md {} \; && \
-		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
-		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
-		cd ../kubectl-vela && \
-		$(DIST_DIRS) cp ../../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../../README.md {} \; && \
-		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
-		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
-		cd .. && \
-		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
-	)
-
-# Run against the configured Kubernetes cluster in ~/.kube/config
-run:
-	go run ./cmd/core/main.go --application-revision-limit 5
-
-run-apiserver:
-	go run ./cmd/apiserver/main.go
-
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
 	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w $$(go list -f {{.Dir}} ./...)
 	$(CUE) fmt ./vela-templates/definitions/internal/*
+	$(CUE) fmt ./vela-templates/definitions/deprecated/*
 	$(CUE) fmt ./vela-templates/definitions/registry/*
 	$(CUE) fmt ./pkg/stdlib/pkgs/*
 	$(CUE) fmt ./pkg/stdlib/op.cue
@@ -117,7 +48,7 @@ staticcheck: staticchecktool
 lint: golangci
 	$(GOLANGCILINT) run ./...
 
-reviewable: manifests fmt vet lint staticcheck
+reviewable: manifests fmt vet lint staticcheck helm-doc-gen
 	go mod tidy
 
 # Execute auto-gen code commands and ensure branch is clean.
@@ -126,89 +57,43 @@ check-diff: reviewable
 	git diff --quiet || ($(ERR) please run 'make reviewable' to include all changes && false)
 	@$(OK) branch is clean
 
-# Build the docker image
-docker-build:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
-
-# Build the runtime docker image
-docker-build-runtime-rollout:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_RUNTIME_ROLLOUT_IMAGE) -f runtime/rollout/Dockerfile .
-
 # Push the docker image
 docker-push:
 	docker push $(VELA_CORE_IMAGE)
 
-e2e-setup-core:
-	sh ./hack/e2e/modify_charts.sh
-	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --set multicluster.enabled=true --wait kubevela ./charts/vela-core
-	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
+build-swagger:
+	go run ./cmd/apiserver/main.go build-swagger ./docs/apidoc/swagger.json
 
-e2e-setup:
-	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.9.0/kruise-chart.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
-	sh ./hack/e2e/modify_charts.sh
-	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
-	helm upgrade --install --create-namespace --namespace oam-runtime-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait oam-runtime ./charts/oam-runtime
-	bin/vela addon enable fluxcd
-	bin/vela addon enable terraform
-	ginkgo version
-	ginkgo -v -r e2e/setup
 
-	timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $$? -eq 0 ] ; then break; else sleep 5; fi;done'
-	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
-	kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
-	kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
-
-e2e-api-test:
-	# Run e2e test
-	ginkgo -v -skipPackage capability,setup,application -r e2e
-	ginkgo -v -r e2e/application
-
-e2e-test:
-	# Run e2e test
-	ginkgo -v  --skip="rollout related e2e-test." ./test/e2e-test
-	@$(OK) tests pass
-
-e2e-rollout-test:
-	ginkgo -v  --focus="rollout related e2e-test." ./test/e2e-test
-	@$(OK) tests pass
-
-e2e-multicluster-test:
-	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_multicluster_test.out ./test/e2e-multicluster-test
-	@$(OK) tests pass
-
-compatibility-test: vet lint staticcheck generate-compatibility-testdata
-	# Run compatibility test with old crd
-	COMPATIBILITY_TEST=TRUE go test -race ./pkg/...
-	@$(OK) compatibility-test pass
-
-generate-compatibility-testdata:
-	mkdir -p  ./test/compatibility-test/testdata
-	go run ./test/compatibility-test/convert/main.go ./charts/vela-core/crds ./test/compatibility-test/testdata
-
-compatibility-testdata-cleanup:
-	rm -f ./test/compatibility-test/testdata/*
-
-e2e-cleanup:
-	# Clean up
-	rm -rf ~/.vela
 
 image-cleanup:
-# Delete Docker image
+ifneq (, $(shell which docker))
+# Delete Docker images
+
 ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
 	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif
 
-end-e2e-core:
-	sh ./hack/e2e/end_e2e_core.sh
+ifneq ($(shell docker images -q $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)),)
+	docker rmi -f $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)
+endif
+
+endif
+
 
-end-e2e:
-	sh ./hack/e2e/end_e2e.sh
 
 # load docker image to the kind cluster
-kind-load:
+kind-load: kind-load-runtime-cluster
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
 	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
+kind-load-runtime-cluster:
+	/bin/sh hack/e2e/build_runtime_rollout.sh
+	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
+	rm -rf runtime/rollout/e2e/tmp
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
@@ -221,24 +106,6 @@ manager: fmt vet lint manifests
 vela-runtime-rollout-manager: fmt vet lint manifests
 	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go
 
-# Run against the configured Kubernetes cluster in ~/.kube/config
-core-run: fmt vet manifests
-	go run ./cmd/core/main.go
-
-# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
-core-debug-run: fmt vet manifests
-	go run ./cmd/core/main.go --log-debug=true
-
-# Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
-core-install: manifests
-	kubectl apply -f hack/namespace.yaml
-	kubectl apply -f charts/vela-core/crds/
-	@$(OK) install succeed
-
-# Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
-core-uninstall: manifests
-	kubectl delete -f charts/vela-core/crds/
-
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
@@ -248,83 +115,21 @@ manifests: installcue kustomize
 	go run ./hack/crd/dispatch/dispatch.go config/crd/base charts/vela-core/crds charts/oam-runtime/crds runtime/ charts/vela-minimal/crds
 	rm -f config/crd/base/*
 	./vela-templates/gen_definitions.sh
-	go run ./vela-templates/gen_addons.go
 
-GOLANGCILINT_VERSION ?= v1.38.0
+
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 HOSTARCH := $(shell uname -m)
 ifeq ($(HOSTARCH),x86_64)
 HOSTARCH := amd64
 endif
 
-golangci:
-ifeq (, $(shell which golangci-lint))
-	@{ \
-	set -e ;\
-	echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCILINT_VERSION) ;\
-	echo 'Install succeed' ;\
-	}
-GOLANGCILINT=$(GOBIN)/golangci-lint
-else
-GOLANGCILINT=$(shell which golangci-lint)
-endif
-
-.PHONY: staticchecktool
-staticchecktool:
-ifeq (, $(shell which staticcheck))
-	@{ \
-	set -e ;\
-	echo 'installing honnef.co/go/tools/cmd/staticcheck ' ;\
-	GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck ;\
-	}
-STATICCHECK=$(GOBIN)/staticcheck
-else
-STATICCHECK=$(shell which staticcheck)
-endif
-
-.PHONY: goimports
-goimports:
-ifeq (, $(shell which goimports))
-	@{ \
-	set -e ;\
-	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
-	}
-GOIMPORTS=$(GOBIN)/goimports
-else
-GOIMPORTS=$(shell which goimports)
-endif
-
-.PHONY: installcue
-installcue:
-ifeq (, $(shell which cue))
-	@{ \
-	set -e ;\
-	GO111MODULE=off go get -u cuelang.org/go/cmd/cue ;\
-	}
-CUE=$(GOBIN)/cue
-else
-CUE=$(shell which cue)
-endif
-
-KUSTOMIZE_VERSION ?= 3.8.2
-
-.PHONY: kustomize
-kustomize:
-ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
-	@{ \
-	set -e ;\
-	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
-	curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(GOBIN);\
-	echo 'Install succeed' ;\
-	}
-KUSTOMIZE=$(GOBIN)/kustomize
-else
-KUSTOMIZE=$(shell which kustomize)
-endif
 
 check-license-header:
 	./hack/licence/header-check.sh
 
 def-install:
 	./hack/utils/installdefinition.sh
+
+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_ALIASES

@@ -1,44 +1,60 @@
-aliases:
-  kubevela-devex:
-  - hongchaodeng
-  - wonderflow
+Reviewers:
+- Ghostbaby
+- StevenLeiZhang
+- chwetion
+- yue9944882
+- zxbyoyoyo
+- reetasingh
+- wangwang
+- evanli18
+- devholic
+- fourierr
+- JooKS-me
 
-  kubevela-dashboard-approver:
-  - zzxwill
-  - hongchaodeng
+Approvers:
+- Somefive (Multi-Cluster)
+- chivalryq (Vela CLI)
+- sunny0826 (kubevela.io)
+- hanxie-crypto (VelaUX)
+- FogDong (Workflow)
+- wangyikewxgm (Addon)
+- yangsoon (VelaQL）
 
-  kubevela-dashboard-reviewer:
-  - sunny0826 
-  - hanxie-crypto
+Maintainers:
+- wonderflow
+- hongchaodeng
+- captainroy-hy
+- resouer
+- barnettZQG
+- leejanee
+- zzxwill
+- BinaryHB0916
+- dhiguero
 
-  kubevela-controller:
-  - resouer
-  - wonderflow
-  - hongchaodeng
-  - zzxwill
-  - ryanzhang-oss
-  - captainroy-hy
+Emeritus Members:
+- ryanzhang-oss
+- Fei-Guo
+- szihai
+- xiaoyuaiheshui
+- wenxinnnnn
+- silenceper
+- erdun
+- mosesyou
+- artursouza
+- woshilanren11
 
-  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
+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,3 +1,11 @@
+<div style="text-align: center">
+  <p align="center">
+    <img src="https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png">
+    <br><br>
+    <i>Make shipping applications more enjoyable.</i>
+  </p>
+</div>
+
 ![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
 ![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
@@ -7,22 +15,23 @@
 [![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)
 
-![logo](https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png)
+## Introduction
 
-*Make shipping applications more enjoyable.*
+KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable.
 
-# KubeVela
+![](docs/resources/what-is-kubevela.png)
 
-KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
+## Highlights
 
-## Features
+KubeVela practices the "render, orchestrate, deploy" workflow with below highlighted values added to existing ecosystem:
 
-**Application Centric** - KubeVela introduces [Open Application Model (OAM)](https://oam.dev/) as the consistent yet higher level API to capture a full deployment of microservices on top of hybrid environments. Placement strategy, traffic shifting and rolling update are declared at application level. No infrastructure level concern, simply deploy.
+- *Application Centric* - KubeVela introduces [Open Application Model (OAM)](https://oam.dev/) as the consistent yet higher level API to capture and render a full deployment of microservices on top of hybrid environments. Placement strategy, traffic shifting and rolling update are declared at application level. No infrastructure level concern, simply deploy.
 
-**Programmable Workflow** - KubeVela leverages [CUE](https://cuelang.org/) to implement its model layer. This allows you to declare application deployment workflow as a DAG, with all steps and application's needs glued together in programmable approach. No restrictions, natively extensible.
+- *Programmable Workflow* - KubeVela models application delivery as DAG (Directed Acyclic Graph) and expresses it with [CUE](https://cuelang.org/) - a modern data configuration language. This allows you to design application deployment steps per needs and orchestrate them in programmable approach. No restrictions, natively extensible.
 
-**Runtime Agnostic** - KubeVela works as an application delivery control plane that is fully runtime agnostic. It can deploy and manage any application components including containers, cloud functions, databases, or even EC2 instances across hybrid environments, following the workflow you defined.
+- *Infrastructure Agnostic* - KubeVela works as an application delivery control plane that is fully decoupled from runtime infrastructure. It can deploy any workload types including containers, cloud services, databases, or even VM instances to any cloud or Kubernetes cluster, following the workflow designed by you.
 
 ## Getting Started
 
@@ -42,7 +51,8 @@ Full documentation is available on the [KubeVela website](https://kubevela.io/).
 - Wechat Group (*Chinese*): Broker wechat to add you into the user group.
  
   <img src="https://static.kubevela.net/images/barnett-wechat.jpg" width="200" />
-- Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs)
+- Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs).
+- Bi-weekly Chinese Community Call: [Video Records](https://space.bilibili.com/180074935/channel/seriesdetail?sid=1842207).
 
 ## Talks and Conferences
 

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

@@ -17,12 +17,18 @@ limitations under the License.
 package common
 
 import (
+	"encoding/json"
+	"errors"
+
+	"github.com/oam-dev/terraform-controller/api/v1beta2"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"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
@@ -109,6 +115,11 @@ type Terraform struct {
 	// +kubebuilder:default:=hcl
 	// +kubebuilder:validation:Enum:=hcl;json;remote
 	Type string `json:"type,omitempty"`
+
+	// Path is the sub-directory of remote git repository. It's valid when remote is set
+	Path string `json:"path,omitempty"`
+
+	v1beta2.BaseConfigurationSpec `json:",inline"`
 }
 
 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -157,7 +168,7 @@ type Status struct {
 	HealthPolicy string `json:"healthPolicy,omitempty"`
 }
 
-// ApplicationPhase is a label for the condition of a application at the current time
+// ApplicationPhase is a label for the condition of an application at the current time
 type ApplicationPhase string
 
 const (
@@ -181,26 +192,36 @@ const (
 	ApplicationRunning ApplicationPhase = "running"
 	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
 	ApplicationUnhealthy ApplicationPhase = "unhealthy"
+	// ApplicationDeleting means application is being deleted
+	ApplicationDeleting ApplicationPhase = "deleting"
 )
 
 // WorkflowState is a string that mark the workflow state
 type WorkflowState string
 
 const (
+	// WorkflowStateInitializing means the workflow is in initial state
+	WorkflowStateInitializing WorkflowState = "initializing"
 	// WorkflowStateTerminated means workflow is terminated manually, and it won't be started unless the spec changed.
 	WorkflowStateTerminated WorkflowState = "terminated"
 	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
 	WorkflowStateSuspended WorkflowState = "suspended"
-	// WorkflowStateFinished means workflow is running successfully, all steps finished.
+	// WorkflowStateSucceeded means workflow is running successfully, all steps finished.
+	WorkflowStateSucceeded WorkflowState = "Succeeded"
+	// WorkflowStateFinished means workflow is end.
 	WorkflowStateFinished WorkflowState = "finished"
 	// WorkflowStateExecuting means workflow is still running or waiting some steps.
 	WorkflowStateExecuting WorkflowState = "executing"
+	// WorkflowStateSkipping means it will skip this reconcile and let next reconcile to handle it.
+	WorkflowStateSkipping WorkflowState = "skipping"
 )
 
 // ApplicationComponentStatus record the health status of App component
 type ApplicationComponentStatus struct {
-	Name string `json:"name"`
-	Env  string `json:"env,omitempty"`
+	Name      string `json:"name"`
+	Namespace string `json:"namespace,omitempty"`
+	Cluster   string `json:"cluster,omitempty"`
+	Env       string `json:"env,omitempty"`
 	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
 	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
 	Healthy            bool                     `json:"healthy"`
@@ -243,6 +264,10 @@ type WorkflowStepStatus struct {
 	// A brief CamelCase message indicating details about why the workflowStep is in this state.
 	Reason   string          `json:"reason,omitempty"`
 	SubSteps *SubStepsStatus `json:"subSteps,omitempty"`
+	// FirstExecuteTime is the first time this step execution.
+	FirstExecuteTime metav1.Time `json:"firstExecuteTime,omitempty"`
+	// LastExecuteTime is the last time this step execution.
+	LastExecuteTime metav1.Time `json:"lastExecuteTime,omitempty"`
 }
 
 // WorkflowSubStepStatus record the status of a workflow step
@@ -267,8 +292,6 @@ type AppStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-	Rollout AppRolloutStatus `json:"rollout,omitempty"`
-
 	Phase ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller
@@ -277,9 +300,6 @@ type AppStatus struct {
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`
 
-	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
-
 	// Workflow record the status of workflow
 	Workflow *WorkflowStatus `json:"workflow,omitempty"`
 
@@ -289,18 +309,50 @@ type AppStatus struct {
 
 	// AppliedResources record the resources that the  workflow step apply.
 	AppliedResources []ClusterObjectReference `json:"appliedResources,omitempty"`
+
+	// PolicyStatus records the status of policy
+	PolicyStatus []PolicyStatus `json:"policy,omitempty"`
+}
+
+// PolicyStatus records the status of policy
+type PolicyStatus struct {
+	Name string `json:"name"`
+	Type string `json:"type"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Status *runtime.RawExtension `json:"status,omitempty"`
+}
+
+// WorkflowStep defines how to execute a workflow step.
+type WorkflowStep struct {
+	// Name is the unique name of the workflow step.
+	Name string `json:"name"`
+
+	Type string `json:"type"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+
+	DependsOn []string `json:"dependsOn,omitempty"`
+
+	Inputs 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"`
 
 	Suspend    bool `json:"suspend"`
 	Terminated bool `json:"terminated"`
+	Finished   bool `json:"finished"`
 
 	ContextBackend *corev1.ObjectReference `json:"contextBackend,omitempty"`
 	Steps          []WorkflowStepStatus    `json:"steps,omitempty"`
+
+	StartTime metav1.Time `json:"startTime,omitempty"`
 }
 
 // SubStepsStatus record the status of workflow steps.
@@ -316,7 +368,7 @@ type WorkflowStepPhase string
 const (
 	// WorkflowStepPhaseSucceeded will make the controller run the next step.
 	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
-	// WorkflowStepPhaseFailed will make the controller stop the workflow and report error in `message`.
+	// WorkflowStepPhaseFailed will report error in `message`.
 	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
 	// WorkflowStepPhaseStopped will make the controller stop the workflow.
 	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
@@ -369,7 +421,7 @@ type AppRolloutStatus struct {
 type ApplicationTrait struct {
 	Type string `json:"type"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
 }
 
 // ApplicationComponent describe the component of application
@@ -379,7 +431,7 @@ type ApplicationComponent struct {
 	// ExternalRevision specified the component revisionName
 	ExternalRevision string `json:"externalRevision,omitempty"`
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
 
 	DependsOn []string    `json:"dependsOn,omitempty"`
 	Inputs    StepInputs  `json:"inputs,omitempty"`
@@ -446,9 +498,141 @@ const (
 	WorkflowResourceCreator ResourceCreatorRole = "workflow"
 )
 
+// OAMObjectReference defines the object reference for an oam resource
+type OAMObjectReference struct {
+	Component string `json:"component,omitempty"`
+	Trait     string `json:"trait,omitempty"`
+	Env       string `json:"env,omitempty"`
+}
+
+// Equal check if two references are equal
+func (in OAMObjectReference) Equal(r OAMObjectReference) bool {
+	return in.Component == r.Component && in.Trait == r.Trait && in.Env == r.Env
+}
+
+// AddLabelsToObject add labels to object if properties are not empty
+func (in OAMObjectReference) AddLabelsToObject(obj client.Object) {
+	labels := obj.GetLabels()
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	if in.Component != "" {
+		labels[oam.LabelAppComponent] = in.Component
+	}
+	if in.Trait != "" {
+		labels[oam.TraitTypeLabel] = in.Trait
+	}
+	if in.Env != "" {
+		labels[oam.LabelAppEnv] = in.Env
+	}
+	obj.SetLabels(labels)
+}
+
+// NewOAMObjectReferenceFromObject create OAMObjectReference from object
+func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
+	if labels := obj.GetLabels(); labels != nil {
+		return OAMObjectReference{
+			Component: labels[oam.LabelAppComponent],
+			Trait:     labels[oam.TraitTypeLabel],
+			Env:       labels[oam.LabelAppEnv],
+		}
+	}
+	return OAMObjectReference{}
+}
+
 // ClusterObjectReference defines the object reference with cluster.
 type ClusterObjectReference struct {
 	Cluster                string              `json:"cluster,omitempty"`
 	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

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

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

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -22,6 +23,7 @@ package common
 
 import (
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -44,7 +46,6 @@ 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))
@@ -57,11 +58,6 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.ResourceTracker != nil {
-		in, out := &in.ResourceTracker, &out.ResourceTracker
-		*out = new(v1.ObjectReference)
-		**out = **in
-	}
 	if in.Workflow != nil {
 		in, out := &in.Workflow, &out.Workflow
 		*out = new(WorkflowStatus)
@@ -77,6 +73,13 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 		*out = make([]ClusterObjectReference, len(*in))
 		copy(*out, *in)
 	}
+	if in.PolicyStatus != nil {
+		in, out := &in.PolicyStatus, &out.PolicyStatus
+		*out = make([]PolicyStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -92,7 +95,11 @@ func (in *AppStatus) DeepCopy() *AppStatus {
 // 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
-	in.Properties.DeepCopyInto(&out.Properties)
+	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))
@@ -163,7 +170,11 @@ func (in *ApplicationComponentStatus) DeepCopy() *ApplicationComponentStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
 	*out = *in
-	in.Properties.DeepCopyInto(&out.Properties)
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTrait.
@@ -387,6 +398,41 @@ 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
@@ -403,6 +449,64 @@ 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
@@ -439,7 +543,7 @@ func (in *Schematic) DeepCopyInto(out *Schematic) {
 	if in.Terraform != nil {
 		in, out := &in.Terraform, &out.Terraform
 		*out = new(Terraform)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 }
 
@@ -529,6 +633,7 @@ func (in *SubStepsStatus) DeepCopy() *SubStepsStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Terraform) DeepCopyInto(out *Terraform) {
 	*out = *in
+	in.BaseConfigurationSpec.DeepCopyInto(&out.BaseConfigurationSpec)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
@@ -556,6 +661,7 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	in.StartTime.DeepCopyInto(&out.StartTime)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
@@ -568,6 +674,41 @@ func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
 	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.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 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 *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
 	*out = *in
@@ -576,6 +717,8 @@ func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
 		*out = new(SubStepsStatus)
 		(*in).DeepCopyInto(*out)
 	}
+	in.FirstExecuteTime.DeepCopyInto(&out.FirstExecuteTime)
+	in.LastExecuteTime.DeepCopyInto(&out.LastExecuteTime)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.

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

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*

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

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

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

@@ -0,0 +1,74 @@
+/*
+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"`
+}
+
+// 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/envbinding_types.go

@@ -17,48 +17,63 @@
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
-// ClusterManagementEngine represents a multi-cluster management solution
-type ClusterManagementEngine string
-
 const (
-	// OCMEngine represents Open-Cluster-Management multi-cluster management solution
-	OCMEngine ClusterManagementEngine = "ocm"
-
-	// SingleClusterEngine represents single cluster ClusterManagerEngine
-	SingleClusterEngine ClusterManagementEngine = "single-cluster"
-
-	// ClusterGatewayEngine represents multi-cluster management solution with cluster-gateway
-	ClusterGatewayEngine ClusterManagementEngine = "cluster-gateway"
+	// EnvBindingPolicyType refers to the type of EnvBinding
+	EnvBindingPolicyType = "env-binding"
 )
 
-// EnvBindingPhase is a label for the condition of a EnvBinding at the current time
-type EnvBindingPhase string
+// EnvTraitPatch is the patch to trait
+type EnvTraitPatch struct {
+	Type       string                `json:"type"`
+	Properties *runtime.RawExtension `json:"properties,omitempty"`
+	Disable    bool                  `json:"disable,omitempty"`
+}
 
-const (
-	// EnvBindingPrepare means EnvBinding is preparing the pre-work for cluster scheduling
-	EnvBindingPrepare EnvBindingPhase = "preparing"
+// 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
+}
 
-	// EnvBindingRendering means EnvBinding is rendering the apps in different envs
-	EnvBindingRendering EnvBindingPhase = "rendering"
+// 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"`
+}
 
-	// EnvBindingScheduling means EnvBinding is deciding which cluster the apps is scheduled to.
-	EnvBindingScheduling EnvBindingPhase = "scheduling"
-
-	// EnvBindingFinished means EnvBinding finished env binding
-	EnvBindingFinished EnvBindingPhase = "finished"
-)
+// 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 []common.ApplicationComponent `json:"components"`
+	Components []EnvComponentPatch `json:"components,omitempty"`
 }
 
 // NamespaceSelector defines the rules to select a Namespace resource.
@@ -86,90 +101,39 @@ type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
 	Selector  *EnvSelector `json:"selector,omitempty"`
-	Patch     EnvPatch     `json:"patch"`
+	Patch     EnvPatch     `json:"patch,omitempty"`
 }
 
-// AppTemplate represents a application to be configured.
-type AppTemplate struct {
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	runtime.RawExtension `json:",inline"`
-}
-
-// ClusterDecision recorded the mapping of environment and cluster
-type ClusterDecision struct {
-	Env       string `json:"env"`
-	Cluster   string `json:"cluster,omitempty"`
-	Namespace string `json:"namespace,omitempty"`
-}
-
-// A ConfigMapReference is a reference to a configMap in an arbitrary namespace.
-type ConfigMapReference struct {
-	// Name of the secret.
-	Name string `json:"name"`
-
-	// Namespace of the secret.
-	Namespace string `json:"namespace,omitempty"`
-}
-
-// A EnvBindingSpec defines the desired state of a EnvBinding.
+// EnvBindingSpec defines a list of envs
 type EnvBindingSpec struct {
-	Engine ClusterManagementEngine `json:"engine,omitempty"`
-
-	// AppTemplate indicates the application template.
-	AppTemplate AppTemplate `json:"appTemplate"`
-
 	Envs []EnvConfig `json:"envs"`
-
-	// OutputResourcesTo specifies the namespace and name of a ConfigMap
-	// which store the resources rendered after differentiated configuration
-	// +optional
-	OutputResourcesTo *ConfigMapReference `json:"outputResourcesTo,omitempty"`
 }
 
-// A EnvBindingStatus is the status of EnvBinding
+// 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 {
+	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 {
-	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
-
-	Phase EnvBindingPhase `json:"phase,omitempty"`
-
-	ClusterDecisions []ClusterDecision `json:"clusterDecisions,omitempty"`
-
-	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
-}
-
-// EnvBinding is the Schema for the EnvBinding API
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=envbind
-// +kubebuilder:printcolumn:name="ENGINE",type=string,JSONPath=`.spec.engine`
-// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type EnvBinding struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   EnvBindingSpec   `json:"spec,omitempty"`
-	Status EnvBindingStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// EnvBindingList contains a list of EnvBinding.
-type EnvBindingList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EnvBinding `json:"items"`
-}
-
-// SetConditions set condition for EnvBinding
-func (e *EnvBinding) SetConditions(c ...condition.Condition) {
-	e.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from EnvBinding
-func (e *EnvBinding) GetCondition(conditionType condition.ConditionType) condition.Condition {
-	return e.Status.GetCondition(conditionType)
+	Envs               []EnvStatus         `json:"envs"`
+	ClusterConnections []ClusterConnection `json:"clusterConnections"`
 }

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

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

@@ -0,0 +1,91 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
+)
+
+const (
+	// GarbageCollectPolicyType refers to the type of garbage-collect
+	GarbageCollectPolicyType = "garbage-collect"
+)
+
+// GarbageCollectPolicySpec defines the spec of configuration drift
+type GarbageCollectPolicySpec struct {
+	// KeepLegacyResource if is set, outdated versioned resourcetracker will not be recycled automatically
+	// outdated resources will be kept until resourcetracker be deleted manually
+	KeepLegacyResource bool `json:"keepLegacyResource,omitempty"`
+
+	// Rules defines list of rules to control gc strategy at resource level
+	// if one resource is controlled by multiple rules, first rule will be used
+	Rules []GarbageCollectPolicyRule `json:"rules,omitempty"`
+}
+
+// GarbageCollectPolicyRule defines a single garbage-collect policy rule
+type GarbageCollectPolicyRule struct {
+	Selector GarbageCollectPolicyRuleSelector `json:"selector"`
+	Strategy GarbageCollectStrategy           `json:"strategy"`
+}
+
+// GarbageCollectPolicyRuleSelector select the targets of the rule
+// if both traitTypes and componentTypes are specified, combination logic is OR
+// if one resource is specified with conflict strategies, strategy as component go first.
+type GarbageCollectPolicyRuleSelector struct {
+	CompNames  []string `json:"componentNames"`
+	CompTypes  []string `json:"componentTypes"`
+	TraitTypes []string `json:"traitTypes"`
+}
+
+// GarbageCollectStrategy the strategy for target resource to recycle
+type GarbageCollectStrategy string
+
+const (
+	// GarbageCollectStrategyNever do not recycle target resource, leave it
+	GarbageCollectStrategyNever GarbageCollectStrategy = "never"
+	// GarbageCollectStrategyOnAppDelete do not recycle target resource until application is deleted
+	// this means the resource will be kept even it is not used in the latest version
+	GarbageCollectStrategyOnAppDelete GarbageCollectStrategy = "onAppDelete"
+	// GarbageCollectStrategyOnAppUpdate recycle target resource when it is not inUse
+	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
+)
+
+// FindStrategy find gc strategy for target resource
+func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
+	for _, rule := range in.Rules {
+		var compName, compType, traitType string
+		if labels := manifest.GetLabels(); labels != nil {
+			compName = labels[oam.LabelAppComponent]
+			compType = labels[oam.WorkloadTypeLabel]
+			traitType = labels[oam.TraitTypeLabel]
+		}
+		match := func(src []string, val string) (found bool) {
+			for _, _val := range src {
+				found = found || _val == val
+			}
+			return val != "" && found
+		}
+		if match(rule.Selector.CompNames, compName) ||
+			match(rule.Selector.CompTypes, compType) ||
+			match(rule.Selector.TraitTypes, traitType) {
+			return &rule.Strategy
+		}
+	}
+	return nil
+}

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

@@ -0,0 +1,125 @@
+/*
+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: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input: &unstructured.Unstructured{Object: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
+				},
+			}},
+			expectStrategy: GarbageCollectStrategyNever,
+		},
+		"trait type rule mismatch": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input:    &unstructured.Unstructured{Object: map[string]interface{}{}},
+			notFound: true,
+		},
+		"trait type rule multiple match": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyOnAppDelete,
+			}, {
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input: &unstructured.Unstructured{Object: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
+				},
+			}},
+			expectStrategy: GarbageCollectStrategyOnAppDelete,
+		},
+		"component type rule match": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{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: GarbageCollectPolicyRuleSelector{CompTypes: []string{"comp"}},
+					Strategy: GarbageCollectStrategyNever,
+				},
+				{
+					Selector: GarbageCollectPolicyRuleSelector{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: GarbageCollectPolicyRuleSelector{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,
+		},
+	}
+	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

@@ -0,0 +1,53 @@
+/*
+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 (
+	// TopologyPolicyType refers to the type of topology policy
+	TopologyPolicyType = "topology"
+	// OverridePolicyType refers to the type of override policy
+	OverridePolicyType = "override"
+)
+
+// 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"`
+}

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

@@ -17,8 +17,6 @@
 package v1alpha1
 
 import (
-	"reflect"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
@@ -35,16 +33,24 @@ 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
 )
 
-// EnvBinding type metadata.
+// Policy meta
 var (
-	EnvBindingKind            = reflect.TypeOf(EnvBinding{}).Name()
-	EnvBindingGroupKind       = schema.GroupKind{Group: Group, Kind: EnvBindingKind}.String()
-	EnvBindingKindAPIVersion  = EnvBindingKind + "." + SchemeGroupVersion.String()
-	EnvBindingKindVersionKind = SchemeGroupVersion.WithKind(EnvBindingKind)
+	PolicyKind             = "Policy"
+	PolicyGroupVersionKind = SchemeGroupVersion.WithKind(PolicyKind)
+)
+
+// Workflow meta
+var (
+	WorkflowKind             = "Workflow"
+	WorkflowGroupVersionKind = SchemeGroupVersion.WithKind(WorkflowKind)
 )
 
 func init() {
-	SchemeBuilder.Register(&EnvBinding{}, &EnvBindingList{})
+	SchemeBuilder.Register(&Policy{}, &PolicyList{})
+	SchemeBuilder.Register(&Workflow{}, &WorkflowList{})
 }

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

@@ -1,116 +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 (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-)
-
-// WorkflowStepPhase describes the phase of a workflow step.
-type WorkflowStepPhase string
-
-const (
-	// WorkflowStepPhaseSucceeded will make the controller run the next step.
-	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
-	// WorkflowStepPhaseFailed will make the controller stop the workflow and report error in `message`.
-	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
-	// WorkflowStepPhaseTerminated will make the controller terminate the workflow.
-	WorkflowStepPhaseTerminated WorkflowStepPhase = "terminated"
-	// WorkflowStepPhaseSuspending will make the controller suspend the workflow.
-	WorkflowStepPhaseSuspending WorkflowStepPhase = "suspending"
-	// WorkflowStepPhaseRunning will make the controller continue the workflow.
-	WorkflowStepPhaseRunning WorkflowStepPhase = "running"
-)
-
-// WorkflowStep defines how to execute a workflow step.
-type WorkflowStep struct {
-	// Name is the unique name of the workflow step.
-	Name string `json:"name"`
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
-	Inputs     common.StepInputs    `json:"inputs,omitempty"`
-	Outputs    common.StepOutputs   `json:"outputs,omitempty"`
-}
-
-// A WorkflowSpec defines the desired state of a Workflow.
-type WorkflowSpec struct {
-	Steps []WorkflowStep `json:"steps,omitempty"`
-}
-
-// A WorkflowStatus is the status of Workflow
-type WorkflowStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
-	ObservedGeneration          int64                   `json:"observedGeneration,omitempty"`
-	StepIndex                   int                     `json:"stepIndex,omitempty"`
-	Suspend                     bool                    `json:"suspend"`
-	Terminated                  bool                    `json:"terminated"`
-	ContextBackend              *corev1.ObjectReference `json:"contextBackend"`
-	Steps                       []WorkflowStepStatus    `json:"steps,omitempty"`
-}
-
-// WorkflowStepStatus record the status of a workflow step
-type WorkflowStepStatus struct {
-	Name  string            `json:"name,omitempty"`
-	Type  string            `json:"type,omitempty"`
-	Phase WorkflowStepPhase `json:"phase,omitempty"`
-	// 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"`
-	ResourceRef corev1.ObjectReference `json:"resourceRef,omitempty"`
-}
-
-// Workflow is the Schema for the Workflow API
-// +kubebuilder:object:root=true
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workflow
-// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type Workflow struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   WorkflowSpec   `json:"spec,omitempty"`
-	Status WorkflowStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// WorkflowList contains a list of Workflow.
-type WorkflowList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Workflow `json:"items"`
-}
-
-// SetConditions set condition for Workflow
-func (w *Workflow) SetConditions(c ...condition.Condition) {
-	w.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from Workflow
-func (w *Workflow) GetCondition(conditionType condition.ConditionType) condition.Condition {
-	return w.Status.GetCondition(conditionType)
-}

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

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -21,121 +22,44 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppTemplate) DeepCopyInto(out *AppTemplate) {
+func (in *ApplyOncePolicySpec) DeepCopyInto(out *ApplyOncePolicySpec) {
 	*out = *in
-	in.RawExtension.DeepCopyInto(&out.RawExtension)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppTemplate.
-func (in *AppTemplate) DeepCopy() *AppTemplate {
+// 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(AppTemplate)
+	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 *ClusterDecision) DeepCopyInto(out *ClusterDecision) {
+func (in *ClusterConnection) DeepCopyInto(out *ClusterConnection) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterDecision.
-func (in *ClusterDecision) DeepCopy() *ClusterDecision {
+// 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(ClusterDecision)
+	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 *ConfigMapReference) DeepCopyInto(out *ConfigMapReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigMapReference.
-func (in *ConfigMapReference) DeepCopy() *ConfigMapReference {
-	if in == nil {
-		return nil
-	}
-	out := new(ConfigMapReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvBinding) DeepCopyInto(out *EnvBinding) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBinding.
-func (in *EnvBinding) DeepCopy() *EnvBinding {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvBinding)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EnvBinding) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EnvBindingList) DeepCopyInto(out *EnvBindingList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]EnvBinding, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingList.
-func (in *EnvBindingList) DeepCopy() *EnvBindingList {
-	if in == nil {
-		return nil
-	}
-	out := new(EnvBindingList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EnvBindingList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvBindingSpec) DeepCopyInto(out *EnvBindingSpec) {
 	*out = *in
-	in.AppTemplate.DeepCopyInto(&out.AppTemplate)
 	if in.Envs != nil {
 		in, out := &in.Envs, &out.Envs
 		*out = make([]EnvConfig, len(*in))
@@ -143,11 +67,6 @@ func (in *EnvBindingSpec) DeepCopyInto(out *EnvBindingSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.OutputResourcesTo != nil {
-		in, out := &in.OutputResourcesTo, &out.OutputResourcesTo
-		*out = new(ConfigMapReference)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingSpec.
@@ -163,16 +82,17 @@ func (in *EnvBindingSpec) DeepCopy() *EnvBindingSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvBindingStatus) DeepCopyInto(out *EnvBindingStatus) {
 	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.ClusterDecisions != nil {
-		in, out := &in.ClusterDecisions, &out.ClusterDecisions
-		*out = make([]ClusterDecision, len(*in))
-		copy(*out, *in)
+	if in.Envs != nil {
+		in, out := &in.Envs, &out.Envs
+		*out = make([]EnvStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
-	if in.ResourceTracker != nil {
-		in, out := &in.ResourceTracker, &out.ResourceTracker
-		*out = new(v1.ObjectReference)
-		**out = **in
+	if in.ClusterConnections != nil {
+		in, out := &in.ClusterConnections, &out.ClusterConnections
+		*out = make([]ClusterConnection, len(*in))
+		copy(*out, *in)
 	}
 }
 
@@ -186,6 +106,33 @@ func (in *EnvBindingStatus) DeepCopy() *EnvBindingStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvComponentPatch) DeepCopyInto(out *EnvComponentPatch) {
+	*out = *in
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Traits != nil {
+		in, out := &in.Traits, &out.Traits
+		*out = make([]EnvTraitPatch, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvComponentPatch.
+func (in *EnvComponentPatch) DeepCopy() *EnvComponentPatch {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvComponentPatch)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EnvConfig) DeepCopyInto(out *EnvConfig) {
 	*out = *in
@@ -213,7 +160,7 @@ func (in *EnvPatch) DeepCopyInto(out *EnvPatch) {
 	*out = *in
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]common.ApplicationComponent, len(*in))
+		*out = make([]EnvComponentPatch, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -275,6 +222,129 @@ func (in *EnvSelector) DeepCopy() *EnvSelector {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvStatus) DeepCopyInto(out *EnvStatus) {
+	*out = *in
+	if in.Placements != nil {
+		in, out := &in.Placements, &out.Placements
+		*out = make([]PlacementDecision, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvStatus.
+func (in *EnvStatus) DeepCopy() *EnvStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvTraitPatch) DeepCopyInto(out *EnvTraitPatch) {
+	*out = *in
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvTraitPatch.
+func (in *EnvTraitPatch) DeepCopy() *EnvTraitPatch {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvTraitPatch)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicyRule) DeepCopyInto(out *GarbageCollectPolicyRule) {
+	*out = *in
+	in.Selector.DeepCopyInto(&out.Selector)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRule.
+func (in *GarbageCollectPolicyRule) DeepCopy() *GarbageCollectPolicyRule {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicyRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicyRuleSelector) DeepCopyInto(out *GarbageCollectPolicyRuleSelector) {
+	*out = *in
+	if in.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.TraitTypes != nil {
+		in, out := &in.TraitTypes, &out.TraitTypes
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRuleSelector.
+func (in *GarbageCollectPolicyRuleSelector) DeepCopy() *GarbageCollectPolicyRuleSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicyRuleSelector)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicySpec) DeepCopyInto(out *GarbageCollectPolicySpec) {
+	*out = *in
+	if in.Rules != nil {
+		in, out := &in.Rules, &out.Rules
+		*out = make([]GarbageCollectPolicyRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicySpec.
+func (in *GarbageCollectPolicySpec) DeepCopy() *GarbageCollectPolicySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicySpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *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
@@ -297,13 +367,256 @@ func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
 	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])
+		}
+	}
+}
+
+// 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 *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)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
+	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.
@@ -355,93 +668,3 @@ func (in *WorkflowList) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowSpec) DeepCopyInto(out *WorkflowSpec) {
-	*out = *in
-	if in.Steps != nil {
-		in, out := &in.Steps, &out.Steps
-		*out = make([]WorkflowStep, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSpec.
-func (in *WorkflowSpec) DeepCopy() *WorkflowSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	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))
-		copy(*out, *in)
-	}
-}
-
-// 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
-	in.Properties.DeepCopyInto(&out.Properties)
-	if in.Inputs != nil {
-		in, out := &in.Inputs, &out.Inputs
-		*out = make(common.StepInputs, len(*in))
-		copy(*out, *in)
-	}
-	if in.Outputs != nil {
-		in, out := &in.Outputs, &out.Outputs
-		*out = make(common.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 *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
-	*out = *in
-	out.ResourceRef = in.ResourceRef
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.
-func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowStepStatus)
-	in.DeepCopyInto(out)
-	return out
-}

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

@@ -54,7 +54,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

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

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

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

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
@@ -44,7 +45,7 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 		for j, trait := range comp.Traits {
 			traits[j] = common.ApplicationTrait{
 				Type:       trait.Name,
-				Properties: *trait.Properties.DeepCopy(),
+				Properties: trait.Properties.DeepCopy(),
 			}
 		}
 
@@ -58,13 +59,11 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 		v1b1.Spec.Components = append(v1b1.Spec.Components, common.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()
@@ -104,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(),
 				}
 			}
 
@@ -115,16 +114,21 @@ 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:     *comp.Properties.DeepCopy(),
+				Settings:     compProperties,
 				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

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

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

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

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

@@ -64,16 +64,6 @@ func (cm *Component) SetConditions(c ...condition.Condition) {
 	cm.Status.SetConditions(c...)
 }
 
-// GetCondition of this ContainerizedWorkload.
-func (wl *ContainerizedWorkload) GetCondition(ct condition.ConditionType) condition.Condition {
-	return wl.Status.GetCondition(ct)
-}
-
-// SetConditions of this ContainerizedWorkload.
-func (wl *ContainerizedWorkload) SetConditions(c ...condition.Condition) {
-	wl.Status.SetConditions(c...)
-}
-
 // GetCondition of this HealthScope.
 func (hs *HealthScope) GetCondition(ct condition.ConditionType) condition.Condition {
 	return hs.Status.GetCondition(ct)

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

@@ -85,14 +85,6 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )
 
-// ContainerizedWorkload type metadata.
-var (
-	ContainerizedWorkloadKind             = reflect.TypeOf(ContainerizedWorkload{}).Name()
-	ContainerizedWorkloadGroupKind        = schema.GroupKind{Group: Group, Kind: ContainerizedWorkloadKind}.String()
-	ContainerizedWorkloadKindAPIVersion   = ContainerizedWorkloadKind + "." + SchemeGroupVersion.String()
-	ContainerizedWorkloadGroupVersionKind = SchemeGroupVersion.WithKind(ContainerizedWorkloadKind)
-)
-
 // ManualScalerTrait type metadata.
 var (
 	ManualScalerTraitKind             = reflect.TypeOf(ManualScalerTrait{}).Name()
@@ -117,14 +109,6 @@ 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()
@@ -140,10 +124,8 @@ 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{})
 }

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

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -76,107 +77,6 @@ func (in *AppReference) DeepCopy() *AppReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRollout) DeepCopyInto(out *AppRollout) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
-func (in *AppRollout) DeepCopy() *AppRollout {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRollout) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppRollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
-func (in *AppRolloutList) DeepCopy() *AppRolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
-	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-	if in.RevertOnDelete != nil {
-		in, out := &in.RevertOnDelete, &out.RevertOnDelete
-		*out = new(bool)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
-func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
@@ -600,7 +500,11 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationTrait) DeepCopyInto(out *ApplicationTrait) {
 	*out = *in
-	in.Properties.DeepCopyInto(&out.Properties)
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationTrait.
@@ -1209,118 +1113,6 @@ func (in *ContainerResources) DeepCopy() *ContainerResources {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedWorkload) DeepCopyInto(out *ContainerizedWorkload) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkload.
-func (in *ContainerizedWorkload) DeepCopy() *ContainerizedWorkload {
-	if in == nil {
-		return nil
-	}
-	out := new(ContainerizedWorkload)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ContainerizedWorkload) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedWorkloadList) DeepCopyInto(out *ContainerizedWorkloadList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ContainerizedWorkload, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadList.
-func (in *ContainerizedWorkloadList) DeepCopy() *ContainerizedWorkloadList {
-	if in == nil {
-		return nil
-	}
-	out := new(ContainerizedWorkloadList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ContainerizedWorkloadList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedWorkloadSpec) DeepCopyInto(out *ContainerizedWorkloadSpec) {
-	*out = *in
-	if in.OperatingSystem != nil {
-		in, out := &in.OperatingSystem, &out.OperatingSystem
-		*out = new(OperatingSystem)
-		**out = **in
-	}
-	if in.CPUArchitecture != nil {
-		in, out := &in.CPUArchitecture, &out.CPUArchitecture
-		*out = new(CPUArchitecture)
-		**out = **in
-	}
-	if in.Containers != nil {
-		in, out := &in.Containers, &out.Containers
-		*out = make([]Container, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadSpec.
-func (in *ContainerizedWorkloadSpec) DeepCopy() *ContainerizedWorkloadSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ContainerizedWorkloadSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedWorkloadStatus) DeepCopyInto(out *ContainerizedWorkloadStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Resources != nil {
-		in, out := &in.Resources, &out.Resources
-		*out = make([]v1.ObjectReference, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadStatus.
-func (in *ContainerizedWorkloadStatus) DeepCopy() *ContainerizedWorkloadStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ContainerizedWorkloadStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataInput) DeepCopyInto(out *DataInput) {
 	*out = *in

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

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

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

@@ -17,12 +17,14 @@
 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 (
@@ -44,28 +46,15 @@ type AppPolicy 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 struct {
-	// Name is the unique name of the workflow step.
-	Name string `json:"name"`
-
-	Type string `json:"type"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties runtime.RawExtension `json:"properties,omitempty"`
-
-	DependsOn []string `json:"dependsOn,omitempty"`
-
-	Inputs common.StepInputs `json:"inputs,omitempty"`
-
-	Outputs common.StepOutputs `json:"outputs,omitempty"`
-}
+type WorkflowStep common.WorkflowStep
 
 // Workflow defines workflow steps and other attributes
 type Workflow struct {
+	Ref   string         `json:"ref,omitempty"`
 	Steps []WorkflowStep `json:"steps,omitempty"`
 }
 
@@ -86,11 +75,6 @@ type ApplicationSpec struct {
 	Workflow *Workflow `json:"workflow,omitempty"`
 
 	// TODO(wonderflow): we should have application level scopes supported here
-
-	// RolloutPlan is the details on how to rollout the resources
-	// The controller simply replace the old resources with the new one if there is no rollout plan involved
-	// +optional
-	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -144,3 +128,36 @@ 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

@@ -17,11 +17,10 @@
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"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.
@@ -52,19 +51,23 @@ type ApplicationRevisionSpec struct {
 	// ScopeGVK records the apiVersion to GVK mapping
 	ScopeGVK map[string]metav1.GroupVersionKind `json:"scopeGVK,omitempty"`
 
-	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
-	// +deprecated
-	Components []common.RawComponent `json:"components,omitempty"`
+	// Policies records the external policies
+	Policies map[string]v1alpha1.Policy `json:"policies,omitempty"`
 
-	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
-	// it will contains the whole K8s CR of trait and the reference component in it.
-	// +kubebuilder:validation:EmbeddedResource
+	// Workflow records the external workflow
+	Workflow *v1alpha1.Workflow `json:"workflow,omitempty"`
+
+	// ReferredObjects records the referred objects used in the ref-object typed components
 	// +kubebuilder:pruning:PreserveUnknownFields
-	// +deprecated
-	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration,omitempty"`
+	ReferredObjects []common.ReferredObject `json:"referredObjects,omitempty"`
+}
 
-	// ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
-	ResourcesConfigMap corev1.LocalObjectReference `json:"resourcesConfigMap,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"`
 }
 
 // +kubebuilder:object:root=true
@@ -72,14 +75,18 @@ type ApplicationRevisionSpec 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"`
+	Spec   ApplicationRevisionSpec   `json:"spec,omitempty"`
+	Status ApplicationRevisionStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

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

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

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

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

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

@@ -17,7 +17,6 @@
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -257,32 +256,3 @@ type ScopeDefinitionList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ScopeDefinition `json:"items"`
 }
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
-type ResourceTracker struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Status ResourceTrackerStatus `json:"status,omitempty"`
-}
-
-// ResourceTrackerStatus define the status of resourceTracker
-type ResourceTrackerStatus struct {
-	TrackedResources []corev1.ObjectReference `json:"trackedResources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ResourceTrackerList contains a list of ResourceTracker
-type ResourceTrackerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ResourceTracker `json:"items"`
-}

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

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

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

@@ -61,7 +61,7 @@ func (d *PolicyDefinition) GetCondition(conditionType condition.ConditionType) c
 // +kubebuilder:object:root=true
 
 // PolicyDefinition is the Schema for the policydefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=policy
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=def-policy
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +genclient

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

@@ -96,14 +96,6 @@ 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()
@@ -128,30 +120,6 @@ var (
 	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
 )
 
-// AppDeployment type metadata.
-var (
-	AppDeploymentKind            = reflect.TypeOf(AppDeployment{}).Name()
-	AppDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: AppDeploymentKind}.String()
-	AppDeploymentKindAPIVersion  = AppDeploymentKind + "." + SchemeGroupVersion.String()
-	AppDeploymentKindVersionKind = SchemeGroupVersion.WithKind(AppDeploymentKind)
-)
-
-// Cluster type metadata.
-var (
-	ClusterKind            = reflect.TypeOf(Cluster{}).Name()
-	ClusterGroupKind       = schema.GroupKind{Group: Group, Kind: ClusterKind}.String()
-	ClusterKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ClusterKindVersionKind = SchemeGroupVersion.WithKind(ClusterKind)
-)
-
-// Initializer type metadata.
-var (
-	InitializerKind            = reflect.TypeOf(Initializer{}).Name()
-	InitializerGroupKind       = schema.GroupKind{Group: Group, Kind: InitializerKind}.String()
-	InitializerKindAPIVersion  = InitializerKind + "." + SchemeGroupVersion.String()
-	InitializerKindVersionKind = SchemeGroupVersion.WithKind(InitializerKind)
-)
-
 func init() {
 	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
@@ -161,12 +129,8 @@ func init() {
 	SchemeBuilder.Register(&DefinitionRevision{}, &DefinitionRevisionList{})
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
-	SchemeBuilder.Register(&AppDeployment{}, &AppDeploymentList{})
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
-	SchemeBuilder.Register(&Initializer{}, &InitializerList{})
 }
 
 // Resource takes an unqualified resource and returns a Group qualified GroupResource

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

@@ -0,0 +1,283 @@
+/*
+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"`
+}
+
+// Equal check if two managed resource equals
+func (in ManagedResource) Equal(r ManagedResource) bool {
+	if !in.ClusterObjectReference.Equal(r.ClusterObjectReference) {
+		return false
+	}
+	if !in.OAMObjectReference.Equal(r.OAMObjectReference) {
+		return false
+	}
+	return reflect.DeepEqual(in.Data, r.Data)
+}
+
+// DisplayName readable name for locating resource
+func (in ManagedResource) DisplayName() string {
+	s := in.Kind + " " + in.Name
+	if in.Namespace != "" || in.Cluster != "" {
+		s += " ("
+		if in.Cluster != "" {
+			s += "Cluster: " + in.Cluster
+			if in.Namespace != "" {
+				s += ", "
+			}
+		}
+		if in.Namespace != "" {
+			s += "Namespace: " + in.Namespace
+		}
+		s += ")"
+	}
+	return s
+}
+
+// NamespacedName namespacedName
+func (in ManagedResource) NamespacedName() types.NamespacedName {
+	return types.NamespacedName{Namespace: in.Namespace, Name: in.Name}
+}
+
+// ResourceKey computes the key for managed resource, resources with the same key points to the same resource
+func (in ManagedResource) ResourceKey() string {
+	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
+	cluster := in.Cluster
+	if cluster == "" {
+		cluster = velatypes.ClusterLocalName
+	}
+	return strings.Join([]string{gv, 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
+}
+
+// AddManagedResource add object to managed resources, if exists, update
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) (updated bool) {
+	gvk := rsc.GetObjectKind().GroupVersionKind()
+	mr := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{
+			ObjectReference: v1.ObjectReference{
+				APIVersion: gvk.GroupVersion().String(),
+				Kind:       gvk.Kind,
+				Name:       rsc.GetName(),
+				Namespace:  rsc.GetNamespace(),
+			},
+			Cluster: oam.GetCluster(rsc),
+		},
+		OAMObjectReference: common.NewOAMObjectReferenceFromObject(rsc),
+		Deleted:            false,
+	}
+	if !metaOnly {
+		mr.Data = &runtime.RawExtension{Object: rsc}
+	}
+	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
+		if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
+			return false
+		}
+		in.Spec.ManagedResources[idx] = mr
+	} else {
+		in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
+	}
+	return true
+}
+
+// DeleteManagedResource if remove flag is on, it will remove the object from recorded resources.
+// otherwise, it will mark the object as deleted instead of removing it
+// workflow   stage: resources are marked as deleted (and execute the deletion action)
+// state-keep stage: resources marked as deleted and successfully deleted will be removed from resourcetracker
+func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool) (updated bool) {
+	gvk := rsc.GetObjectKind().GroupVersionKind()
+	mr := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{
+			ObjectReference: v1.ObjectReference{
+				APIVersion: gvk.GroupVersion().String(),
+				Kind:       gvk.Kind,
+				Name:       rsc.GetName(),
+				Namespace:  rsc.GetNamespace(),
+			},
+			Cluster: oam.GetCluster(rsc),
+		},
+		Deleted: true,
+	}
+	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
+		if remove {
+			in.Spec.ManagedResources = append(in.Spec.ManagedResources[:idx], in.Spec.ManagedResources[idx+1:]...)
+		} else {
+			if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
+				return false
+			}
+			in.Spec.ManagedResources[idx] = mr
+		}
+	} else {
+		if !remove {
+			in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
+		}
+	}
+	return true
+}
+
+// addClusterObjectReference
+// Deprecated
+func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectReference) bool {
+	for _, _rsc := range in.Status.TrackedResources {
+		if _rsc.Equal(ref) {
+			return true
+		}
+	}
+	in.Status.TrackedResources = append(in.Status.TrackedResources, ref)
+	return false
+}
+
+// AddTrackedResource add new object reference into tracked resources, return if already exists
+// Deprecated
+func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
+	return in.addClusterObjectReference(common.ClusterObjectReference{
+		ObjectReference: v1.ObjectReference{
+			APIVersion: rsc.GetAPIVersion(),
+			Kind:       rsc.GetKind(),
+			Name:       rsc.GetName(),
+			Namespace:  rsc.GetNamespace(),
+			UID:        rsc.GetUID(),
+		},
+	})
+}

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

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

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

@@ -38,7 +38,8 @@ type WorkflowStepDefinitionSpec struct {
 type WorkflowStepDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
 	condition.ConditionedStatus `json:",inline"`
-
+	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+	ConfigMapRef string `json:"configMapRef,omitempty"`
 	// LatestRevision of the component definition
 	// +optional
 	LatestRevision *common.Revision `json:"latestRevision,omitempty"`

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

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -21,127 +22,21 @@ limitations under the License.
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeployment) DeepCopyInto(out *AppDeployment) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeployment.
-func (in *AppDeployment) DeepCopy() *AppDeployment {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeployment)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppDeployment) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentList) DeepCopyInto(out *AppDeploymentList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppDeployment, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentList.
-func (in *AppDeploymentList) DeepCopy() *AppDeploymentList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppDeploymentList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentSpec) DeepCopyInto(out *AppDeploymentSpec) {
-	*out = *in
-	if in.Traffic != nil {
-		in, out := &in.Traffic, &out.Traffic
-		*out = new(Traffic)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.AppRevisions != nil {
-		in, out := &in.AppRevisions, &out.AppRevisions
-		*out = make([]AppRevision, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentSpec.
-func (in *AppDeploymentSpec) DeepCopy() *AppDeploymentSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentStatus) DeepCopyInto(out *AppDeploymentStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Placement != nil {
-		in, out := &in.Placement, &out.Placement
-		*out = make([]PlacementStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentStatus.
-func (in *AppDeploymentStatus) DeepCopy() *AppDeploymentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppPolicy) DeepCopyInto(out *AppPolicy) {
 	*out = *in
-	in.Properties.DeepCopyInto(&out.Properties)
+	if in.Properties != nil {
+		in, out := &in.Properties, &out.Properties
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppPolicy.
@@ -154,108 +49,6 @@ func (in *AppPolicy) DeepCopy() *AppPolicy {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRevision) DeepCopyInto(out *AppRevision) {
-	*out = *in
-	if in.Placement != nil {
-		in, out := &in.Placement, &out.Placement
-		*out = make([]common.ClusterPlacement, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevision.
-func (in *AppRevision) DeepCopy() *AppRevision {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRevision)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRollout) DeepCopyInto(out *AppRollout) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
-func (in *AppRollout) DeepCopy() *AppRollout {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRollout) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppRollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
-func (in *AppRolloutList) DeepCopy() *AppRolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
-	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
-func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Application) DeepCopyInto(out *Application) {
 	*out = *in
@@ -321,6 +114,7 @@ func (in *ApplicationRevision) DeepCopyInto(out *ApplicationRevision) {
 	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 ApplicationRevision.
@@ -426,15 +220,25 @@ func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 			(*out)[key] = val
 		}
 	}
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]common.RawComponent, len(*in))
+	if in.Policies != nil {
+		in, out := &in.Policies, &out.Policies
+		*out = make(map[string]v1alpha1.Policy, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.Workflow != nil {
+		in, out := &in.Workflow, &out.Workflow
+		*out = new(v1alpha1.Workflow)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ReferredObjects != nil {
+		in, out := &in.ReferredObjects, &out.ReferredObjects
+		*out = make([]common.ReferredObject, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	in.ApplicationConfiguration.DeepCopyInto(&out.ApplicationConfiguration)
-	out.ResourcesConfigMap = in.ResourcesConfigMap
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
@@ -447,6 +251,26 @@ func (in *ApplicationRevisionSpec) DeepCopy() *ApplicationRevisionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationRevisionStatus) DeepCopyInto(out *ApplicationRevisionStatus) {
+	*out = *in
+	if in.Workflow != nil {
+		in, out := &in.Workflow, &out.Workflow
+		*out = new(common.WorkflowStatus)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionStatus.
+func (in *ApplicationRevisionStatus) DeepCopy() *ApplicationRevisionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	*out = *in
@@ -469,11 +293,6 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 		*out = new(Workflow)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.RolloutPlan != nil {
-		in, out := &in.RolloutPlan, &out.RolloutPlan
-		*out = new(v1alpha1.RolloutPlan)
-		(*in).DeepCopyInto(*out)
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.
@@ -486,111 +305,6 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Cluster) DeepCopyInto(out *Cluster) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
-	out.Status = in.Status
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
-func (in *Cluster) DeepCopy() *Cluster {
-	if in == nil {
-		return nil
-	}
-	out := new(Cluster)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Cluster) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterList) DeepCopyInto(out *ClusterList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Cluster, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList.
-func (in *ClusterList) DeepCopy() *ClusterList {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterPlacementStatus) DeepCopyInto(out *ClusterPlacementStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacementStatus.
-func (in *ClusterPlacementStatus) DeepCopy() *ClusterPlacementStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterPlacementStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
-	*out = *in
-	out.KubeconfigSecretRef = in.KubeconfigSecretRef
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
-func (in *ClusterSpec) DeepCopy() *ClusterSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStatus.
-func (in *ClusterStatus) DeepCopy() *ClusterStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentDefinition) DeepCopyInto(out *ComponentDefinition) {
 	*out = *in
@@ -787,199 +501,23 @@ func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DependsOn) DeepCopyInto(out *DependsOn) {
+func (in *ManagedResource) DeepCopyInto(out *ManagedResource) {
 	*out = *in
-	out.Ref = in.Ref
+	out.ClusterObjectReference = in.ClusterObjectReference
+	out.OAMObjectReference = in.OAMObjectReference
+	if in.Data != nil {
+		in, out := &in.Data, &out.Data
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DependsOn.
-func (in *DependsOn) DeepCopy() *DependsOn {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManagedResource.
+func (in *ManagedResource) DeepCopy() *ManagedResource {
 	if in == nil {
 		return nil
 	}
-	out := new(DependsOn)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HTTPMatchRequest) DeepCopyInto(out *HTTPMatchRequest) {
-	*out = *in
-	if in.URI != nil {
-		in, out := &in.URI, &out.URI
-		*out = new(URIMatch)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPMatchRequest.
-func (in *HTTPMatchRequest) DeepCopy() *HTTPMatchRequest {
-	if in == nil {
-		return nil
-	}
-	out := new(HTTPMatchRequest)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HTTPRule) DeepCopyInto(out *HTTPRule) {
-	*out = *in
-	if in.Match != nil {
-		in, out := &in.Match, &out.Match
-		*out = make([]*HTTPMatchRequest, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(HTTPMatchRequest)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
-	if in.WeightedTargets != nil {
-		in, out := &in.WeightedTargets, &out.WeightedTargets
-		*out = make([]WeightedTarget, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPRule.
-func (in *HTTPRule) DeepCopy() *HTTPRule {
-	if in == nil {
-		return nil
-	}
-	out := new(HTTPRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Initializer) DeepCopyInto(out *Initializer) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Initializer.
-func (in *Initializer) DeepCopy() *Initializer {
-	if in == nil {
-		return nil
-	}
-	out := new(Initializer)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Initializer) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *InitializerList) DeepCopyInto(out *InitializerList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Initializer, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerList.
-func (in *InitializerList) DeepCopy() *InitializerList {
-	if in == nil {
-		return nil
-	}
-	out := new(InitializerList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *InitializerList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *InitializerSpec) DeepCopyInto(out *InitializerSpec) {
-	*out = *in
-	in.AppTemplate.DeepCopyInto(&out.AppTemplate)
-	if in.DependsOn != nil {
-		in, out := &in.DependsOn, &out.DependsOn
-		*out = make([]DependsOn, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerSpec.
-func (in *InitializerSpec) DeepCopy() *InitializerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(InitializerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *InitializerStatus) DeepCopyInto(out *InitializerStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitializerStatus.
-func (in *InitializerStatus) DeepCopy() *InitializerStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(InitializerStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *LocalSecretReference) DeepCopyInto(out *LocalSecretReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalSecretReference.
-func (in *LocalSecretReference) DeepCopy() *LocalSecretReference {
-	if in == nil {
-		return nil
-	}
-	out := new(LocalSecretReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PlacementStatus) DeepCopyInto(out *PlacementStatus) {
-	*out = *in
-	if in.Clusters != nil {
-		in, out := &in.Clusters, &out.Clusters
-		*out = make([]ClusterPlacementStatus, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementStatus.
-func (in *PlacementStatus) DeepCopy() *PlacementStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(PlacementStatus)
+	out := new(ManagedResource)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -1090,6 +628,7 @@ func (in *ResourceTracker) DeepCopyInto(out *ResourceTracker) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }
 
@@ -1143,12 +682,34 @@ func (in *ResourceTrackerList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ResourceTrackerSpec) DeepCopyInto(out *ResourceTrackerSpec) {
+	*out = *in
+	if in.ManagedResources != nil {
+		in, out := &in.ManagedResources, &out.ManagedResources
+		*out = make([]ManagedResource, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerSpec.
+func (in *ResourceTrackerSpec) DeepCopy() *ResourceTrackerSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ResourceTrackerSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
 	*out = *in
 	if in.TrackedResources != nil {
 		in, out := &in.TrackedResources, &out.TrackedResources
-		*out = make([]corev1.ObjectReference, len(*in))
+		*out = make([]common.ClusterObjectReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -1242,38 +803,6 @@ func (in *ScopeDefinitionSpec) DeepCopy() *ScopeDefinitionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Traffic) DeepCopyInto(out *Traffic) {
-	*out = *in
-	if in.Hosts != nil {
-		in, out := &in.Hosts, &out.Hosts
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Gateways != nil {
-		in, out := &in.Gateways, &out.Gateways
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.HTTP != nil {
-		in, out := &in.HTTP, &out.HTTP
-		*out = make([]HTTPRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Traffic.
-func (in *Traffic) DeepCopy() *Traffic {
-	if in == nil {
-		return nil
-	}
-	out := new(Traffic)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	*out = *in
@@ -1395,36 +924,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 *URIMatch) DeepCopyInto(out *URIMatch) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new URIMatch.
-func (in *URIMatch) DeepCopy() *URIMatch {
-	if in == nil {
-		return nil
-	}
-	out := new(URIMatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WeightedTarget) DeepCopyInto(out *WeightedTarget) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WeightedTarget.
-func (in *WeightedTarget) DeepCopy() *WeightedTarget {
-	if in == nil {
-		return nil
-	}
-	out := new(WeightedTarget)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Workflow) DeepCopyInto(out *Workflow) {
 	*out = *in
@@ -1450,7 +949,11 @@ func (in *Workflow) DeepCopy() *Workflow {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
 	*out = *in
-	in.Properties.DeepCopyInto(&out.Properties)
+	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))

apis/generate.go

@@ -1,3 +1,4 @@
+//go:build generate
 // +build generate
 
 /*

apis/interfaces/resourcetracker.go

@@ -5,7 +5,7 @@ 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
+	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,
@@ -14,24 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clustermanager
+package interfaces
 
 import (
-	"k8s.io/client-go/tools/clientcmd"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/oam-dev/kubevela/pkg/utils/common"
 )
 
-// GetClient returns a kube client for given kubeConfigData
-func GetClient(kubeConfigData []byte) (client.Client, error) {
-	clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeConfigData)
-	if err != nil {
-		return nil, err
-	}
-	restConfig, err := clientConfig.ClientConfig()
-	if err != nil {
-		return nil, err
-	}
-	return client.New(restConfig, client.Options{Scheme: common.Scheme})
+// 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/zz_generated.deepcopy.go

@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*

apis/types/capability.go

@@ -19,12 +19,11 @@ package types
 import (
 	"encoding/json"
 
+	"cuelang.org/go/cue"
+	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-
-	"cuelang.org/go/cue"
-	"github.com/spf13/pflag"
 )
 
 // Source record the source of Capability
@@ -79,6 +78,8 @@ const CapabilityConfigMapNamePrefix = "schema-"
 const (
 	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
 	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
+	// UISchema is the key to store ui custom schema
+	UISchema string = "ui-schema"
 )
 
 // CapabilityCategory defines the category of a capability
@@ -178,6 +179,8 @@ type Capability struct {
 
 	// Terraform
 	TerraformConfiguration string `json:"terraformConfiguration,omitempty"`
+	ConfigurationType      string `json:"configurationType,omitempty"`
+	Path                   string `json:"path,omitempty"`
 
 	// KubeTemplate
 	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`

apis/types/event.go

@@ -18,13 +18,14 @@ package types
 
 // reason for Application
 const (
-	ReasonParsed      = "Parsed"
-	ReasonRendered    = "Rendered"
-	ReasonRevisoned   = "Revisioned"
-	ReasonApplied     = "Applied"
-	ReasonHealthCheck = "HealthChecked"
-	ReasonDeployed    = "Deployed"
-	ReasonRollout     = "Rollout"
+	ReasonParsed          = "Parsed"
+	ReasonRendered        = "Rendered"
+	ReasonPolicyGenerated = "PolicyGenerated"
+	ReasonRevisoned       = "Revisioned"
+	ReasonApplied         = "Applied"
+	ReasonHealthCheck     = "HealthChecked"
+	ReasonDeployed        = "Deployed"
+	ReasonRollout         = "Rollout"
 
 	ReasonFailedParse       = "FailedParse"
 	ReasonFailedRender      = "FailedRender"
@@ -32,6 +33,7 @@ const (
 	ReasonFailedWorkflow    = "FailedWorkflow"
 	ReasonFailedApply       = "FailedApply"
 	ReasonFailedHealthCheck = "FailedHealthCheck"
+	ReasonFailedStateKeep   = "FailedStateKeep"
 	ReasonFailedGC          = "FailedGC"
 	ReasonFailedRollout     = "FailedRollout"
 )
@@ -40,6 +42,7 @@ const (
 const (
 	MessageParsed           = "Parsed successfully"
 	MessageRendered         = "Rendered successfully"
+	MessagePolicyGenerated  = "Policy generated successfully"
 	MessageRevisioned       = "Revisioned successfully"
 	MessageApplied          = "Applied successfully"
 	MessageWorkflowFinished = "Workflow finished"

apis/types/multicluster.go

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

@@ -19,8 +19,6 @@ package types
 import "github.com/oam-dev/kubevela/pkg/oam"
 
 const (
-	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
-	DefaultKubeVelaNS = "vela-system"
 	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
 	DefaultKubeVelaReleaseName = "kubevela"
 	// DefaultKubeVelaChartName defines the default chart name of KubeVela, this variable MUST align to the chart name of this repo
@@ -33,11 +31,52 @@ const (
 	DefaultAppNamespace = "default"
 	// AutoDetectWorkloadDefinition defines the default workload type for ComponentDefinition which doesn't specify a workload
 	AutoDetectWorkloadDefinition = "autodetects.core.oam.dev"
+	// KubeVelaControllerDeployment defines the KubeVela controller's deployment name
+	KubeVelaControllerDeployment = "kubevela-vela-core"
 )
 
+// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
+var DefaultKubeVelaNS = "vela-system"
+
 const (
-	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
-	AnnDescription = "definition.oam.dev/description"
+	// AnnoDefinitionDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
+	AnnoDefinitionDescription = "definition.oam.dev/description"
+	// 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"
+	// 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"
 )
 
 const (
@@ -47,29 +86,38 @@ const (
 	StatusStaging = "Staging"
 )
 
-// EnvMeta stores the info for app environment
+// Config contains key/value pairs
+type Config map[string]string
+
+// EnvMeta stores the namespace for app environment
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
-	Email     string `json:"email,omitempty"`
-	Domain    string `json:"domain,omitempty"`
-
-	Current string `json:"current,omitempty"`
+	Current   string `json:"current"`
 }
 
 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"
-	// TypeCap defines one category
-	TypeCap = "Managing Capabilities"
+
+	// TypeCD defines workflow Management operations
+	TypeCD = "Continuous Delivery"
+
+	// TypeExtension defines one category
+	TypeExtension = "Managing Extension"
+
 	// TypeSystem defines one category
-	TypeSystem = "System"
-	// TypeDefinition defines one category
-	TypeDefinition = "Managing Definitions"
+	TypeSystem = "Others"
+
 	// TypePlugin defines one category used in Kubectl Plugin
 	TypePlugin = "Plugin Command"
 )
@@ -84,4 +132,31 @@ var DefaultFilterAnnots = []string{
 	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"
+)

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

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

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

@@ -188,6 +188,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -197,6 +224,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -454,6 +497,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -463,6 +533,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

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

@@ -193,6 +193,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -202,6 +229,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -440,6 +483,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -449,6 +519,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create
@@ -35,6 +35,10 @@ spec:
             - --cert-name=tls.crt
       restartPolicy: OnFailure
       serviceAccountName: {{ template "oam-runtime.fullname" . }}-admission
+      {{- with .Values.admissionWebhooks.patch.nodeSelector }}
+      nodeSelector:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.admissionWebhooks.patch.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}

charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch
@@ -34,13 +34,17 @@ spec:
             - --patch-failure-policy={{ .Values.admissionWebhooks.failurePolicy }}
       restartPolicy: OnFailure
       serviceAccountName: {{ template "oam-runtime.fullname" . }}-admission
+      {{- with .Values.admissionWebhooks.patch.nodeSelector }}
+      nodeSelector:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.admissionWebhooks.patch.affinity }}
       affinity:
-{{ toYaml . | indent 8 }}
+      {{ toYaml . | indent 8 }}
       {{- end }}
       {{- with .Values.admissionWebhooks.patch.tolerations }}
       tolerations:
-{{ toYaml . | indent 8 }}
+      {{ toYaml . | indent 8 }}
       {{- end }}
       securityContext:
         runAsGroup: 2000

charts/oam-runtime/templates/definitions/containerizedworkloads.yaml

@@ -1,13 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: WorkloadDefinition
-metadata:
-  name: containerizedworkloads.core.oam.dev
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  definitionRef:
-    name: containerizedworkloads.core.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service

charts/oam-runtime/templates/oam-runtime-controller.yaml

@@ -126,7 +126,8 @@ spec:
             {{ end }}
             - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
             - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+            - "--concurrent-reconciles={{ .Values.concurrentReconciles }}"
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

charts/oam-runtime/templates/test/test-application.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "oam-runtime.fullname" . }}-test-connection"
+  name: {{ include "oam-runtime.fullname" . }}-test-connection
   labels:
   {{- include "oam-runtime.labels" . | nindent 4 }}
   annotations:
@@ -9,7 +9,7 @@ metadata:
 spec:
   containers:
     - name: wget
-      image: busybox
+      image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
       command: ['wget']
       args: ['{{ include "oam-runtime.fullname" . }}:{{ .Values.healthCheck.port }}']
   restartPolicy: Never

charts/oam-runtime/values.yaml

@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"
 
 disableCaps: "all"
+
+imageRegistry: ""
 image:
   repository: oamdev/vela-core
   tag: latest
@@ -68,9 +70,10 @@ admissionWebhooks:
   patch:
     enabled: true
     image:
-      repository: wonderflow/kube-webhook-certgen
-      tag: v2.1
+      repository: oamdev/kube-webhook-certgen
+      tag: v2.3
       pullPolicy: IfNotPresent
+    nodeSelector: {}
     affinity: {}
     tolerations: []
   certManager:
@@ -98,4 +101,9 @@ concurrentReconciles: 4
 dependCheckWait: 30s
 
 # OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.2"
+OAMSpecVer: "v0.2"
+
+test:
+  app:
+    repository: oamdev/busybox
+    tag: v1

charts/vela-core/Chart.yaml

@@ -19,3 +19,6 @@ version: 0.1.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.1.0
+
+home: https://kubevela.io
+icon: https://kubevela.io/img/logo.svg

charts/vela-core/README.md

@@ -0,0 +1,173 @@
+<div style="text-align: center">
+  <p align="center">
+    <img src="https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png">
+    <br><br>
+    <i>Make shipping applications more enjoyable.</i>
+  </p>
+</div>
+
+![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
+![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
+[![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)
+
+# KubeVela helm chart
+
+KubeVela is a modern application platform that makes it easier and faster to deliver and manage applications across hybrid,
+multi-cloud environments. At the mean time, it is highly extensible and programmable, which can adapt to your needs as they grow.
+
+## TL;DR
+
+```bash
+helm repo add kubevela https://charts.kubevela.net/core
+helm repo update
+helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wait
+```
+
+## Prerequisites
+
+- Kubernetes >= v1.19 && < v1.22
+  
+## Parameters
+
+### KubeVela core parameters
+
+| Name                          | Description                                                                                   | Value     |
+| ----------------------------- | --------------------------------------------------------------------------------------------- | --------- |
+| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`     |
+| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`      |
+| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`      |
+| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`       |
+| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`      |
+| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `v0.3`    |
+| `disableCaps`                 | Disable capability                                                                            | `rollout` |
+| `enableFluxcdAddon`           | Whether to enable fluxcd addon                                                                | `false`   |
+| `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`     |
+
+
+### KubeVela workflow parameters
+
+| Name                                   | Description                                            | Value |
+| -------------------------------------- | ------------------------------------------------------ | ----- |
+| `workflow.backoff.maxTime.waitState`   | The max backoff time of workflow in a wait condition   | `60`  |
+| `workflow.backoff.maxTime.failedState` | The max backoff time of workflow in a failed condition | `300` |
+| `workflow.step.errorRetryTimes`        | The max retry times of a failed workflow step          | `10`  |
+
+
+### KubeVela controller parameters
+
+| Name                        | Description                          | Value              |
+| --------------------------- | ------------------------------------ | ------------------ |
+| `replicaCount`              | KubeVela controller replica count    | `1`                |
+| `imageRegistry`             | Image registry                       | `""`               |
+| `image.repository`          | Image repository                     | `oamdev/vela-core` |
+| `image.tag`                 | Image tag                            | `latest`           |
+| `image.pullPolicy`          | Image pull policy                    | `Always`           |
+| `resources.limits.cpu`      | KubeVela controller's cpu limit      | `500m`             |
+| `resources.limits.memory`   | KubeVela controller's memory limit   | `1Gi`              |
+| `resources.requests.cpu`    | KubeVela controller's cpu request    | `50m`              |
+| `resources.requests.memory` | KubeVela controller's memory request | `20Mi`             |
+| `webhookService.type`       | KubeVela webhook service type        | `ClusterIP`        |
+| `webhookService.port`       | KubeVela webhook service port        | `9443`             |
+| `healthCheck.port`          | KubeVela health check port           | `9440`             |
+
+
+### MultiCluster parameters
+
+| Name                                                  | Description                      | Value                            |
+| ----------------------------------------------------- | -------------------------------- | -------------------------------- |
+| `multicluster.enabled`                                | Whether to enable multi-cluster  | `true`                           |
+| `multicluster.clusterGateway.replicaCount`            | ClusterGateway replica count     | `1`                              |
+| `multicluster.clusterGateway.port`                    | ClusterGateway port              | `9443`                           |
+| `multicluster.clusterGateway.image.repository`        | ClusterGateway image repository  | `oamdev/cluster-gateway`         |
+| `multicluster.clusterGateway.image.tag`               | ClusterGateway image tag         | `v1.3.2`                         |
+| `multicluster.clusterGateway.image.pullPolicy`        | ClusterGateway image pull policy | `IfNotPresent`                   |
+| `multicluster.clusterGateway.resources.limits.cpu`    | ClusterGateway cpu limit         | `100m`                           |
+| `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit      | `200Mi`                          |
+| `multicluster.clusterGateway.secureTLS.enabled`       | Whether to enable secure TLS     | `true`                           |
+| `multicluster.clusterGateway.secureTLS.certPath`      | Path to the certificate file     | `/etc/k8s-cluster-gateway-certs` |
+
+
+### Test parameters
+
+| Name                  | Description         | Value                |
+| --------------------- | ------------------- | -------------------- |
+| `test.app.repository` | Test app repository | `oamdev/hello-world` |
+| `test.app.tag`        | Test app tag        | `v1`                 |
+| `test.k8s.repository` | Test k8s repository | `oamdev/alpine-k8s`  |
+| `test.k8s.tag`        | Test k8s tag        | `1.18.2`             |
+
+
+### Common parameters
+
+| Name                         | Description                                                                                                                | Value   |
+| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `imagePullSecrets`           | Image pull secrets                                                                                                         | `[]`    |
+| `nameOverride`               | Override name                                                                                                              | `""`    |
+| `fullnameOverride`           | Fullname override                                                                                                          | `""`    |
+| `serviceAccount.create`      | Specifies whether a service account should be created                                                                      | `true`  |
+| `serviceAccount.annotations` | Annotations to add to the service account                                                                                  | `{}`    |
+| `serviceAccount.name`        | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`   |
+| `nodeSelector`               | Node selector                                                                                                              | `{}`    |
+| `tolerations`                | Tolerations                                                                                                                | `[]`    |
+| `affinity`                   | Affinity                                                                                                                   | `{}`    |
+| `rbac.create`                | Specifies whether a RBAC role should be created                                                                            | `true`  |
+| `logDebug`                   | Enable debug logs for development purpose                                                                                  | `false` |
+| `logFilePath`                | If non-empty, write log files in this path                                                                                 | `""`    |
+| `logFileMaxSize`             | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`  |
+| `kubeClient.qps`             | The qps for reconcile clients, default is 50                                                                               | `50`    |
+| `kubeClient.burst`           | The burst for reconcile clients, default is 100                                                                            | `100`   |
+
+
+## Uninstallation
+
+### Vela CLI 
+
+To uninstall KubeVela, you can just run the following command by vela CLI:
+
+```shell
+vela uninstall --force
+```
+
+### Helm CLI
+
+**Notice**: You must disable all the addons before uninstallation, this is a script for convenience. 
+
+```shell
+#! /bin/sh
+addon=$(vela addon list|grep enabled|awk {'print $1'})
+
+fluxcd=false
+for var in ${addon[*]}
+do
+  if [ $var == "fluxcd" ]; then
+      fluxcd=true
+      continue
+      else
+        vela addon disable $var
+  fi
+done
+if [ $fluxcd ]; then
+    vela addon disable fluxcd
+fi
+```
+
+To uninstall the KubeVela helm release:
+
+```shell
+$ helm uninstall -n vela-system kubevela
+```
+
+Finally, this command will remove all the Kubernetes resources associated with KubeVela and remove this chart release.
+
+
+
+
+
+

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

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

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

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

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

@@ -179,6 +179,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -188,6 +215,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -449,6 +492,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -458,6 +528,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

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

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

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

@@ -222,6 +222,35 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              customRegion:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
+                              providerRef:
+                                description: ProviderReference specifies the reference
+                                  to Provider
+                                properties:
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  namespace:
+                                    default: default
+                                    description: Namespace of the referenced object.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -231,6 +260,23 @@ spec:
                                 - json
                                 - remote
                                 type: string
+                              writeConnectionSecretToRef:
+                                description: WriteConnectionSecretToReference specifies
+                                  the namespace and name of a Secret to which any
+                                  connection details for this managed resource should
+                                  be written. Connection details frequently include
+                                  the endpoint, username, and password required to
+                                  connect to the managed resource.
+                                properties:
+                                  name:
+                                    description: Name of the secret.
+                                    type: string
+                                  namespace:
+                                    description: Namespace of the secret.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                             required:
                             - configuration
                             type: object
@@ -492,6 +538,35 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              customRegion:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
+                              providerRef:
+                                description: ProviderReference specifies the reference
+                                  to Provider
+                                properties:
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  namespace:
+                                    default: default
+                                    description: Namespace of the referenced object.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -501,6 +576,23 @@ spec:
                                 - json
                                 - remote
                                 type: string
+                              writeConnectionSecretToRef:
+                                description: WriteConnectionSecretToReference specifies
+                                  the namespace and name of a Secret to which any
+                                  connection details for this managed resource should
+                                  be written. Connection details frequently include
+                                  the endpoint, username, and password required to
+                                  connect to the managed resource.
+                                properties:
+                                  name:
+                                    description: Name of the secret.
+                                    type: string
+                                  namespace:
+                                    description: Namespace of the secret.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                             required:
                             - configuration
                             type: object
@@ -755,6 +847,35 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              customRegion:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
+                              providerRef:
+                                description: ProviderReference specifies the reference
+                                  to Provider
+                                properties:
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  namespace:
+                                    default: default
+                                    description: Namespace of the referenced object.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -764,6 +885,23 @@ spec:
                                 - json
                                 - remote
                                 type: string
+                              writeConnectionSecretToRef:
+                                description: WriteConnectionSecretToReference specifies
+                                  the namespace and name of a Secret to which any
+                                  connection details for this managed resource should
+                                  be written. Connection details frequently include
+                                  the endpoint, username, and password required to
+                                  connect to the managed resource.
+                                properties:
+                                  name:
+                                    description: Name of the secret.
+                                    type: string
+                                  namespace:
+                                    description: Namespace of the secret.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                             required:
                             - configuration
                             type: object
@@ -999,6 +1137,35 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              customRegion:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
+                              providerRef:
+                                description: ProviderReference specifies the reference
+                                  to Provider
+                                properties:
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  namespace:
+                                    default: default
+                                    description: Namespace of the referenced object.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -1008,6 +1175,23 @@ spec:
                                 - json
                                 - remote
                                 type: string
+                              writeConnectionSecretToRef:
+                                description: WriteConnectionSecretToReference specifies
+                                  the namespace and name of a Secret to which any
+                                  connection details for this managed resource should
+                                  be written. Connection details frequently include
+                                  the endpoint, username, and password required to
+                                  connect to the managed resource.
+                                properties:
+                                  name:
+                                    description: Name of the secret.
+                                    type: string
+                                  namespace:
+                                    description: Namespace of the secret.
+                                    type: string
+                                required:
+                                - name
+                                type: object
                             required:
                             - configuration
                             type: object
@@ -1051,6 +1235,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -5,20 +5,26 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.2
-  name: clusters.core.oam.dev
+  name: policies.core.oam.dev
 spec:
   group: core.oam.dev
   names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
-    singular: cluster
+    categories:
+    - oam
+    kind: Policy
+    listKind: PolicyList
+    plural: policies
+    singular: policy
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .type
+      name: TYPE
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Cluster is the Schema for the clusters API
+        description: Policy is the Schema for the policy API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -32,26 +38,17 @@ spec:
             type: string
           metadata:
             type: object
-          spec:
-            description: ClusterSpec defines the desired state of Cluster
-            properties:
-              kubeconfigSecretRef:
-                description: KubeconfigSecretRef specifies the reference to the secret
-                  that contains the kubeconfig in field `config`.
-                properties:
-                  name:
-                    description: Name of a secret within the enclosing namespace.
-                    type: string
-                required:
-                - name
-                type: object
-            type: object
-          status:
-            description: ClusterStatus defines the observed state of Cluster
+          properties:
             type: object
+            x-kubernetes-preserve-unknown-fields: true
+          type:
+            type: string
+        required:
+        - type
         type: object
     served: true
     storage: true
+    subresources: {}
 status:
   acceptedNames:
     kind: ""

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

@@ -15,7 +15,7 @@ spec:
     listKind: PolicyDefinitionList
     plural: policydefinitions
     shortNames:
-    - policy
+    - def-policy
     singular: policydefinition
   scope: Namespaced
   versions:
@@ -151,6 +151,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -160,6 +187,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

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

@@ -15,11 +15,24 @@ spec:
     listKind: ResourceTrackerList
     plural: resourcetrackers
     shortNames:
-    - tracker
+    - rt
     singular: resourcetracker
   scope: Cluster
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: TYPE
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/name']
+      name: APP
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/namespace']
+      name: APP-NS
+      type: string
+    - jsonPath: .spec.applicationGeneration
+      name: APP-GEN
+      type: number
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: An ResourceTracker represents a tracker for track cross namespace
@@ -37,40 +50,92 @@ spec:
             type: string
           metadata:
             type: object
-          status:
-            description: ResourceTrackerStatus define the status of resourceTracker
+          spec:
+            description: ResourceTrackerSpec define the spec of resourceTracker
             properties:
-              trackedResources:
+              applicationGeneration:
+                format: int64
+                type: integer
+              managedResources:
                 items:
-                  description: 'ObjectReference contains enough information to let
-                    you inspect or modify the referred object. --- New uses of this
-                    type are discouraged because of difficulty describing its usage
-                    when embedded in APIs.  1. Ignored fields.  It includes many fields
-                    which are not generally honored.  For instance, ResourceVersion
-                    and FieldPath are both very rarely valid in actual usage.  2.
-                    Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                  description: ManagedResource define the resource to be managed by
+                    ResourceTracker
                   properties:
                     apiVersion:
                       description: API version of the referent.
                       type: string
+                    cluster:
+                      type: string
+                    component:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
+                    deleted:
+                      description: Deleted marks the resource to be deleted
+                      type: boolean
+                    env:
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of
+                        an entire object, this string should contain a valid JSON/Go
+                        field access statement, such as desiredState.manifest.containers[2].
+                        For example, if the object reference is to a container within
+                        a pod, this would take on a value like: "spec.containers{name}"
+                        (where "name" refers to the name of the container that triggered
+                        the event) or if no container name is specified "spec.containers[2]"
+                        (container with index 2 in this pod). This syntax is chosen
+                        only to have some well-defined way of referencing a part of
+                        an object. TODO: this design is not final and this field is
+                        subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    raw:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference
+                        is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    trait:
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
+              type:
+                description: ResourceTrackerType defines the type of resourceTracker
+                type: string
+            required:
+            - applicationGeneration
+            type: object
+          status:
+            description: ResourceTrackerStatus define the status of resourceTracker
+              For backward-compatibility
+            properties:
+              trackedResources:
+                description: Deprecated
+                items:
+                  description: ClusterObjectReference defines the object reference
+                    with cluster.
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    cluster:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
                     fieldPath:
                       description: 'If referring to a piece of an object instead of
                         an entire object, this string should contain a valid JSON/Go

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

@@ -188,6 +188,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -197,6 +224,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -454,6 +497,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -463,6 +533,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

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

@@ -14,22 +14,13 @@ spec:
     kind: Workflow
     listKind: WorkflowList
     plural: workflows
-    shortNames:
-    - workflow
     singular: workflow
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .status.phase
-      name: PHASE
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
-    name: v1alpha1
+  - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Workflow is the Schema for the Workflow API
+        description: Workflow is the Schema for the policy API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -43,257 +34,63 @@ spec:
             type: string
           metadata:
             type: object
-          spec:
-            description: A WorkflowSpec defines the desired state of a Workflow.
-            properties:
-              steps:
-                items:
-                  description: WorkflowStep defines how to execute a workflow step.
-                  properties:
-                    inputs:
-                      description: StepInputs defines variable input of WorkflowStep
-                      items:
-                        properties:
-                          from:
-                            type: string
-                          parameterKey:
-                            type: string
-                        required:
-                        - from
-                        - parameterKey
-                        type: object
-                      type: array
-                    name:
-                      description: Name is the unique name of the workflow step.
-                      type: string
-                    outputs:
-                      description: StepOutputs defines output variable of WorkflowStep
-                      items:
-                        properties:
-                          name:
-                            type: string
-                          valueFrom:
-                            type: string
-                        required:
-                        - name
-                        - valueFrom
-                        type: object
-                      type: array
+          steps:
+            items:
+              description: WorkflowStep defines how to execute a workflow step.
+              properties:
+                dependsOn:
+                  items:
+                    type: string
+                  type: array
+                inputs:
+                  description: StepInputs defines variable input of WorkflowStep
+                  items:
                     properties:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
-            type: object
-          status:
-            description: A WorkflowStatus is the status of Workflow
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              contextBackend:
-                description: 'ObjectReference contains enough information to let you
-                  inspect or modify the referred object. --- New uses of this type
-                  are discouraged because of difficulty describing its usage when
-                  embedded in APIs.  1. Ignored fields.  It includes many fields which
-                  are not generally honored.  For instance, ResourceVersion and FieldPath
-                  are both very rarely valid in actual usage.  2. Invalid usage help.  It
-                  is impossible to add specific help for individual usage.  In most
-                  embedded usages, there are particular     restrictions like, "must
-                  refer only to types A and B" or "UID not honored" or "name must
-                  be restricted".     Those cannot be well described when embedded.  3.
-                  Inconsistent validation.  Because the usages are different, the
-                  validation rules are different by usage, which makes it hard for
-                  users to predict what will happen.  4. The fields are both imprecise
-                  and overly precise.  Kind is not a precise mapping to a URL. This
-                  can produce ambiguity     during interpretation and require a REST
-                  mapping.  In most cases, the dependency is on the group,resource
-                  tuple     and the version of the actual struct is irrelevant.  5.
-                  We cannot easily change it.  Because this type is embedded in many
-                  locations, updates to this type     will affect numerous schemas.  Don''t
-                  make new APIs embed an underspecified API type they do not control.
-                  Instead of using this type, create a locally provided and used type
-                  that is well-focused on your reference. For example, ServiceReferences
-                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                  .'
+                      from:
+                        type: string
+                      parameterKey:
+                        type: string
+                    required:
+                    - from
+                    - parameterKey
+                    type: object
+                  type: array
+                name:
+                  description: Name is the unique name of the workflow step.
+                  type: string
+                outputs:
+                  description: StepOutputs defines output variable of WorkflowStep
+                  items:
+                    properties:
+                      name:
+                        type: string
+                      valueFrom:
+                        type: string
+                    required:
+                    - name
+                    - valueFrom
+                    type: object
+                  type: array
                 properties:
-                  apiVersion:
-                    description: API version of the referent.
-                    type: string
-                  fieldPath:
-                    description: 'If referring to a piece of an object instead of
-                      an entire object, this string should contain a valid JSON/Go
-                      field access statement, such as desiredState.manifest.containers[2].
-                      For example, if the object reference is to a container within
-                      a pod, this would take on a value like: "spec.containers{name}"
-                      (where "name" refers to the name of the container that triggered
-                      the event) or if no container name is specified "spec.containers[2]"
-                      (container with index 2 in this pod). This syntax is chosen
-                      only to have some well-defined way of referencing a part of
-                      an object. TODO: this design is not final and this field is
-                      subject to change in the future.'
-                    type: string
-                  kind:
-                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  name:
-                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                    type: string
-                  namespace:
-                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                    type: string
-                  resourceVersion:
-                    description: 'Specific resourceVersion to which this reference
-                      is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                    type: string
-                  uid:
-                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                    type: string
-                type: object
-              observedGeneration:
-                format: int64
-                type: integer
-              stepIndex:
-                type: integer
-              steps:
-                items:
-                  description: WorkflowStepStatus record the status of a workflow
-                    step
-                  properties:
-                    message:
-                      description: A human readable message indicating details about
-                        why the workflowStep is in this state.
-                      type: string
-                    name:
-                      type: string
-                    phase:
-                      description: WorkflowStepPhase describes the phase of a workflow
-                        step.
-                      type: string
-                    reason:
-                      description: A brief CamelCase message indicating details about
-                        why the workflowStep is in this state.
-                      type: string
-                    resourceRef:
-                      description: 'ObjectReference contains enough information to
-                        let you inspect or modify the referred object. --- New uses
-                        of this type are discouraged because of difficulty describing
-                        its usage when embedded in APIs.  1. Ignored fields.  It includes
-                        many fields which are not generally honored.  For instance,
-                        ResourceVersion and FieldPath are both very rarely valid in
-                        actual usage.  2. Invalid usage help.  It is impossible to
-                        add specific help for individual usage.  In most embedded
-                        usages, there are particular     restrictions like, "must
-                        refer only to types A and B" or "UID not honored" or "name
-                        must be restricted".     Those cannot be well described when
-                        embedded.  3. Inconsistent validation.  Because the usages
-                        are different, the validation rules are different by usage,
-                        which makes it hard for users to predict what will happen.  4.
-                        The fields are both imprecise and overly precise.  Kind is
-                        not a precise mapping to a URL. This can produce ambiguity     during
-                        interpretation and require a REST mapping.  In most cases,
-                        the dependency is on the group,resource tuple     and the
-                        version of the actual struct is irrelevant.  5. We cannot
-                        easily change it.  Because this type is embedded in many locations,
-                        updates to this type     will affect numerous schemas.  Don''t
-                        make new APIs embed an underspecified API type they do not
-                        control. Instead of using this type, create a locally provided
-                        and used type that is well-focused on your reference. For
-                        example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                        .'
-                      properties:
-                        apiVersion:
-                          description: API version of the referent.
-                          type: string
-                        fieldPath:
-                          description: 'If referring to a piece of an object instead
-                            of an entire object, this string should contain a valid
-                            JSON/Go field access statement, such as desiredState.manifest.containers[2].
-                            For example, if the object reference is to a container
-                            within a pod, this would take on a value like: "spec.containers{name}"
-                            (where "name" refers to the name of the container that
-                            triggered the event) or if no container name is specified
-                            "spec.containers[2]" (container with index 2 in this pod).
-                            This syntax is chosen only to have some well-defined way
-                            of referencing a part of an object. TODO: this design
-                            is not final and this field is subject to change in the
-                            future.'
-                          type: string
-                        kind:
-                          description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                          type: string
-                        name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                          type: string
-                        namespace:
-                          description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                          type: string
-                        resourceVersion:
-                          description: 'Specific resourceVersion to which this reference
-                            is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                          type: string
-                        uid:
-                          description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                          type: string
-                      type: object
-                    type:
-                      type: string
                   type: object
-                type: array
-              suspend:
-                type: boolean
-              terminated:
-                type: boolean
-            required:
-            - contextBackend
-            - suspend
-            - terminated
-            type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type:
+                  type: string
+              required:
+              - name
+              - type
+              type: object
+            type: array
         type: object
     served: true
     storage: true
-    subresources:
-      status: {}
   - name: v1beta1
     schema:
       openAPIV3Schema:
         description: Workflow defines workflow steps and other attributes
         properties:
+          ref:
+            type: string
           steps:
             items:
               description: WorkflowStep defines how to execute a workflow step.

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

@@ -148,6 +148,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -157,6 +184,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -198,6 +241,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -202,6 +229,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object
@@ -440,6 +483,33 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      customRegion:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
+                      providerRef:
+                        description: ProviderReference specifies the reference to
+                          Provider
+                        properties:
+                          name:
+                            description: Name of the referenced object.
+                            type: string
+                          namespace:
+                            default: default
+                            description: Namespace of the referenced object.
+                            type: string
+                        required:
+                        - name
+                        type: object
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -449,6 +519,22 @@ spec:
                         - json
                         - remote
                         type: string
+                      writeConnectionSecretToRef:
+                        description: WriteConnectionSecretToReference specifies the
+                          namespace and name of a Secret to which any connection details
+                          for this managed resource should be written. Connection
+                          details frequently include the endpoint, username, and password
+                          required to connect to the managed resource.
+                        properties:
+                          name:
+                            description: Name of the secret.
+                            type: string
+                          namespace:
+                            description: Namespace of the secret.
+                            type: string
+                        required:
+                        - name
+                        type: object
                     required:
                     - configuration
                     type: object

charts/vela-core/templates/NOTES.txt

@@ -1 +1,31 @@
-Welcome to use the KubeVela! Enjoy your shipping application journey!
+Welcome to use the KubeVela! Enjoy your shipping application journey!
+
+                                   ,
+                                   //,
+                                   ////
+                               ./  /////*
+                             ,///  ///////
+                           ./////  ////////
+                          ///////  /////////
+                         ////////  //////////
+                       ,/////////  ///////////
+                      ,//////////  ///////////.
+                     .///////////  ////////////
+                     ////////////  ////////////.
+                    *////////////  ////////////*
+       #@@@@@@@@@@@*     ..,,***/  /////////////
+        /@@@@@@@@@@@#
+         *@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&
+          .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.
+
+              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                .&@@@*    *@@@&    ,@@@&.
+
+       _  __       _          __     __     _
+      | |/ /_   _ | |__    ___\ \   / /___ | |  __ _
+      | ' /| | | || '_ \  / _ \\ \ / // _ \| | / _` |
+      | . \| |_| || |_) ||  __/ \ V /|  __/| || (_| |
+      |_|\_\\__,_||_.__/  \___|  \_/  \___||_| \__,_|
+
+
+You can refer to https://kubevela.io for more details.

charts/vela-core/templates/_helpers.tpl

@@ -51,11 +51,6 @@ app.kubernetes.io/name: {{ include "kubevela.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
-{{- define "kubevela-apiserver.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kubevela.name" . }}-apiserver
-app.kubernetes.io/instance: {{ .Release.Name }}-apiserver
-{{- end -}}
-
 {{- define "kubevela-cluster-gateway.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "kubevela.name" . }}-cluster-gateway
 app.kubernetes.io/instance: {{ .Release.Name }}-cluster-gateway
@@ -71,3 +66,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+systemDefinitionNamespace value defaulter
+*/}}
+{{- define "systemDefinitionNamespace" -}}
+{{- if .Values.systemDefinitionNamespace -}}
+    {{ .Values.systemDefinitionNamespace }}
+{{- else -}}
+    {{ .Release.Namespace }}
+{{- end -}}
+{{- end -}}

charts/vela-core/templates/addon/fluxcd-def.yaml

@@ -0,0 +1,270 @@
+{{- if .Values.enableFluxcdAddon -}}
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  labels:
+    addons.oam.dev/name: fluxcd-def
+  name: addon-fluxcd-def
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/resource-policy": keep
+spec:
+  components:
+    - name: fluxc-def-resources
+      properties:
+        objects:
+          - apiVersion: core.oam.dev/v1beta1
+            kind: ComponentDefinition
+            metadata:
+              annotations:
+                definition.oam.dev/description: helm release is a group of K8s resources
+                  from either git repository or helm repo
+              name: helm
+              namespace: {{.Values.systemDefinitionNamespace}}
+            spec:
+              schematic:
+                cue:
+                  template: "output: {\n\tapiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\tmetadata:
+                {\n\t\tname: context.name\n\t}\n\tif parameter.repoType == \"git\"
+                {\n\t\tkind: \"GitRepository\"\n\t\tspec: {\n\t\t\turl: parameter.url\n\t\t\tif
+                parameter.git.branch != _|_ {\n\t\t\t\tref: branch: parameter.git.branch\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
+                parameter.repoType == \"oss\" {\n\t\tkind: \"Bucket\"\n\t\tspec: {\n\t\t\tendpoint:
+                \  parameter.url\n\t\t\tbucketName: parameter.oss.bucketName\n\t\t\tprovider:
+                \  parameter.oss.provider\n\t\t\tif parameter.oss.region != _|_ {\n\t\t\t\tregion:
+                parameter.oss.region\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
+                parameter.repoType == \"helm\" {\n\t\tkind: \"HelmRepository\"\n\t\tspec:
+                {\n\t\t\turl: parameter.url\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n}\n\noutputs:
+                release: {\n\tapiVersion: \"helm.toolkit.fluxcd.io/v2beta1\"\n\tkind:
+                \      \"HelmRelease\"\n\tmetadata: {\n\t\tname: context.name\n\t}\n\tspec:
+                {\n\t\ttimeout: parameter.installTimeout\n\t\tinterval: parameter.interval\n\t\tchart:
+                {\n\t\t\tspec: {\n\t\t\t\tchart:   parameter.chart\n\t\t\t\tversion:
+                parameter.version\n\t\t\t\tsourceRef: {\n\t\t\t\t\tif parameter.repoType
+                == \"git\" {\n\t\t\t\t\t\tkind: \"GitRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
+                parameter.repoType == \"helm\" {\n\t\t\t\t\t\tkind: \"HelmRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
+                parameter.repoType == \"oss\" {\n\t\t\t\t\t\tkind: \"Bucket\"\n\t\t\t\t\t}\n\t\t\t\t\tname:
+                \     context.name\n\t\t\t\t}\n\t\t\t\tinterval: parameter.interval\n\t\t\t}\n\t\t}\n\t\tif
+                parameter.targetNamespace != _|_ {\n\t\t\ttargetNamespace: parameter.targetNamespace\n\t\t}\n\t\tif
+                parameter.releaseName != _|_ {\n\t\t\treleaseName: parameter.releaseName\n\t\t}\n\t\tif
+                parameter.values != _|_ {\n\t\t\tvalues: parameter.values\n\t\t}\n\t}\n}\n\n_secret:
+                {\n\tif parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname:
+                parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs: {\n\tinterval:
+                parameter.pullInterval\n\tif parameter.timeout != _|_ {\n\t\ttimeout:
+                parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType: *\"helm\" |
+                \"git\" | \"oss\"\n\t// +usage=The interval at which to check for
+                repository/bucket and relese updates, default to 5m\n\tpullInterval:
+                *\"5m\" | string\n        // +usage=The  Interval at which to reconcile
+                the Helm release, default to 30s\n        interval: *\"30s\" | string\n\t//
+                +usage=The Git or Helm repository URL, OSS endpoint, accept HTTP/S
+                or SSH address as git url,\n\turl: string\n\t// +usage=The name of
+                the secret containing authentication credentials\n\tsecretRef?: string\n\t//
+                +usage=The timeout for operations like download index/clone repository,
+                optional\n\ttimeout?: string\n\t// +usage=The timeout for operation
+                `helm install`, optional\n\tinstallTimeout: *\"10m\" | string\n\n\tgit?:
+                {\n\t\t// +usage=The Git reference to checkout and monitor for changes,
+                defaults to master branch\n\t\tbranch: string\n\t}\n\toss?: {\n\t\t//
+                +usage=The bucket's name, required if repoType is oss\n\t\tbucketName:
+                string\n\t\t// +usage=\"generic\" for Minio, Amazon S3, Google Cloud
+                Storage, Alibaba Cloud OSS, \"aws\" for retrieve credentials from
+                the EC2 service when credentials not specified, default \"generic\"\n\t\tprovider:
+                *\"generic\" | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
+                string\n\t}\n\n\t// +usage=1.The relative path to helm chart for git/oss
+                source. 2. chart name for helm resource 3. relative path for chart
+                package(e.g. ./charts/podinfo-1.2.3.tgz)\n\tchart: string\n\t// +usage=Chart
+                version\n\tversion: *\"*\" | string\n\t// +usage=The namespace for
+                helm chart, optional\n\ttargetNamespace?: string\n\t// +usage=The
+                release name\n\treleaseName?: string\n\t// +usage=Chart values\n\tvalues?:
+                #nestedmap\n}\n\n#nestedmap: {\n\t...\n}\n"
+              status:
+                customStatus: "repoMessage:    string\nreleaseMessage: string\nif context.output.status
+              == _|_ {\n\trepoMessage:    \"Fetching repository\"\n\treleaseMessage:
+              \"Wating repository ready\"\n}\nif context.output.status != _|_ {\n\trepoStatus:
+              context.output.status\n\tif repoStatus.conditions[0][\"type\"] != \"Ready\"
+              {\n\t\trepoMessage: \"Fetch repository fail\"\n\t}\n\tif repoStatus.conditions[0][\"type\"]
+              == \"Ready\" {\n\t\trepoMessage: \"Fetch repository successfully\"\n\t}\n\n\tif
+              context.outputs.release.status == _|_ {\n\t\treleaseMessage: \"Creating
+              helm release\"\n\t}\n\tif context.outputs.release.status != _|_ {\n\t\tif
+              context.outputs.release.status.conditions[0][\"message\"] == \"Release
+              reconciliation succeeded\" {\n\t\t\treleaseMessage: \"Create helm release
+              successfully\"\n\t\t}\n\t\tif context.outputs.release.status.conditions[0][\"message\"]
+              != \"Release reconciliation succeeded\" {\n\t\t\treleaseBasicMessage:
+              \"Delivery helm release in progress, message: \" + context.outputs.release.status.conditions[0][\"message\"]\n\t\t\tif
+              len(context.outputs.release.status.conditions) == 1 {\n\t\t\t\treleaseMessage:
+              releaseBasicMessage\n\t\t\t}\n\t\t\tif len(context.outputs.release.status.conditions)
+              > 1 {\n\t\t\t\treleaseMessage: releaseBasicMessage + \", \" + context.outputs.release.status.conditions[1][\"message\"]\n\t\t\t}\n\t\t}\n\t}\n\n}\nmessage:
+              repoMessage + \", \" + releaseMessage"
+                healthPolicy: 'isHealth: len(context.outputs.release.status.conditions)
+              != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
+              workload:
+                type: autodetects.core.oam.dev
+          - apiVersion: core.oam.dev/v1beta1
+            kind: TraitDefinition
+            metadata:
+              annotations:
+                definition.oam.dev/description: A list of JSON6902 patch to selected target
+              name: kustomize-json-patch
+              namespace: {{.Values.systemDefinitionNamespace}}
+            spec:
+              schematic:
+                cue:
+                  template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
+                {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
+                +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
+                [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
+                | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
+                +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
+                source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
+                opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
+                +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
+                \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
+                \         string\n\tname?:               string\n\tannotationSelector?:
+                string\n\tlabelSelector?:      string\n}\n"
+          - apiVersion: core.oam.dev/v1beta1
+            kind: TraitDefinition
+            metadata:
+              annotations:
+                definition.oam.dev/description: A list of StrategicMerge or JSON6902 patch
+                  to selected target
+              name: kustomize-patch
+              namespace: {{.Values.systemDefinitionNamespace}}
+            spec:
+              schematic:
+                cue:
+                  template: "patch: {\n\tspec: {\n\t\tpatches: parameter.patches\n\t}\n}\nparameter:
+                {\n\t// +usage=a list of StrategicMerge or JSON6902 patch to selected
+                target\n\tpatches: [...#patchItem]\n}\n\n// +usage=Contains a strategicMerge
+                or JSON6902 patch\n#patchItem: {\n\t// +usage=Inline patch string,
+                in yaml style\n\tpatch: string\n\t// +usage=Specify the target the
+                patch should be applied to\n\ttarget: #selector\n}\n\n// +usage=Selector
+                specifies a set of resources\n#selector: {\n\tgroup?:              string\n\tversion?:
+                \           string\n\tkind?:               string\n\tnamespace?:          string\n\tname?:
+                \              string\n\tannotationSelector?: string\n\tlabelSelector?:
+                \     string\n}\n"
+          - apiVersion: core.oam.dev/v1beta1
+            kind: ComponentDefinition
+            metadata:
+              annotations:
+                definition.oam.dev/description: kustomize can fetching, building, updating
+                  and applying Kustomize manifests from git repo.
+              name: kustomize
+              namespace: {{.Values.systemDefinitionNamespace}}
+            spec:
+              schematic:
+                cue:
+                  template: "output: {\n\tapiVersion: \"kustomize.toolkit.fluxcd.io/v1beta1\"\n\tkind:
+                \      \"Kustomization\"\n\tmetadata: {\n\t\tname: context.name\n
+                \   namespace: context.namespace\n\t}\n\tspec: {\n\t\tinterval: parameter.pullInterval\n\t\tsourceRef:
+                {\n\t\t\tif parameter.repoType == \"git\" {\n\t\t\t\tkind: \"GitRepository\"\n\t\t\t}\n\t\t\tif
+                parameter.repoType == \"oss\" {\n\t\t\t\tkind: \"Bucket\"\n\t\t\t}\n\t\t\tname:
+                \     context.name\n\t\t\tnamespace: context.namespace\n\t\t}\n\t\tpath:
+                \      parameter.path\n\t\tprune:      true\n\t\tvalidation: \"client\"\n\t}\n}\n\noutputs:
+                {\n  repo: {\n\t  apiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\t
+                \ metadata: {\n\t\t  name: context.name\n      namespace: context.namespace\n\t
+                \ }\n\t  if parameter.repoType == \"git\" {\n\t\t  kind: \"GitRepository\"\n\t\t
+                \ spec: {\n\t\t\t  url: parameter.url\n\t\t\t  if parameter.git.branch
+                != _|_ {\n\t\t\t\t  ref: branch: parameter.git.branch\n\t\t\t  }\n
+                \       if parameter.git.provider != _|_ {\n          if parameter.git.provider
+                == \"GitHub\" {\n            gitImplementation: \"go-git\"\n          }\n
+                \         if parameter.git.provider == \"AzureDevOps\" {\n            gitImplementation:
+                \"libgit2\"\n          }\n        }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t
+                \ }\n\t  }\n\t  if parameter.repoType == \"oss\" {\n\t\t  kind: \"Bucket\"\n\t\t
+                \ spec: {\n\t\t\t  endpoint:   parameter.url\n\t\t\t  bucketName:
+                parameter.oss.bucketName\n\t\t\t  provider:   parameter.oss.provider\n\t\t\t
+                \ if parameter.oss.region != _|_ {\n\t\t\t\t  region: parameter.oss.region\n\t\t\t
+                \ }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t  }\n\t  }\n
+                \ }\n\n  if parameter.imageRepository != _|_ {\n    imageRepo: {\n
+                \     apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n      kind:
+                \"ImageRepository\"\n\t    metadata: {\n\t\t    name: context.name\n
+                \       namespace: context.namespace\n\t    }\n      spec: {\n        image:
+                parameter.imageRepository.image\n        interval: parameter.pullInterval\n
+                \       if parameter.imageRepository.secretRef != _|_ {\n          secretRef:
+                name: parameter.imageRepository.secretRef\n        }\n      }\n    }\n\n
+                \   imagePolicy: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
+                \     kind: \"ImagePolicy\"\n\t    metadata: {\n\t\t    name: context.name\n
+                \       namespace: context.namespace\n\t    }\n      spec: {\n        imageRepositoryRef:
+                name: context.name\n        policy: parameter.imageRepository.policy\n
+                \       if parameter.imageRepository.filterTags != _|_ {\n          filterTags:
+                parameter.imageRepository.filterTags\n        }\n      }\n    }\n\n
+                \   imageUpdate: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
+                \     kind: \"ImageUpdateAutomation\"\n\t    metadata: {\n\t\t    name:
+                context.name\n        namespace: context.namespace\n\t    }\n      spec:
+                {\n        interval: parameter.pullInterval\n        sourceRef: {\n
+                \         kind: \"GitRepository\"\n          name: context.name\n
+                \       }\n        git: {\n          checkout: ref: branch: parameter.git.branch\n
+                \         commit: {\n            author: {\n              email: \"kubevelabot@users.noreply.github.com\"\n
+                \             name: \"kubevelabot\"\n            }\n            if
+                parameter.imageRepository.commitMessage != _|_ {\n              messageTemplate:
+                \"Update image automatically.\\n\" + parameter.imageRepository.commitMessage\n
+                \           }\n            if parameter.imageRepository.commitMessage
+                == _|_ {\n              messageTemplate: \"Update image automatically.\"\n
+                \           }\n          }\n          push: branch: parameter.git.branch\n
+                \       }\n        update: {\n          path:\tparameter.path\n          strategy:
+                \"Setters\"\n        }\n      }\n    }\n  }\n}\n\n_secret: {\n\tif
+                parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname: parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs:
+                {\n\tinterval: parameter.pullInterval\n\tif parameter.timeout != _|_
+                {\n\t\ttimeout: parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType:
+                *\"git\" | \"oss\"\n  // +usage=The image repository for automatically
+                update image to git\n  imageRepository?: {\n    // +usage=The image
+                url\n    image: string\n    // +usage=The name of the secret containing
+                authentication credentials\n    secretRef?: string\n    // +usage=Policy
+                gives the particulars of the policy to be followed in selecting the
+                most recent image.\n    policy: {\n      // +usage=Alphabetical set
+                of rules to use for alphabetical ordering of the tags.\n      alphabetical?:
+                {\n        // +usage=Order specifies the sorting order of the tags.\n
+                \       // +usage=Given the letters of the alphabet as tags, ascending
+                order would select Z, and descending order would select A.\n        order?:
+                \"asc\" | \"desc\"\n      }\n      // +usage=Numerical set of rules
+                to use for numerical ordering of the tags.\n      numerical?: {\n
+                \       // +usage=Order specifies the sorting order of the tags.\n
+                \       // +usage=Given the integer values from 0 to 9 as tags, ascending
+                order would select 9, and descending order would select 0.\n        order:
+                \"asc\" | \"desc\"\n      }\n      // +usage=SemVer gives a semantic
+                version range to check against the tags available.\n      semver?:
+                {\n        // +usage=Range gives a semver range for the image tag;
+                the highest version within the range that's a tag yields the latest
+                image.\n        range: string\n      }\n    }\n    // +usage=FilterTags
+                enables filtering for only a subset of tags based on a set of rules.
+                If no rules are provided, all the tags from the repository will be
+                ordered and compared.\n    filterTags?: {\n      // +usage=Extract
+                allows a capture group to be extracted from the specified regular
+                expression pattern, useful before tag evaluation.\n      extract?:
+                string\n      // +usage=Pattern specifies a regular expression pattern
+                used to filter for image tags.\n      pattern?: string\n    }\n    //
+                +usage=The image url\n    commitMessage?: string\n  }\n\t// +usage=The
+                interval at which to check for repository/bucket and release updates,
+                default to 5m\n\tpullInterval: *\"5m\" | string\n\t// +usage=The Git
+                or Helm repository URL, OSS endpoint, accept HTTP/S or SSH address
+                as git url,\n\turl: string\n\t// +usage=The name of the secret containing
+                authentication credentials\n\tsecretRef?: string\n\t// +usage=The
+                timeout for operations like download index/clone repository, optional\n\ttimeout?:
+                string\n\tgit?: {\n\t\t// +usage=The Git reference to checkout and
+                monitor for changes, defaults to master branch\n\t\tbranch: string\n
+                \   // +usage=Determines which git client library to use. Defaults
+                to GitHub, it will pick go-git. AzureDevOps will pick libgit2.\n    provider?:
+                *\"GitHub\" | \"AzureDevOps\"\n\t}\n\toss?: {\n\t\t// +usage=The bucket's
+                name, required if repoType is oss\n\t\tbucketName: string\n\t\t//
+                +usage=\"generic\" for Minio, Amazon S3, Google Cloud Storage, Alibaba
+                Cloud OSS, \"aws\" for retrieve credentials from the EC2 service when
+                credentials not specified, default \"generic\"\n\t\tprovider: *\"generic\"
+                | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
+                string\n\t}\n\t//+usage=Path to the directory containing the kustomization.yaml
+                file, or the set of plain YAMLs a kustomization.yaml should be generated
+                for.\n\tpath: string\n}"
+              workload:
+                type: autodetects.core.oam.dev
+          - apiVersion: core.oam.dev/v1beta1
+            kind: TraitDefinition
+            metadata:
+              annotations:
+                definition.oam.dev/description: A list of strategic merge to kustomize
+                  config
+              name: kustomize-strategy-merge
+              namespace: {{.Values.systemDefinitionNamespace}}
+            spec:
+              schematic:
+                cue:
+                  template: "patch: {\n\tspec: {\n\t\tpatchesStrategicMerge: parameter.patchesStrategicMerge\n\t}\n}\n\nparameter:
+                {\n\t// +usage=a list of strategicmerge, defined as inline yaml objects.\n\tpatchesStrategicMerge:
+                [...#nestedmap]\n}\n\n#nestedmap: {\n\t...\n}\n"
+      type: k8s-objects
+
+  {{- end }}