Fix: show reconcile error log (#2628)

(cherry picked from commit 77db060f8e)

Co-authored-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,37 +1,36 @@
+<!--
 
-### Description of your changes
+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**:
 
 <!--
 
-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":
+- Automatically closes linked issue when the Pull Request is merged.
+
+Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
 
 -->
 
 Fixes #
 
-I have:
+**Special notes for your reviewer**:
 
-- [ ] 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

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

.github/workflows/apiserver-test.yaml

@@ -1,122 +0,0 @@
-name: APIServer Unit Test & E2E Test
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-      - apiserver
-  workflow_dispatch: {}
-  pull_request:
-    branches:
-      - master
-      - release-*
-      - apiserver
-
-env:
-  # Common versions
-  GO_VERSION: '1.16'
-  GOLANGCI_VERSION: 'v1.38'
-  KIND_VERSION: 'v0.7.0'
-
-jobs:
-
-  detect-noop:
-    runs-on: ubuntu-20.04
-    outputs:
-      noop: ${{ steps.noop.outputs.should_skip }}
-    steps:
-      - name: Detect No-op Changes
-        id: noop
-        uses: fkirc/skip-duplicate-actions@v3.3.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-          concurrent_skipping: false
-
-  apiserver-unit-tests:
-    runs-on: aliyun
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
-      - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
-        with:
-          version: ${{ env.KIND_VERSION }}
-          skipClusterCreation: true
-
-      - name: Setup Kind Cluster (Worker)
-        run: |
-          kind delete cluster --name worker
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4 --name worker
-          kubectl version
-          kubectl cluster-info
-          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
-          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
-
-      - name: Setup Kind Cluster (Hub)
-        run: |
-          kind delete cluster
-          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
-          kubectl version
-          kubectl cluster-info
-
-      - name: Load Image to kind cluster
-        run: make kind-load
-
-      - name: Cleanup for e2e tests
-        run: |
-          make e2e-cleanup
-          make e2e-setup-core
-
-          make vela-cli
-          bin/vela addon enable fluxcd
-          timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
-          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
-          kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
-
-      - name: Run apiserver unit test
-        run: make unit-test-apiserver
-
-      - name: Run apiserver e2e test
-        run: |
-          export ALIYUN_ACCESS_KEY_ID=${{ secrets.ALIYUN_ACCESS_KEY_ID }}
-          export ALIYUN_ACCESS_KEY_SECRET=${{ secrets.ALIYUN_ACCESS_KEY_SECRET }}
-          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          make e2e-apiserver-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e-core
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage.txt,/tmp/e2e_apiserver_test.out
-          flags: apiserver-unittests
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: make image-cleanup

.github/workflows/back-port.yaml

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

.github/workflows/commit-lint.yml

@@ -1,19 +1,13 @@
-name: PR Title Checker
-on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - labeled
-      - unlabeled
+name: Lint Commit Messages
+on: [push, pull_request]
 
 jobs:
-  check:
+  commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/pr-title-checker@v1.3.1
+      - uses: actions/checkout@v2
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pass_on_octokit_error: true
-          configuration_path: ".github/pr-title-checker-config.json"
+          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/workflows/e2e-multicluster-test.yml

@@ -86,12 +86,9 @@ jobs:
           make e2e-setup-core
           make
           make setup-runtime-e2e-cluster
-          make vela-cli
 
       - name: Run e2e multicluster tests
-        run: |
-          export PATH=$(pwd)/bin:$PATH
-          make e2e-multicluster-test
+        run: make e2e-multicluster-test
 
       - name: Stop kubevela, get profile
         run: make end-e2e-core
@@ -100,7 +97,7 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
+          files: /tmp/e2e-profile.out,/tmp/e2e_multicluster_test.out
           flags: e2e-multicluster-test
           name: codecov-umbrella
 

.github/workflows/e2e-test.yml

@@ -83,9 +83,6 @@ 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
 

.github/workflows/issue-commands.yml

@@ -6,7 +6,7 @@ on:
     types: [created]
 
 jobs:
-  bot:
+  main:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
@@ -22,48 +22,3 @@ jobs:
         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,23 +44,12 @@ 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 -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 vela-core for Dockerhub and GHCR
+        name: Build & Pushing
         with:
           context: .
           file: Dockerfile
@@ -73,36 +62,10 @@ jobs:
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
           tags: |-
-            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 -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 }}
+            docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
-        name: Build & Pushing vela-apiserver for Dockerhub and GHCR
-        with:
-          context: .
-          file: Dockerfile.apiserver
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-          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 -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
+        name: Build & Pushing runtime rollout
         with:
           context: .
           file: runtime/rollout/Dockerfile
@@ -115,8 +78,8 @@ jobs:
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
           tags: |-
-            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}
+            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
 
   publish-charts:
     env:
@@ -152,7 +115,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")"
@@ -216,6 +179,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,146 +4,126 @@ on:
   push:
     tags:
       - "v*"
-  workflow_dispatch: { }
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  workflow_dispatch: {}
 
 jobs:
-  build:
+  publish-cli:
     runs-on: ubuntu-latest
-    name: build
-    strategy:
-      matrix:
-        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
     env:
-      VELA_VERSION_KEY: github.com/oam-dev/kubevela/version.VelaVersion
-      VELA_GITVERSION_KEY: github.com/oam-dev/kubevela/version.GitRevision
-      GO_BUILD_ENV: GO111MODULE=on CGO_ENABLED=0
-      DIST_DIRS: find * -type d -exec
+      VELA_VERSION: ${{ github.ref }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v1
         with:
           go-version: 1.16
-      - name: Get release
-        id: get_release
-        uses: bruceadams/get-release@v1.2.2
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Get matrix
-        id: get_matrix
-        run: |
-          TARGETS=${{matrix.TARGETS}}
-          echo ::set-output name=OS::${TARGETS%/*}
-          echo ::set-output name=ARCH::${TARGETS#*/}
-      - name: Get ldflags
-        id: get_ldflags
-        run: |
-          LDFLAGS="-s -w -X ${{ env.VELA_VERSION_KEY }}=${{ env.VELA_VERSION }} -X ${{ env.VELA_GITVERSION_KEY }}=git-$(git rev-parse --short HEAD)"
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV
-      - name: Build
-        run: |
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/vela -v \
-            ./references/cmd/cli/main.go
-          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
-            go build -ldflags "${{ env.LDFLAGS }}" \
-            -o _bin/kubectl-vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/kubectl-vela -v \
-            ./cmd/plugin/main.go
-      - name: Compress
-        run: |
-          echo "\n## Release Info\nVERSION: ${{ env.VELA_VERSION }}" >> README.md && \
-          echo "GIT_COMMIT: ${GITHUB_SHA}\n" >> README.md && \
-          cd _bin/vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r vela-{}.zip {} \; && \
-          cd ../kubectl-vela && \
-          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
-          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
-          ${{ env.DIST_DIRS }} tar -zcf kubectl-vela-{}.tar.gz {} \; && \
-          ${{ env.DIST_DIRS }} zip -r kubectl-vela-{}.zip {} \; && \
-          cd .. && \
-          sha256sum vela/vela-* kubectl-vela/kubectl-vela-* >> sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt \
-      - name: Upload Vela tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_content_type: binary/octet-stream
-      - 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-${{ 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 Kubectl-Vela tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
-          asset_content_type: binary/octet-stream
-      - 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/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: Post sha256
-        uses: actions/upload-artifact@v2
-        with:
-          name: sha256sums
-          path: ./_bin/sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt
-          retention-days: 1
-
-  upload-plugin-homebrew:
-    needs: build
-    runs-on: ubuntu-latest
-    name: upload-sha256sums
-    steps:
-      - name: Checkout
+        id: go
+      - name: Check out code into the Go module directory
         uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+      - name: Tag helm chart image
+        run:  |
+          sed -i 's/latest/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/values.yaml
+          sed -i 's/0.1.0/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/Chart.yaml
+      - name: Run cross-build
+        run: make cross-build
+      - name: Run compress binary
+        run: make compress
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
-      - name: Download sha256sums
-        uses: actions/download-artifact@v2
+      - name: Upload Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
         with:
-          name: sha256sums
-          path: cli-artifacts
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: cli-artifacts
-      - shell: bash
-        working-directory: cli-artifacts
-        run: |
-          for file in *
-          do
-            cat ${file} >> sha256sums.txt
-          done
+          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_content_type: binary/octet-stream
+      - name: Upload Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-linux-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela MacOS tar.gz
+        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_content_type: binary/octet-stream
+      - name: Upload Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-darwin-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-windows-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
       - name: Upload Checksums
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: cli-artifacts/sha256sums.txt
+          asset_path: ./_bin/sha256sums.txt
           asset_name: sha256sums.txt
           asset_content_type: text/plain
       - name: Update kubectl plugin version in krew-index
         uses: rajatjindal/krew-release-bot@v0.0.38
-      - name: Update Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          formula: kubevela
-          tag: ${{ github.ref }}
-          revision: ${{ github.sha }}
-          force: false

.github/workflows/timed-task.yml

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

.github/workflows/unit-test.yml

@@ -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: core-unittests
+          flags: unittests
           name: codecov-umbrella

CHANGELOG/CHANGELOG-1.0.md

@@ -1,260 +0,0 @@
-# v1.0.7
-
-This is a minor fix for release-1.0, please refer to release-1.1.x for the latest feature.
-
-1. Fix podDisruptive field for inner traits #1844
-
-
-# v1.0.6
-
-1. fix bug: When the Component contains multiple traits of the same type, the status of the trait in the Application is reported incorrectly (#1731) (#1743)
-2. Fix terraform component can't work normally, generate OpenAPI JSON schema for Terraform Component (#1738) (#1753)
-3. Improve the logging system #1735 #1758
-4. add ConcurrentReconciles for setting the concurrent reconcile number of the controller  #1775 
-
-# v1.0.5
-
-1. Fix Terraform application status issue (#1611)
-2. 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

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

CHANGELOG/CHANGELOG-1.2.md

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

CHANGELOG/README.md

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

Dockerfile

@@ -1,4 +1,3 @@
-ARG BASE_IMAGE="alpine:latest"
 # Build the manager binary
 FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder
 
@@ -6,10 +5,6 @@ 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
-# RUN go env -w GOPROXY=https://goproxy.cn,direct
-
 # 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
@@ -29,10 +24,15 @@ 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}
 # This is required by daemon connnecting with cri
 RUN apk add --no-cache ca-certificates bash
@@ -41,6 +41,7 @@ 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

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

Makefile

@@ -1,5 +1,3 @@
-SHELL := /bin/bash
-
 # Vela version
 VELA_VERSION ?= master
 # Repo info
@@ -40,7 +38,6 @@ 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_APISERVER_IMAGE      ?= apiserver:latest
 VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest
 VELA_RUNTIME_ROLLOUT_TEST_IMAGE  ?= vela-runtime-rollout-test:$(GIT_COMMIT)
 RUNTIME_CLUSTER_CONFIG ?= /tmp/worker.kubeconfig
@@ -49,15 +46,11 @@ RUNTIME_CLUSTER_NAME ?= worker
 all: build
 
 # Run tests
-test: vet lint staticcheck unit-test-core
+test: vet lint staticcheck
+	go test -coverprofile=coverage.txt ./pkg/... ./cmd/...
+	go test ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
 	@$(OK) unit-tests pass
 
-unit-test-core:
-	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... | grep -v apiserver)
-	go test $(shell go list ./references/... | grep -v apiserver)
-unit-test-apiserver:
-	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/...  | grep -E 'apiserver|velaql')
-
 # Build vela cli binary
 build: fmt vet lint staticcheck vela-cli kubectl-vela
 	@$(OK) build succeed
@@ -72,6 +65,7 @@ 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
@@ -112,7 +106,6 @@ 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
@@ -137,12 +130,8 @@ check-diff: reviewable
 	@$(OK) branch is clean
 
 # Build the docker image
-docker-build: docker-build-core docker-build-apiserver
-	@$(OK)
-docker-build-core:
+docker-build:
 	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
-docker-build-apiserver:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_APISERVER_IMAGE) -f Dockerfile.apiserver .
 
 # Build the runtime docker image
 docker-build-runtime-rollout:
@@ -166,7 +155,7 @@ e2e-setup:
 	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-alibaba ALICLOUD_ACCESS_KEY=xxx ALICLOUD_SECRET_KEY=yyy ALICLOUD_REGION=cn-beijing
+	bin/vela addon enable terraform
 	ginkgo version
 	ginkgo -v -r e2e/setup
 
@@ -175,27 +164,16 @@ e2e-setup:
 	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
 
-build-swagger:
-	go run ./cmd/apiserver/main.go build-swagger ./docs/apidoc/swagger.json
 e2e-api-test:
 	# Run e2e test
 	ginkgo -v -skipPackage capability,setup,application -r e2e
 	ginkgo -v -r e2e/application
 
-e2e-apiserver-test: build-swagger
-	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_apiserver_test.out ./test/e2e-apiserver-test
-	@$(OK) tests pass
-
 e2e-test:
 	# Run e2e test
 	ginkgo -v  --skip="rollout related e2e-test." ./test/e2e-test
 	@$(OK) tests pass
 
-e2e-addon-test:
-	cp bin/vela /tmp/
-	ginkgo -v ./test/e2e-addon-test
-	@$(OK) tests pass
-
 e2e-rollout-test:
 	ginkgo -v  --focus="rollout related e2e-test." ./test/e2e-test
 	@$(OK) tests pass
@@ -206,7 +184,7 @@ e2e-multicluster-test:
 
 compatibility-test: vet lint staticcheck generate-compatibility-testdata
 	# Run compatibility test with old crd
-	COMPATIBILITY_TEST=TRUE go test -race $(shell go list ./pkg/...  | grep -v apiserver)
+	COMPATIBILITY_TEST=TRUE go test -race ./pkg/...
 	@$(OK) compatibility-test pass
 
 generate-compatibility-testdata:
@@ -221,19 +199,11 @@ e2e-cleanup:
 	rm -rf ~/.vela
 
 image-cleanup:
-ifneq (, $(shell which docker))
-# Delete Docker images
-
+# Delete Docker image
 ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
 	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif
 
-ifneq ($(shell docker images -q $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)),)
-	docker rmi -f $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)
-endif
-
-endif
-
 end-e2e-core:
 	sh ./hack/e2e/end_e2e_core.sh
 
@@ -282,7 +252,7 @@ core-uninstall: manifests
 	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: installcue kustomize addon
+manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
 	# TODO(yangsoon): kustomize will merge all CRD into a whole file, it may not work if we want patch more than one CRD in this way
 	$(KUSTOMIZE) build config/crd -o config/crd/base/core.oam.dev_applications.yaml
@@ -290,6 +260,7 @@ manifests: installcue kustomize addon
 	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:]')
@@ -299,20 +270,16 @@ HOSTARCH := amd64
 endif
 
 golangci:
-ifneq ($(shell which golangci-lint),)
-	@$(OK) golangci-lint is already installed
-GOLANGCILINT=$(shell which golangci-lint)
-else ifeq (, $(shell which $(GOBIN)/golangci-lint))
+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 'Successfully installed' ;\
+	echo 'Install succeed' ;\
 	}
 GOLANGCILINT=$(GOBIN)/golangci-lint
 else
-	@$(OK) golangci-lint is already installed
-GOLANGCILINT=$(GOBIN)/golangci-lint
+GOLANGCILINT=$(shell which golangci-lint)
 endif
 
 .PHONY: staticchecktool
@@ -358,9 +325,9 @@ KUSTOMIZE_VERSION ?= 3.8.2
 kustomize:
 ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
 	@{ \
-	set -eo pipefail ;\
+	set -e ;\
 	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
-	curl -sS https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(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
@@ -373,7 +340,3 @@ check-license-header:
 
 def-install:
 	./hack/utils/installdefinition.sh
-
-# generate addons to auto-gen and charts
-addon:
-	go run ./vela-templates/gen_addons.go

README.md

@@ -1,11 +1,3 @@
-<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)
@@ -15,23 +7,22 @@
 [![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/oam-dev/kubevela)](https://www.tickgit.com/browse?repo=github.com/oam-dev/kubevela)
 [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Foam_dev)](https://twitter.com/oam_dev)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kubevela)](https://artifacthub.io/packages/search?repo=kubevela)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4602/badge)](https://bestpractices.coreinfrastructure.org/projects/4602)
 
-## Introduction
+![logo](https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png)
 
-KubeVela is a modern application delivery platform that makes deploying and operating applications across today's hybrid, multi-cloud environments easier, faster and more reliable.
+*Make shipping applications more enjoyable.*
 
-![](docs/resources/what-is-kubevela.png)
+# KubeVela
 
-## Highlights
+KubeVela is a modern application platform that makes deploying and managing applications across today's hybrid, multi-cloud environments easier and faster.
 
-KubeVela practices the "render, orchestrate, deploy" workflow with below highlighted values added to existing ecosystem:
+## Features
 
-- *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.
+**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.
 
-- *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.
+**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.
 
-- *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.
+**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.
 
 ## Getting Started
 

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

@@ -18,15 +18,14 @@ package common
 
 import (
 	"encoding/json"
-	"errors"
-
-	"github.com/oam-dev/terraform-controller/api/v1beta1"
 
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
+	types "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
+
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
@@ -118,7 +117,8 @@ type Terraform struct {
 	// Path is the sub-directory of remote git repository. It's valid when remote is set
 	Path string `json:"path,omitempty"`
 
-	v1beta1.BaseConfigurationSpec `json:",inline"`
+	// ProviderReference specifies the reference to Provider
+	ProviderReference *types.Reference `json:"providerRef,omitempty"`
 }
 
 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -167,7 +167,7 @@ type Status struct {
 	HealthPolicy string `json:"healthPolicy,omitempty"`
 }
 
-// ApplicationPhase is a label for the condition of an application at the current time
+// ApplicationPhase is a label for the condition of a application at the current time
 type ApplicationPhase string
 
 const (
@@ -201,9 +201,7 @@ const (
 	WorkflowStateTerminated WorkflowState = "terminated"
 	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
 	WorkflowStateSuspended WorkflowState = "suspended"
-	// WorkflowStateSucceeded means workflow is running successfully, all steps finished.
-	WorkflowStateSucceeded WorkflowState = "Succeeded"
-	// WorkflowStateFinished means workflow is end.
+	// WorkflowStateFinished means workflow is running successfully, all steps finished.
 	WorkflowStateFinished WorkflowState = "finished"
 	// WorkflowStateExecuting means workflow is still running or waiting some steps.
 	WorkflowStateExecuting WorkflowState = "executing"
@@ -255,10 +253,6 @@ 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
@@ -283,7 +277,7 @@ type AppStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-	Rollout *AppRolloutStatus `json:"rollout,omitempty"`
+	Rollout AppRolloutStatus `json:"rollout,omitempty"`
 
 	Phase ApplicationPhase `json:"status,omitempty"`
 
@@ -305,17 +299,6 @@ 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"`
 }
 
 // WorkflowStatus record the status of workflow
@@ -325,12 +308,9 @@ type WorkflowStatus struct {
 
 	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.
@@ -483,11 +463,6 @@ type ClusterObjectReference struct {
 	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
@@ -513,48 +488,3 @@ func (re RawExtensionPointer) MarshalJSON() ([]byte, error) {
 	// TODO: Check whether ContentType is actually JSON before returning it.
 	return re.RawExtension.Raw, nil
 }
-
-// ApplicationConditionType is a valid value for ApplicationCondition.Type
-type ApplicationConditionType int
-
-const (
-	// ParsedCondition indicates whether the parsing  is successful.
-	ParsedCondition ApplicationConditionType = iota
-	// RevisionCondition indicates whether the generated revision is successful.
-	RevisionCondition
-	// PolicyCondition indicates whether policy processing is successful.
-	PolicyCondition
-	// RenderCondition indicates whether render processing is successful.
-	RenderCondition
-	// WorkflowCondition indicates whether workflow processing is successful.
-	WorkflowCondition
-	// RolloutCondition indicates whether rollout processing is successful.
-	RolloutCondition
-	// ReadyCondition indicates whether whole application processing is successful.
-	ReadyCondition
-)
-
-var conditions = map[ApplicationConditionType]string{
-	ParsedCondition:   "Parsed",
-	RevisionCondition: "Revision",
-	PolicyCondition:   "Policy",
-	RenderCondition:   "Render",
-	WorkflowCondition: "Workflow",
-	RolloutCondition:  "Rollout",
-	ReadyCondition:    "Ready",
-}
-
-// String returns the string corresponding to the condition type.
-func (ct ApplicationConditionType) String() string {
-	return conditions[ct]
-}
-
-// ParseApplicationConditionType parse ApplicationCondition Type.
-func ParseApplicationConditionType(s string) (ApplicationConditionType, error) {
-	for k, v := range conditions {
-		if v == s {
-			return k, nil
-		}
-	}
-	return -1, errors.New("unknown condition type")
-}

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

@@ -21,6 +21,7 @@ limitations under the License.
 package common
 
 import (
+	crossplane_runtime "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -45,11 +46,7 @@ func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Rollout != nil {
-		in, out := &in.Rollout, &out.Rollout
-		*out = new(AppRolloutStatus)
-		(*in).DeepCopyInto(*out)
-	}
+	in.Rollout.DeepCopyInto(&out.Rollout)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1.ObjectReference, len(*in))
@@ -82,13 +79,6 @@ 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.
@@ -407,26 +397,6 @@ func (in *KubeParameter) DeepCopy() *KubeParameter {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *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
@@ -589,7 +559,11 @@ 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)
+	if in.ProviderReference != nil {
+		in, out := &in.ProviderReference, &out.ProviderReference
+		*out = new(crossplane_runtime.Reference)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
@@ -617,7 +591,6 @@ 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.
@@ -638,8 +611,6 @@ 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/v1alpha1/envbinding_types.go

@@ -17,65 +17,48 @@
 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 (
-	// EnvBindingPolicyType refers to the type of EnvBinding
-	EnvBindingPolicyType = "env-binding"
+	// OCMEngine represents Open-Cluster-Management multi-cluster management solution
+	OCMEngine ClusterManagementEngine = "ocm"
 
-	// GarbageCollectPolicyType refers to the type of garbage-collect
-	GarbageCollectPolicyType = "garbage-collect"
+	// SingleClusterEngine represents single cluster ClusterManagerEngine
+	SingleClusterEngine ClusterManagementEngine = "single-cluster"
+
+	// ClusterGatewayEngine represents multi-cluster management solution with cluster-gateway
+	ClusterGatewayEngine ClusterManagementEngine = "cluster-gateway"
 )
 
-// EnvTraitPatch is the patch to trait
-type EnvTraitPatch struct {
-	Type       string                `json:"type"`
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-	Disable    bool                  `json:"disable,omitempty"`
-}
+// EnvBindingPhase is a label for the condition of a EnvBinding at the current time
+type EnvBindingPhase string
 
-// 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
-}
+const (
+	// EnvBindingPrepare means EnvBinding is preparing the pre-work for cluster scheduling
+	EnvBindingPrepare EnvBindingPhase = "preparing"
 
-// 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"`
-}
+	// EnvBindingRendering means EnvBinding is rendering the apps in different envs
+	EnvBindingRendering EnvBindingPhase = "rendering"
 
-// 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
-}
+	// EnvBindingScheduling means EnvBinding is deciding which cluster the apps is scheduled to.
+	EnvBindingScheduling EnvBindingPhase = "scheduling"
+
+	// EnvBindingFinished means EnvBinding finished env binding
+	EnvBindingFinished EnvBindingPhase = "finished"
+)
 
 // EnvPatch specify the parameter configuration for different environments
 type EnvPatch struct {
-	Components []EnvComponentPatch `json:"components,omitempty"`
+	Components []common.ApplicationComponent `json:"components"`
 }
 
 // NamespaceSelector defines the rules to select a Namespace resource.
@@ -103,34 +86,90 @@ type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
 	Selector  *EnvSelector `json:"selector,omitempty"`
-	Patch     EnvPatch     `json:"patch,omitempty"`
+	Patch     EnvPatch     `json:"patch"`
 }
 
-// EnvBindingSpec defines a list of envs
+// 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.
 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"`
 }
 
-// PlacementDecision describes the placement of one application instance
-type PlacementDecision struct {
-	Cluster   string `json:"cluster"`
-	Namespace string `json:"namespace"`
-}
-
-// EnvStatus records the status of one env
-type EnvStatus struct {
-	Env        string              `json:"env"`
-	Placements []PlacementDecision `json:"placements"`
-}
-
-// ClusterConnection records the connection with clusters and the last active app revision when they are active (still be used)
-type ClusterConnection struct {
-	ClusterName        string `json:"clusterName"`
-	LastActiveRevision string `json:"lastActiveRevision"`
-}
-
-// EnvBindingStatus records the status of all env
+// A EnvBindingStatus is the status of EnvBinding
 type EnvBindingStatus struct {
-	Envs               []EnvStatus         `json:"envs"`
-	ClusterConnections []ClusterConnection `json:"clusterConnections"`
+	// 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)
 }

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

@@ -17,6 +17,8 @@
 package v1alpha1
 
 import (
+	"reflect"
+
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
@@ -35,5 +37,14 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )
 
+// EnvBinding type metadata.
+var (
+	EnvBindingKind            = reflect.TypeOf(EnvBinding{}).Name()
+	EnvBindingGroupKind       = schema.GroupKind{Group: Group, Kind: EnvBindingKind}.String()
+	EnvBindingKindAPIVersion  = EnvBindingKind + "." + SchemeGroupVersion.String()
+	EnvBindingKindVersionKind = SchemeGroupVersion.WithKind(EnvBindingKind)
+)
+
 func init() {
+	SchemeBuilder.Register(&EnvBinding{}, &EnvBindingList{})
 }

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

@@ -21,29 +21,121 @@ 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 *ClusterConnection) DeepCopyInto(out *ClusterConnection) {
+func (in *AppTemplate) DeepCopyInto(out *AppTemplate) {
 	*out = *in
+	in.RawExtension.DeepCopyInto(&out.RawExtension)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterConnection.
-func (in *ClusterConnection) DeepCopy() *ClusterConnection {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppTemplate.
+func (in *AppTemplate) DeepCopy() *AppTemplate {
 	if in == nil {
 		return nil
 	}
-	out := new(ClusterConnection)
+	out := new(AppTemplate)
 	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) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterDecision.
+func (in *ClusterDecision) DeepCopy() *ClusterDecision {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterDecision)
+	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))
@@ -51,6 +143,11 @@ 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.
@@ -66,18 +163,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
-	if in.Envs != nil {
-		in, out := &in.Envs, &out.Envs
-		*out = make([]EnvStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ClusterConnections != nil {
-		in, out := &in.ClusterConnections, &out.ClusterConnections
-		*out = make([]ClusterConnection, len(*in))
+	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.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingStatus.
@@ -90,33 +186,6 @@ 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
@@ -144,7 +213,7 @@ func (in *EnvPatch) DeepCopyInto(out *EnvPatch) {
 	*out = *in
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
-		*out = make([]EnvComponentPatch, len(*in))
+		*out = make([]common.ApplicationComponent, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -206,46 +275,6 @@ 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 *NamespaceSelector) DeepCopyInto(out *NamespaceSelector) {
 	*out = *in
@@ -267,18 +296,3 @@ func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PlacementDecision) DeepCopyInto(out *PlacementDecision) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementDecision.
-func (in *PlacementDecision) DeepCopy() *PlacementDecision {
-	if in == nil {
-		return nil
-	}
-	out := new(PlacementDecision)
-	in.DeepCopyInto(out)
-	return out
-}

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

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

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

@@ -19,8 +19,14 @@ 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.
@@ -353,3 +359,53 @@ type Container struct {
 	// +optional
 	ImagePullSecret *string `json:"imagePullSecret,omitempty"`
 }
+
+// A ContainerizedWorkloadSpec defines the desired state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadSpec struct {
+	// OperatingSystem required by this workload.
+	// +kubebuilder:validation:Enum=linux;windows
+	// +optional
+	OperatingSystem *OperatingSystem `json:"osType,omitempty"`
+
+	// CPUArchitecture required by this workload.
+	// +kubebuilder:validation:Enum=i386;amd64;arm;arm64
+	// +optional
+	CPUArchitecture *CPUArchitecture `json:"arch,omitempty"`
+
+	// Containers of which this workload consists.
+	Containers []Container `json:"containers"`
+}
+
+// A ContainerizedWorkloadStatus represents the observed state of a
+// ContainerizedWorkload.
+type ContainerizedWorkloadStatus struct {
+	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,6 +64,16 @@ 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,6 +85,14 @@ 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()
@@ -132,6 +140,7 @@ 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{})

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

@@ -1213,6 +1213,118 @@ func (in *ContainerResources) DeepCopy() *ContainerResources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkload) DeepCopyInto(out *ContainerizedWorkload) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkload.
+func (in *ContainerizedWorkload) DeepCopy() *ContainerizedWorkload {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkload)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkload) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadList) DeepCopyInto(out *ContainerizedWorkloadList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ContainerizedWorkload, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadList.
+func (in *ContainerizedWorkloadList) DeepCopy() *ContainerizedWorkloadList {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ContainerizedWorkloadList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadSpec) DeepCopyInto(out *ContainerizedWorkloadSpec) {
+	*out = *in
+	if in.OperatingSystem != nil {
+		in, out := &in.OperatingSystem, &out.OperatingSystem
+		*out = new(OperatingSystem)
+		**out = **in
+	}
+	if in.CPUArchitecture != nil {
+		in, out := &in.CPUArchitecture, &out.CPUArchitecture
+		*out = new(CPUArchitecture)
+		**out = **in
+	}
+	if in.Containers != nil {
+		in, out := &in.Containers, &out.Containers
+		*out = make([]Container, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedWorkloadSpec.
+func (in *ContainerizedWorkloadSpec) DeepCopy() *ContainerizedWorkloadSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ContainerizedWorkloadSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ContainerizedWorkloadStatus) DeepCopyInto(out *ContainerizedWorkloadStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Resources != nil {
+		in, out := &in.Resources, &out.Resources
+		*out = make([]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/core_types.go

@@ -17,6 +17,7 @@
 package v1beta1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -256,3 +257,32 @@ 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

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

@@ -144,6 +144,14 @@ var (
 	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{})
@@ -158,6 +166,7 @@ func init() {
 	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.go

@@ -1,146 +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 (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/interfaces"
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// +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 []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"`
-}
-
-// ToOwnerReference convert ResourceTracker into owner reference for other resource to refer
-func (in *ResourceTracker) ToOwnerReference() *metav1.OwnerReference {
-	return &metav1.OwnerReference{
-		APIVersion:         SchemeGroupVersion.String(),
-		Kind:               ResourceTrackerKind,
-		Name:               in.Name,
-		UID:                in.UID,
-		Controller:         pointer.BoolPtr(true),
-		BlockOwnerDeletion: pointer.BoolPtr(true),
-	}
-}
-
-// AddOwnerReferenceToTrackerResource add resourcetracker as owner reference to target object, return true if already exists (outdated)
-func (in *ResourceTracker) AddOwnerReferenceToTrackerResource(rsc interfaces.ObjectOwner) bool {
-	ownerRefs := []metav1.OwnerReference{*in.ToOwnerReference()}
-	exists := false
-	for _, owner := range rsc.GetOwnerReferences() {
-		// delete the old resourceTracker owner
-		if owner.Kind == ResourceTrackerKind && owner.APIVersion == SchemeGroupVersion.String() {
-			exists = true
-			continue
-		}
-		if owner.Controller != nil && *owner.Controller && owner.UID != in.UID {
-			owner.Controller = pointer.BoolPtr(false)
-		}
-		ownerRefs = append(ownerRefs, owner)
-	}
-	rsc.SetOwnerReferences(ownerRefs)
-	return exists
-}
-
-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
-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(),
-		},
-	})
-}
-
-// AddTrackedCluster add resourcetracker in remote cluster into tracked resources, return if already exists
-func (in *ResourceTracker) AddTrackedCluster(clusterName string) bool {
-	if clusterName == "" {
-		return true
-	}
-	return in.addClusterObjectReference(common.ClusterObjectReference{
-		Cluster: clusterName,
-		ObjectReference: v1.ObjectReference{
-			APIVersion: SchemeGroupVersion.String(),
-			Kind:       ResourceTrackerKind,
-			Name:       in.GetName(),
-		},
-	})
-}
-
-// GetTrackedClusters return remote clusters recorded in the resource tracker
-func (in *ResourceTracker) GetTrackedClusters() (clusters []string) {
-	for _, ref := range in.Status.TrackedResources {
-		if ref.APIVersion == SchemeGroupVersion.String() && ref.Kind == ResourceTrackerKind && ref.Name == in.Name && ref.Cluster != "" {
-			clusters = append(clusters, ref.Cluster)
-		}
-	}
-	return
-}
-
-// IsLifeLong check if resourcetracker shares the same whole life with the entire application
-func (in *ResourceTracker) IsLifeLong() bool {
-	_, ok := in.GetAnnotations()[oam.AnnotationResourceTrackerLifeLong]
-	return ok
-}
-
-// SetLifeLong set life long to resource tracker
-func (in *ResourceTracker) SetLifeLong() {
-	in.SetAnnotations(map[string]string{oam.AnnotationResourceTrackerLifeLong: "true"})
-}

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

@@ -21,6 +21,7 @@ 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"
 
@@ -789,6 +790,22 @@ func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DependsOn) DeepCopyInto(out *DependsOn) {
+	*out = *in
+	out.Ref = in.Ref
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DependsOn.
+func (in *DependsOn) DeepCopy() *DependsOn {
+	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
@@ -840,6 +857,102 @@ func (in *HTTPRule) DeepCopy() *HTTPRule {
 	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
@@ -1039,7 +1152,7 @@ func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
 	*out = *in
 	if in.TrackedResources != nil {
 		in, out := &in.TrackedResources, &out.TrackedResources
-		*out = make([]common.ClusterObjectReference, len(*in))
+		*out = make([]corev1.ObjectReference, len(*in))
 		copy(*out, *in)
 	}
 }

apis/generate.go

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

apis/interfaces/resourcetracker.go

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

apis/types/capability.go

@@ -19,14 +19,12 @@ package types
 import (
 	"encoding/json"
 
-	"cuelang.org/go/cue"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-	"github.com/oam-dev/kubevela/pkg/apiserver/rest/utils"
+
+	"cuelang.org/go/cue"
+	"github.com/spf13/pflag"
 )
 
 // Source record the source of Capability
@@ -81,8 +79,6 @@ const CapabilityConfigMapNamePrefix = "schema-"
 const (
 	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
 	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
-	// UISchema is the key to store ui custom schema
-	UISchema string = "ui-schema"
 )
 
 // CapabilityCategory defines the category of a capability
@@ -187,51 +183,3 @@ type Capability struct {
 	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`
 	KubeParameter []common.KubeParameter `json:"kubeparameter,omitempty"`
 }
-
-// Addon contains all information represent an addon
-type Addon struct {
-	AddonMeta
-
-	APISchema *openapi3.Schema     `json:"schema"`
-	UISchema  []*utils.UIParameter `json:"uiSchema"`
-
-	// More details about the addon, e.g. README
-	Detail        string               `json:"detail,omitempty"`
-	Definitions   []AddonElementFile   `json:"definitions"`
-	Parameters    string               `json:"parameters"`
-	CUETemplates  []AddonElementFile   `json:"cue_templates"`
-	YAMLTemplates []AddonElementFile   `json:"yaml_templates,omitempty"`
-	DefSchemas    []AddonElementFile   `json:"def_schemas,omitempty"`
-	AppTemplate   *v1beta1.Application `json:"app_template"`
-}
-
-// AddonMeta defines the format for a single addon
-type AddonMeta struct {
-	Name          string             `json:"name" validate:"required"`
-	Version       string             `json:"version"`
-	Description   string             `json:"description"`
-	Icon          string             `json:"icon"`
-	URL           string             `json:"url,omitempty"`
-	Tags          []string           `json:"tags,omitempty"`
-	DeployTo      *AddonDeployTo     `json:"deployTo,omitempty"`
-	Dependencies  []*AddonDependency `json:"dependencies,omitempty"`
-	NeedNamespace []string           `json:"needNamespace,omitempty"`
-	Invisible     bool               `json:"invisible"`
-}
-
-// AddonDeployTo defines where the addon to deploy to
-type AddonDeployTo struct {
-	ControlPlane   bool `json:"control_plane"`
-	RuntimeCluster bool `json:"runtime_cluster"`
-}
-
-// AddonDependency defines the other addons it depends on
-type AddonDependency struct {
-	Name string `json:"name,omitempty"`
-}
-
-// AddonElementFile can be addon's definition or addon's component
-type AddonElementFile struct {
-	Data string
-	Name string
-}

apis/types/types.go

@@ -36,18 +36,8 @@ const (
 )
 
 const (
-	// AnnoDefinitionDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
-	AnnoDefinitionDescription = "definition.oam.dev/description"
-	// 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"
+	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
+	AnnDescription = "definition.oam.dev/description"
 )
 
 const (
@@ -97,11 +87,3 @@ var DefaultFilterAnnots = []string{
 	oam.AnnotationFilterAnnotationKeys,
 	oam.AnnotationLastAppliedConfiguration,
 }
-
-// Cluster contains base info of cluster
-type Cluster struct {
-	Name     string
-	Type     string
-	EndPoint string
-	Accepted bool
-}

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

@@ -0,0 +1,593 @@
+
+---
+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,11 +188,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -206,15 +201,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -224,22 +215,6 @@ 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
@@ -497,11 +472,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -515,15 +485,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -533,22 +499,6 @@ 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,11 +193,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -211,15 +206,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -229,22 +220,6 @@ 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
@@ -483,11 +458,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -501,15 +471,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -519,22 +485,6 @@ 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.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create

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

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch

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

@@ -0,0 +1,13 @@
+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,7 @@ spec:
             {{ end }}
             - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
             - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .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: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
+      image: busybox
       command: ['wget']
       args: ['{{ include "oam-runtime.fullname" . }}:{{ .Values.healthCheck.port }}']
   restartPolicy: Never

charts/oam-runtime/values.yaml

@@ -7,8 +7,6 @@ replicaCount: 1
 applyOnceOnly: "off"
 
 disableCaps: "all"
-
-imageRegistry: ""
 image:
   repository: oamdev/vela-core
   tag: latest
@@ -100,9 +98,4 @@ concurrentReconciles: 4
 dependCheckWait: 30s
 
 # OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.2"
-
-test:
-  app:
-    repository: oamdev/busybox
-    tag: v1
+OAMSpecVer: "v0.2"

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

@@ -622,23 +622,6 @@ spec:
                         description: The generation observed by the application controller.
                         format: int64
                         type: integer
-                      policy:
-                        description: PolicyStatus records the status of policy
-                        items:
-                          description: PolicyStatus records the status of policy
-                          properties:
-                            name:
-                              type: string
-                            status:
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
-                            type:
-                              type: string
-                          required:
-                          - name
-                          - type
-                          type: object
-                        type: array
                       resourceTracker:
                         description: ResourceTracker record the status of the ResourceTracker
                         properties:
@@ -909,7 +892,7 @@ spec:
                         type: array
                       status:
                         description: ApplicationPhase is a label for the condition
-                          of an application at the current time
+                          of a application at the current time
                         type: string
                       workflow:
                         description: Workflow record the status of workflow
@@ -983,31 +966,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          finished:
-                            type: boolean
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string
-                          startTime:
-                            format: date-time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
                                 a workflow step
                               properties:
-                                firstExecuteTime:
-                                  description: FirstExecuteTime is the first time
-                                    this step execution.
-                                  format: date-time
-                                  type: string
                                 id:
                                   type: string
-                                lastExecuteTime:
-                                  description: LastExecuteTime is the last time this
-                                    step execution.
-                                  format: date-time
-                                  type: string
                                 message:
                                   description: A human readable message indicating
                                     details about why the workflowStep is in this
@@ -1075,7 +1043,6 @@ spec:
                           terminated:
                             type: boolean
                         required:
-                        - finished
                         - mode
                         - suspend
                         - terminated
@@ -1265,12 +1232,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -1284,16 +1245,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -1303,23 +1259,6 @@ 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
@@ -1700,12 +1639,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -1719,16 +1652,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -1738,23 +1666,6 @@ 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
@@ -2033,12 +1944,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -2052,16 +1957,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -2071,23 +1971,6 @@ 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
@@ -2879,23 +2762,6 @@ spec:
                         description: The generation observed by the application controller.
                         format: int64
                         type: integer
-                      policy:
-                        description: PolicyStatus records the status of policy
-                        items:
-                          description: PolicyStatus records the status of policy
-                          properties:
-                            name:
-                              type: string
-                            status:
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
-                            type:
-                              type: string
-                          required:
-                          - name
-                          - type
-                          type: object
-                        type: array
                       resourceTracker:
                         description: ResourceTracker record the status of the ResourceTracker
                         properties:
@@ -3166,7 +3032,7 @@ spec:
                         type: array
                       status:
                         description: ApplicationPhase is a label for the condition
-                          of an application at the current time
+                          of a application at the current time
                         type: string
                       workflow:
                         description: Workflow record the status of workflow
@@ -3240,31 +3106,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          finished:
-                            type: boolean
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string
-                          startTime:
-                            format: date-time
-                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
                                 a workflow step
                               properties:
-                                firstExecuteTime:
-                                  description: FirstExecuteTime is the first time
-                                    this step execution.
-                                  format: date-time
-                                  type: string
                                 id:
                                   type: string
-                                lastExecuteTime:
-                                  description: LastExecuteTime is the last time this
-                                    step execution.
-                                  format: date-time
-                                  type: string
                                 message:
                                   description: A human readable message indicating
                                     details about why the workflowStep is in this
@@ -3332,7 +3183,6 @@ spec:
                           terminated:
                             type: boolean
                         required:
-                        - finished
                         - mode
                         - suspend
                         - terminated
@@ -3522,12 +3372,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -3541,16 +3385,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -3560,23 +3399,6 @@ 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
@@ -3850,12 +3672,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -3869,16 +3685,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -3888,23 +3699,6 @@ 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
@@ -4267,12 +4061,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -4286,16 +4074,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -4305,23 +4088,6 @@ 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
@@ -4563,12 +4329,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -4582,16 +4342,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -4601,23 +4356,6 @@ 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
@@ -4879,12 +4617,6 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   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
@@ -4898,16 +4630,11 @@ spec:
                                       type: string
                                     namespace:
                                       default: default
-                                      description: Namespace of the referenced object.
+                                      description: Namespace of the secret.
                                       type: string
                                   required:
                                   - name
                                   type: object
-                                region:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                 type:
                                   default: hcl
                                   description: Type specifies which Terraform configuration
@@ -4917,23 +4644,6 @@ 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_applications.yaml

@@ -443,23 +443,6 @@ spec:
                 description: The generation observed by the application controller.
                 format: int64
                 type: integer
-              policy:
-                description: PolicyStatus records the status of policy
-                items:
-                  description: PolicyStatus records the status of policy
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
               resourceTracker:
                 description: ResourceTracker record the status of the ResourceTracker
                 properties:
@@ -633,7 +616,7 @@ spec:
                   type: object
                 type: array
               status:
-                description: ApplicationPhase is a label for the condition of an application at the current time
+                description: ApplicationPhase is a label for the condition of a application at the current time
                 type: string
               workflow:
                 description: Workflow record the status of workflow
@@ -665,28 +648,15 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  finished:
-                    type: boolean
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string
-                  startTime:
-                    format: date-time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow step
                       properties:
-                        firstExecuteTime:
-                          description: FirstExecuteTime is the first time this step execution.
-                          format: date-time
-                          type: string
                         id:
                           type: string
-                        lastExecuteTime:
-                          description: LastExecuteTime is the last time this step execution.
-                          format: date-time
-                          type: string
                         message:
                           description: A human readable message indicating details about why the workflowStep is in this state.
                           type: string
@@ -741,7 +711,6 @@ spec:
                   terminated:
                     type: boolean
                 required:
-                - finished
                 - mode
                 - suspend
                 - terminated
@@ -1267,23 +1236,6 @@ spec:
                 description: The generation observed by the application controller.
                 format: int64
                 type: integer
-              policy:
-                description: PolicyStatus records the status of policy
-                items:
-                  description: PolicyStatus records the status of policy
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
               resourceTracker:
                 description: ResourceTracker record the status of the ResourceTracker
                 properties:
@@ -1457,7 +1409,7 @@ spec:
                   type: object
                 type: array
               status:
-                description: ApplicationPhase is a label for the condition of an application at the current time
+                description: ApplicationPhase is a label for the condition of a application at the current time
                 type: string
               workflow:
                 description: Workflow record the status of workflow
@@ -1489,28 +1441,15 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  finished:
-                    type: boolean
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string
-                  startTime:
-                    format: date-time
-                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow step
                       properties:
-                        firstExecuteTime:
-                          description: FirstExecuteTime is the first time this step execution.
-                          format: date-time
-                          type: string
                         id:
                           type: string
-                        lastExecuteTime:
-                          description: LastExecuteTime is the last time this step execution.
-                          format: date-time
-                          type: string
                         message:
                           description: A human readable message indicating details about why the workflowStep is in this state.
                           type: string
@@ -1565,7 +1504,6 @@ spec:
                   terminated:
                     type: boolean
                 required:
-                - finished
                 - mode
                 - suspend
                 - terminated

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

@@ -179,11 +179,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -197,15 +192,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -215,22 +206,6 @@ 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,11 +467,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -510,15 +480,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -528,22 +494,6 @@ 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

@@ -0,0 +1,593 @@
+
+---
+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,12 +222,6 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 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
@@ -241,16 +235,11 @@ spec:
                                     type: string
                                   namespace:
                                     default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                     type: string
                                 required:
                                 - name
                                 type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -260,23 +249,6 @@ 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
@@ -538,12 +510,6 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 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
@@ -557,16 +523,11 @@ spec:
                                     type: string
                                   namespace:
                                     default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                     type: string
                                 required:
                                 - name
                                 type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -576,23 +537,6 @@ 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
@@ -847,12 +791,6 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 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
@@ -866,16 +804,11 @@ spec:
                                     type: string
                                   namespace:
                                     default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                     type: string
                                 required:
                                 - name
                                 type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -885,23 +818,6 @@ 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
@@ -1137,12 +1053,6 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 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
@@ -1156,16 +1066,11 @@ spec:
                                     type: string
                                   namespace:
                                     default: default
-                                    description: Namespace of the referenced object.
+                                    description: Namespace of the secret.
                                     type: string
                                 required:
                                 - name
                                 type: object
-                              region:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                               type:
                                 default: hcl
                                 description: Type specifies which Terraform configuration
@@ -1175,23 +1080,6 @@ 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_policydefinitions.yaml

@@ -151,11 +151,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -169,15 +164,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -187,22 +178,6 @@ 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

@@ -42,17 +42,35 @@ spec:
             properties:
               trackedResources:
                 items:
-                  description: ClusterObjectReference defines the object reference
-                    with cluster.
+                  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
-                    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,11 +188,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -206,15 +201,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -224,22 +215,6 @@ 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
@@ -497,11 +472,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -515,15 +485,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -533,22 +499,6 @@ 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_workflowstepdefinitions.yaml

@@ -148,11 +148,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -166,15 +161,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -184,22 +175,6 @@ 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_workloaddefinitions.yaml

@@ -193,11 +193,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -211,15 +206,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -229,22 +220,6 @@ 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
@@ -483,11 +458,6 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         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
@@ -501,15 +471,11 @@ spec:
                             type: string
                           namespace:
                             default: default
-                            description: Namespace of the referenced object.
+                            description: Namespace of the secret.
                             type: string
                         required:
                         - name
                         type: object
-                      region:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                       type:
                         default: hcl
                         description: Type specifies which Terraform configuration
@@ -519,22 +485,6 @@ 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/_helpers.tpl

@@ -51,6 +51,11 @@ 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

charts/vela-core/templates/addon_registry.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vela-addon-registry
-  namespace: vela-system
-data:
-  registries: '{
-  "KubeVela":{
-    "name": "KubeVela",
-    "oss": {
-      "end_point": "https://addons.kubevela.net",
-      "bucket": ""
-    }
-  }
-}'

charts/vela-core/templates/addons/fluxcd.yaml

@@ -6019,13 +6019,14 @@ data:
           type: apply-component
         - name: apply-resources
           type: apply-remaining
-    status: {}
-  detail: "# fluxcd\n\nThis addon is built based [FluxCD](https://fluxcd.io/) \n\n##
-    install\n\n```shell\nvela addon enable fluxcd\n```\n\n## X-Definitions\n\nEnable
-    fluxcd addon to use these X-definitions\n\n- [helm](https://kubevela.io/docs/end-user/components/helm)
-    helps to deploy a helm chart from everywhere:\ngit repo / helm repo / S3 compatible
-    bucket.\n\n- [kustomize](https://kubevela.io/docs/end-user/components/kustomize)
-    helps to deploy a kustomize style artifact.\n"
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/addons/istio.yaml

@@ -8,7 +8,7 @@ data:
         addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
           traffic.
       name: istio
-      namespace: vela-system
+      namespace: istio-system
     spec:
       components:
       - name: ns-istio-system
@@ -244,11 +244,14 @@ data:
           type: apply-component
         - name: apply-resources
           type: apply-remaining
-    status: {}
-  detail: |-
-    # istio
-
-    This addon provides istio support for vela rollout.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/addons/keda.yaml

@@ -0,0 +1,44 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
+      name: keda
+      namespace: vela-system
+    spec:
+      components:
+      - name: keda
+        properties:
+          chart: keda
+          repoType: helm
+          url: https://kedacore.github.io/charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
+    addons.oam.dev/name: keda
+  labels:
+    addons.oam.dev/type: keda
+  name: keda
+  namespace: {{.Values.systemDefinitionNamespace}}

charts/vela-core/templates/addons/kruise.yaml

@@ -169,11 +169,14 @@ data:
           type: depends-on-app
         - name: apply-resources
           type: apply-application
-    status: {}
-  detail: |-
-    # kruise
-
-    This addon provides [open-kruise](https://github.com/openkruise/kruise) workload.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/addons/observability.yaml

@@ -10,13 +10,106 @@ data:
       namespace: vela-system
     spec:
       components:
+      - name: ns-observability
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: observability
+        type: raw
+      - name: import-grafana-dashboard-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Import dashboards to Grafana
+            name: import-grafana-dashboard
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
+                  {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:   *\"default\"
+                  | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
+                  *\"default\" | string\n\turls: [...string]\n}\n"
+        type: raw
+      - name: pure-ingress-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Enable public web traffic for the component
+                without creating a Service.
+            name: pure-ingress
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
+                  \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec: {\n\t\trules:
+                  [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths: [\n\t\t\t\t\tfor
+                  k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
+                  {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
+                  v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
+                  {\n\t// +usage=Specify the domain you want to expose\n\tdomain: string\n\n\t//
+                  +usage=Specify the mapping relationship between the http path and the
+                  workload port\n\thttp: [string]: int\n}\n"
+            status:
+              customStatus: |-
+                let igs = context.outputs.ingress.status.loadBalancer.ingress
+                if igs == _|_ {
+                  message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+                }
+                if len(igs) > 0 {
+                  if igs[0].ip != _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+                  }
+                  if igs[0].ip == _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+                  }
+                }
+              healthPolicy: |
+                isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+        type: raw
+      - name: register-grafana-datasource-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Add a datasource to Grafana
+            name: register-grafana-datasource
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
+                  \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
+                  \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
+                  parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
+                  \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
+                  \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
+                  \                     string\n\taccess:                    *\"proxy\"
+                  | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
+                  | string\n}\n"
+        type: raw
       - name: grafana-registration
         properties:
           chart: ./chart
           git:
             branch: master
           repoType: git
-          targetNamespace: vela-system
+          targetNamespace: observability
           url: https://github.com/oam-dev/grafana-registration
           values:
             replicaCount: 1
@@ -26,7 +119,7 @@ data:
           chart: grafana
           releaseName: grafana
           repoType: helm
-          targetNamespace: vela-system
+          targetNamespace: observability
           url: https://charts.kubevela.net/addons
           version: 6.14.1
         traits:
@@ -37,9 +130,9 @@ data:
           type: pure-ingress
         - properties:
             credentialSecret: grafana
-            credentialSecretNamespace: vela-system
+            credentialSecretNamespace: observability
             grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
+            grafanaServiceNamespace: observability
             urls:
             - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
             - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
@@ -52,18 +145,18 @@ data:
           chart: loki-stack
           releaseName: loki
           repoType: helm
-          targetNamespace: vela-system
+          targetNamespace: observability
           url: https://charts.kubevela.net/addons
           version: 2.4.1
         traits:
         - properties:
             access: proxy
             credentialSecret: grafana
-            credentialSecretNamespace: vela-system
+            credentialSecretNamespace: observability
             grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
+            grafanaServiceNamespace: observability
             name: loki
-            namespace: vela-system
+            namespace: observability
             service: loki
             type: loki
           type: register-grafana-datasource
@@ -73,7 +166,7 @@ data:
           chart: prometheus
           releaseName: prometheus
           repoType: helm
-          targetNamespace: vela-system
+          targetNamespace: observability
           url: https://charts.kubevela.net/addons
           values:
             alertmanager:
@@ -91,11 +184,11 @@ data:
         - properties:
             access: proxy
             credentialSecret: grafana
-            credentialSecretNamespace: vela-system
+            credentialSecretNamespace: observability
             grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
+            grafanaServiceNamespace: observability
             name: prometheus
-            namespace: vela-system
+            namespace: observability
             service: prometheus-server
             type: prometheus
           type: register-grafana-datasource
@@ -104,7 +197,7 @@ data:
         properties:
           chart: kube-state-metrics
           repoType: helm
-          targetNamespace: vela-system
+          targetNamespace: observability
           url: https://charts.kubevela.net/addons
           values:
             image:
@@ -119,13 +212,32 @@ data:
             name: fluxcd
             namespace: vela-system
           type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-observability
+          type: apply-component
+        - name: apply-trait-1
+          properties:
+            component: import-grafana-dashboard-traitdef
+          type: apply-component
+        - name: apply-trait-2
+          properties:
+            component: pure-ingress-traitdef
+          type: apply-component
+        - name: apply-trait-3
+          properties:
+            component: register-grafana-datasource-traitdef
+          type: apply-component
         - name: apply-resources
           type: apply-remaining
-    status: {}
-  detail: |-
-    # observability
-
-    This addon expose system and application level metrics for KubeVela.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/addons/ocm-cluster-manager.yaml

@@ -502,11 +502,14 @@ data:
           type: apply-component
         - name: apply-resources
           type: apply-remaining
-    status: {}
-  detail: |-
-    # ocm-cluster-manager
-
-    This addon aims to support multi-cluster application deployment.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/addons/prometheus.yaml

@@ -0,0 +1,46 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Prometheus is an open-source systems monitoring and
+          alerting toolkit
+      name: prometheus
+      namespace: vela-system
+    spec:
+      components:
+      - name: prometheus
+        properties:
+          chart: premetheus
+          repoType: helm
+          url: https://prometheus-community.github.io/helm-charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Prometheus is an open-source systems monitoring and
+      alerting toolkit
+    addons.oam.dev/name: prometheus
+  labels:
+    addons.oam.dev/type: prometheus
+  name: prometheus
+  namespace: {{.Values.systemDefinitionNamespace}}

charts/vela-core/templates/addons/terraform-provider-alibaba.yaml

@@ -6,17 +6,17 @@ data:
     metadata:
       annotations:
         addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
-        addons.oam.dev/name: terraform-alibaba
-      name: terraform-alibaba
+        addons.oam.dev/name: terraform/provider-alibaba
+      name: terraform-provider-alibaba
       namespace: vela-system
     spec:
       components:
-      - name: alibaba-account-creds-[[ index .Args "providerName" ]]
+      - name: alibaba-account-creds
         properties:
           apiVersion: v1
           kind: Secret
           metadata:
-            name: alibaba-account-creds-[[ index .Args "providerName" ]]
+            name: alibaba-account-creds
             namespace: vela-system
           stringData:
             credentials: |
@@ -25,43 +25,37 @@ data:
               securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
           type: Opaque
         type: raw
-      - name: alibaba-[[ index .Args "providerName" ]]
+      - name: default
         properties:
           apiVersion: terraform.core.oam.dev/v1beta1
           kind: Provider
           metadata:
-            name: '[[ index .Args "providerName" ]]'
+            name: default
             namespace: default
           spec:
             credentials:
               secretRef:
                 key: credentials
-                name: alibaba-account-creds-[[ index .Args "providerName" ]]
+                name: alibaba-account-creds
                 namespace: vela-system
               source: Secret
             provider: alibaba
             region: '[[ index .Args "ALICLOUD_REGION" ]]'
         type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: terraform
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: |
-    # terraform-alibaba
-
-    This addon contains terraform provider for Alibaba Cloud.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
-    addons.oam.dev/name: terraform-alibaba
+    addons.oam.dev/name: terraform/provider-alibaba
   labels:
-    addons.oam.dev/type: terraform-alibaba
-  name: terraform-alibaba
+    addons.oam.dev/type: terraform-provider-alibaba
+  name: terraform-provider-alibaba
   namespace: {{.Values.systemDefinitionNamespace}}

charts/vela-core/templates/addons/terraform-provider-aws.yaml

@@ -6,8 +6,8 @@ data:
     metadata:
       annotations:
         addons.oam.dev/description: Kubernetes Terraform Controller for AWS
-        addons.oam.dev/name: terraform-aws
-      name: terraform-aws
+        addons.oam.dev/name: terraform/provider-aws
+      name: terraform-provider-aws
       namespace: vela-system
     spec:
       components:
@@ -42,26 +42,20 @@ data:
             provider: aws
             region: '[[ index .Args "AWS_DEFAULT_REGION" ]]'
         type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: terraform
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: |
-    # terraform-aws
-
-    This addon contains terraform provider for AWS.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for AWS
-    addons.oam.dev/name: terraform-aws
+    addons.oam.dev/name: terraform/provider-aws
   labels:
-    addons.oam.dev/type: terraform-aws
-  name: terraform-aws
+    addons.oam.dev/type: terraform-provider-aws
+  name: terraform-provider-aws
   namespace: {{.Values.systemDefinitionNamespace}}

charts/vela-core/templates/addons/terraform-provider-azure.yaml

@@ -6,8 +6,8 @@ data:
     metadata:
       annotations:
         addons.oam.dev/description: Kubernetes Terraform Controller for Azure
-        addons.oam.dev/name: terraform-azure
-      name: terraform-azure
+        addons.oam.dev/name: terraform/provider-azure
+      name: terraform-provider-azure
       namespace: vela-system
     spec:
       components:
@@ -42,26 +42,20 @@ data:
               source: Secret
             provider: azure
         type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: terraform
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: |
-    # terraform-azure
-
-    This addon contains terraform provider for Azure.
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Azure
-    addons.oam.dev/name: terraform-azure
+    addons.oam.dev/name: terraform/provider-azure
   labels:
-    addons.oam.dev/type: terraform-azure
-  name: terraform-azure
+    addons.oam.dev/type: terraform-provider-azure
+  name: terraform-provider-azure
   namespace: {{.Values.systemDefinitionNamespace}}

charts/vela-core/templates/addons/terraform.yaml

@@ -11,12 +11,19 @@ data:
       namespace: vela-system
     spec:
       components:
+      - name: ns-terraform-system
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: terraform-system
+        type: raw
       - name: terraform-controller
         properties:
           chart: terraform-controller
           repoType: helm
           url: https://charts.kubevela.net/addons
-          version: 0.2.10
+          version: 0.2.6
         type: helm
       - name: alibaba-ack
         properties:
@@ -41,29 +48,6 @@ data:
                 apiVersion: terraform.core.oam.dev/v1beta1
                 kind: Configuration
         type: raw
-      - name: alibaba-ask
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                Serverless Kubernetes (ASK)
-            labels:
-              type: terraform
-            name: alibaba-ask
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/cs/serverless-kubernetes
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
       - name: alibaba-eip
         properties:
           apiVersion: core.oam.dev/v1alpha2
@@ -92,8 +76,6 @@ data:
           kind: ComponentDefinition
           metadata:
             annotations:
-              cloud-resource/console-url: https://oss.console.aliyun.com/bucket/oss-{ALICLOUD_REGION}/{BUCKET_NAME}/overview
-              cloud-resource/identifier: BUCKET_NAME
               definition.oam.dev/description: Terraform configuration for Alibaba Cloud
                 OSS object
             labels:
@@ -121,9 +103,6 @@ data:
           kind: ComponentDefinition
           metadata:
             annotations:
-              cloud-resource/console-url: https://rdsnext.console.aliyun.com/detail/{DB_ID}/basicInfo?&region={ALICLOUD_REGION}
-              cloud-resource/identifier: DB_ID
-              cloud-resource/sensitive-outputs: DB_PASSWORD
               definition.oam.dev/description: Terraform configuration for Alibaba Cloud
                 RDS object
             labels:
@@ -147,10 +126,6 @@ data:
                     security_ips = ["0.0.0.0/0",]
                   }
 
-                  output "DB_ID" {
-                    value = module.rds.db_instance_id
-                  }
-
                   output "DB_NAME" {
                     value = module.rds.this_db_instance_name
                   }
@@ -198,120 +173,6 @@ data:
                 apiVersion: terraform.core.oam.dev/v1beta1
                 kind: Configuration
         type: raw
-      - name: alibaba-redis
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                Redis
-            labels:
-              type: terraform
-            name: alibaba-redis
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules/alibaba/redis
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-sls-project
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                SLS Project
-            labels:
-              type: terraform
-            name: alibaba-sls-project
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/sls/project
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-sls-store
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                SLS Store
-            labels:
-              type: terraform
-            name: alibaba-sls-store
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/sls/store
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-vpc
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                VPC
-            labels:
-              type: terraform
-            name: alibaba-vpc
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/vpc
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-vswitch
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                VSwitch
-            labels:
-              type: terraform
-            name: alibaba-vswitch
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/vswitch
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
       - name: aws-s3
         properties:
           apiVersion: core.oam.dev/v1alpha2
@@ -468,121 +329,27 @@ data:
                 apiVersion: terraform.core.oam.dev/v1beta1
                 kind: Configuration
         type: raw
-      - name: azure-storage-account
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Azure Blob Storage
-                Account
-              provider: azure
-            labels:
-              type: terraform
-            name: azure-storage-account
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  # Configure the Microsoft Azure Provider
-                  provider "azurerm" {
-                    features {}
-                  }
-
-                  resource "azurerm_resource_group" "rsg" {
-                    count    = var.create_rsg ? 1 : 0
-                    name     = var.resource_group_name
-                    location = var.location
-                  }
-
-                  resource "azurerm_storage_account" "sa" {
-                    name                      = var.name
-                    resource_group_name       = var.create_rsg ? azurerm_resource_group.rsg[0].name : var.resource_group_name
-                    location                  = var.location
-                    account_tier              = "Standard"
-                    account_replication_type  = "GRS"
-                    enable_https_traffic_only = true
-
-                    dynamic "static_website" {
-                      for_each = var.static_website
-                      content {
-                        index_document     = static_website.value["index_document"]
-                        error_404_document = static_website.value["error_404_document"]
-                      }
-                    }
-
-                    tags = var.tags
-                  }
-
-                  variable "create_rsg" {
-                    description = "Conditional if resource group should be created. Defaults to 'true'."
-                    type        = bool
-                    default     = true
-                  }
-
-                  variable "resource_group_name" {
-                    description = "Name of resource group. Defaults to 'rsg'."
-                    type        = string
-                    default     = "rsg"
-                  }
-
-                  variable "name" {
-                    description = "Name of storage account. Defaults to 'storageaccount'."
-                    type        = string
-                    default     = "storageaccount"
-                  }
-
-                  variable "location" {
-                    description = "Location of storage account. Defaults to 'West Europe'."
-                    type        = string
-                    default     = "West Europe"
-                  }
-
-                  variable "tags" {
-                    description = "Tags for storage account. Defaults to '{}'."
-                    type        = map(string)
-                    default     = {}
-                  }
-
-                  variable "static_website" {
-                    description = "Static website configuration. Defaults to disabled."
-                    type        = list(map(string))
-                    default     = [{
-                      index_document = null
-                      error_404_document = null
-                    }]
-                  }
-
-                  output "BLOB_CONNECTION_STRING" {
-                    description = "Blob storage connection string"
-                    sensitive   = true
-                    value       = azurerm_storage_account.sa.primary_connection_string
-                  }
-
-                  output "BLOB_WEB_ENDPOINT" {
-                    description = "Blob storage static web endpoint"
-                    value       = azurerm_storage_account.sa.primary_web_endpoint
-                  }
-                providerRef:
-                  name: azure
-                  namespace: default
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
       workflow:
         steps:
-        - name: ""
+        - name: checking-depends-on
           properties:
             name: fluxcd
             namespace: vela-system
           type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: ""
+        - name: apply-ns
+          properties:
+            component: ns-terraform-system
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create

charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch

charts/vela-core/templates/cluster-gateway.yaml

@@ -35,7 +35,7 @@ spec:
             {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
             - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}"
             {{ end }}
-          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
           imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
           resources:
           {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
@@ -107,64 +107,6 @@ spec:
 {{ end }}
 ---
 {{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-  labels:
-    app: {{ template "kubevela.name" . }}-cluster-gateway-admission
-    {{- include "kubevela.labels" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - get
-      - create
-{{- end }}
----
-{{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-  labels:
-    app: {{ template "kubevela.name" . }}-cluster-gateway-admission
-    {{- include "kubevela.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
-    namespace: {{ .Release.Namespace }}
-{{- end }}
----
-{{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-  labels:
-    app: {{ template "kubevela.name" . }}-cluster-gateway-admission
-    {{- include "kubevela.labels" . | nindent 4 }}
-{{- end }}
----
-{{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -190,7 +132,7 @@ spec:
     spec:
       containers:
       - name: create
-        image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+        image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
         imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
         args:
           - create
@@ -200,7 +142,7 @@ spec:
           - --key-name=apiserver.key
           - --cert-name=apiserver.crt
       restartPolicy: OnFailure
-      serviceAccountName: {{ template "kubevela.fullname" . }}-cluster-gateway-admission
+      serviceAccountName: {{ template "kubevela.fullname" . }}-admission
       securityContext:
         runAsGroup: 2000
         runAsNonRoot: true
@@ -233,7 +175,7 @@ spec:
     spec:
       containers:
       - name: patch
-        image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+        image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
         imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
         command:
           - /patch

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

@@ -0,0 +1,13 @@
+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/vela-core/templates/defwithtemplate/annotations.yaml

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add annotations on K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/apply-application.yaml

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Apply application for your workflow steps
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/apply-object.yaml

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Apply raw kubernetes objects for your workflow steps
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: apply-object
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/apply-remaining.yaml

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Apply remaining components and traits
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -1,12 +1,10 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/deprecated/configmap.cue
+# Definition source cue file: vela-templates/definitions/internal/configmap.cue
 apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Create/Attach configmaps on K8s pod for your workload which follows the pod spec in path 'spec.template'. This definition is DEPRECATED, please specify configmap in 'storage' instead.
-  labels:
-    custom.definition.oam.dev/deprecated: "true"
+    definition.oam.dev/description: Create/Attach configmaps on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: configmap
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Automatically scale the component based on CPU usage.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -16,30 +14,38 @@ spec:
     cue:
       template: |
         outputs: cpuscaler: {
-        	apiVersion: "autoscaling/v1"
+        	apiVersion: "autoscaling/v2beta2"
         	kind:       "HorizontalPodAutoscaler"
         	metadata: name: context.name
         	spec: {
         		scaleTargetRef: {
-        			apiVersion: parameter.targetAPIVersion
-        			kind:       parameter.targetKind
+        			apiVersion: "apps/v1"
+        			kind:       "Deployment"
         			name:       context.name
         		}
-        		minReplicas:                    parameter.min
-        		maxReplicas:                    parameter.max
-        		targetCPUUtilizationPercentage: parameter.cpuUtil
+        		minReplicas: parameter.min
+        		maxReplicas: parameter.max
+        		metrics: [{
+        			type: "Resource"
+        			resource: {
+        				name: "cpu"
+        				target: {
+        					type:               "Utilization"
+        					averageUtilization: parameter.cpuUtil
+        				}
+        			}
+        		}]
         	}
         }
         parameter: {
+
         	// +usage=Specify the minimal number of replicas to which the autoscaler can scale down
         	min: *1 | int
+
         	// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up
         	max: *10 | int
-        	// +usage=Specify the average CPU utilization, for example, 50 means the CPU usage is 50%
+
+        	// +usage=Specify the average cpu utilization, for example, 50 means the CPU usage is 50%
         	cpuUtil: *50 | int
-        	// +usage=Specify the apiVersion of scale target
-        	targetAPIVersion: *"apps/v1" | string
-        	// +usage=Specify the kind of scale target
-        	targetKind: *"Deployment" | string
         }
 

charts/vela-core/templates/defwithtemplate/depends-on-app.yaml

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: check or install depends-on Application
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: depends-on-app
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -29,7 +27,7 @@ spec:
         	}
         }
         load: op.#Steps & {
-        	if dependsOn.err != _|_ {
+        	if dependsOn.err != _|_ && dependsOn.value == _|_ {
         		configMap: op.#Read & {
         			value: {
         				apiVersion: "v1"
@@ -39,17 +37,18 @@ spec:
         					namespace: parameter.namespace
         				}
         			}
-        		}         @step(1)
-        		template: configMap.value.data["application"]
-        		apply:    op.#Apply & {
-        			value: yaml.Unmarshal(template)
-        		}     @step(2)
+        		}
+        		apply: op.#Apply & {
+        			value: {
+        				yaml.Unmarshal(configMap.value.data[parameter.name])
+        			}
+        		}
         		wait: op.#ConditionalWait & {
-        			continue: apply.value.status.status == "running"
-        		} @step(3)
+        			continue: load.apply.value.status.status == "running"
+        		}
         	}
 
-        	if dependsOn.err == _|_ {
+        	if dependsOn.value != _|_ {
         		wait: op.#ConditionalWait & {
         			continue: dependsOn.value.status.status == "running"
         		}

charts/vela-core/templates/defwithtemplate/deploy-cloud-resource.yaml

@@ -1,32 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/deploy-cloud-resource.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Deploy cloud resource and bind secret to clusters
-  name: deploy-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        app: op.#DeployCloudResource & {
-        	env:    parameter.env
-        	policy: parameter.policy
-        	// context.namespace indicates the namespace of the app
-        	namespace: context.namespace
-        	// context.namespace indicates the name of the app
-        	name: context.name
-        }
-        parameter: {
-        	// +usage=Declare the name of the env-binding policy, if empty, the first env-binding policy will be used
-        	policy: *"" | string
-        	// +usage=Declare the name of the env in policy
-        	env: string
-        }
-

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

@@ -23,8 +23,8 @@ spec:
         	namespace: context.namespace
         }
         parameter: {
-        	// +usage=Declare the name of the env-binding policy, if empty, the first env-binding policy will be used
-        	policy: *"" | string
+        	// +usage=Declare the name of the policy
+        	policy: string
         	// +usage=Declare the name of the env in policy
         	env: string
         }

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

@@ -1,44 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/deploy2runtime.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Deploy application to runtime clusters
-  name: deploy2runtime
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        app: op.#Steps & {
-        	load: op.#Load @step(1)
-        	clusters: [...string]
-        	if parameter.clusters == _|_ {
-        		listClusters: op.#ListClusters @step(2)
-        		clusters:     listClusters.outputs.clusters
-        	}
-        	if parameter.clusters != _|_ {
-        		clusters: parameter.clusters
-        	}
-
-        	apply: op.#Steps & {
-        		for _, cluster_ in clusters {
-        			for name, c in load.value {
-        				"\(cluster_)-\(name)": op.#ApplyComponent & {
-        					value:   c
-        					cluster: cluster_
-        				}
-        			}
-        		}
-        	} @step(3)
-        }
-        parameter: {
-        	// +usage=Declare the runtime clusters to apply, if empty, all runtime clusters will be used
-        	clusters?: [...string]
-        }
-

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

@@ -4,9 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add env on K8s pod for your workload which follows the pod spec in path 'spec.template'
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
+    definition.oam.dev/description: add env on K8s pod for your workload which follows the pod spec in path 'spec.template.'
   name: env
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Expose port to enable web traffic for your component.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: expose
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -1,76 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/gateway.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Enable public web traffic for the component, the ingress API matches K8s v1.20+.
-  name: gateway
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  podDisruptive: false
-  schematic:
-    cue:
-      template: |
-        // trait template can have multiple outputs in one trait
-        outputs: service: {
-        	apiVersion: "v1"
-        	kind:       "Service"
-        	metadata: name: context.name
-        	spec: {
-        		selector: "app.oam.dev/component": context.name
-        		ports: [
-        			for k, v in parameter.http {
-        				port:       v
-        				targetPort: v
-        			},
-        		]
-        	}
-        }
-        outputs: ingress: {
-        	apiVersion: "networking.k8s.io/v1"
-        	kind:       "Ingress"
-        	metadata: {
-        		name: context.name
-        		annotations: "kubernetes.io/ingress.class": parameter.class
-        	}
-        	spec: rules: [{
-        		host: parameter.domain
-        		http: paths: [
-        			for k, v in parameter.http {
-        				path:     k
-        				pathType: "ImplementationSpecific"
-        				backend: service: {
-        					name: context.name
-        					port: number: v
-        				}
-        			},
-        		]
-        	}]
-        }
-        parameter: {
-        	// +usage=Specify the domain you want to expose
-        	domain: string
-
-        	// +usage=Specify the mapping relationship between the http path and the workload port
-        	http: [string]: int
-
-        	// +usage=Specify the class of ingress to use
-        	class: *"nginx" | string
-        }
-  status:
-    customStatus: |-
-      let igs = context.outputs.ingress.status.loadBalancer.ingress
-      if igs == _|_ {
-        message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
-      }
-      if len(igs) > 0 {
-        if igs[0].ip != _|_ {
-      	  message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
-        }
-        if igs[0].ip == _|_ {
-      	  message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
-        }
-      }
-    healthPolicy: 'isHealth: len(context.outputs.service.spec.clusterIP) > 0'
-

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

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add host aliases on K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -1,41 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/import-grafana-dashboard.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Import dashboards to Grafana
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
-  name: import-grafana-dashboard
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  appliesToWorkloads: []
-  conflictsWith: []
-  podDisruptive: false
-  schematic:
-    cue:
-      template: |
-        outputs: registerdatasource: {
-        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
-        	kind:       "ImportDashboard"
-        	spec: {
-        		grafana: {
-        			service:                   parameter.grafanaServiceName
-        			namespace:                 parameter.grafanaServiceNamespace
-        			credentialSecret:          parameter.credentialSecret
-        			credentialSecretNamespace: parameter.credentialSecretNamespace
-        		}
-        		urls: parameter.urls
-        	}
-        }
-        parameter: {
-        	grafanaServiceName:        string
-        	grafanaServiceNamespace:   *"default" | string
-        	credentialSecret:          string
-        	credentialSecretNamespace: *"default" | string
-        	urls: [...string]
-
-        }
-  workloadRefPath: ""
-

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

@@ -1,12 +1,10 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/deprecated/ingress-1-20.cue
+# Definition source cue file: vela-templates/definitions/internal/ingress-1-20.cue
 apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Enable public web traffic for the component, the ingress API matches K8s v1.20+.
-  labels:
-    custom.definition.oam.dev/deprecated: "true"
   name: ingress-1-20
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -1,12 +1,10 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/deprecated/ingress.cue
+# Definition source cue file: vela-templates/definitions/internal/ingress.cue
 apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Enable public web traffic for the component.
-  labels:
-    custom.definition.oam.dev/deprecated: "true"
   name: ingress
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/init-container.yaml

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

charts/vela-core/templates/defwithtemplate/k8s-objects.yaml

@@ -1,25 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/k8s-objects.cue
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: K8s-objects allow users to specify raw K8s objects in properties
-  name: k8s-objects
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  schematic:
-    cue:
-      template: |
-        output: parameter.objects[0]
-        outputs: {
-        	for i, v in parameter.objects {
-        		if i > 0 {
-        			"objects-\(i)": v
-        		}
-        	}
-        }
-        parameter: objects: [...{}]
-  workload:
-    type: autodetects.core.oam.dev
-

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

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Add labels on K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: labels
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -4,9 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add lifecycle hooks for every container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
+    definition.oam.dev/description: Add lifecycle hooks for the first container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: lifecycle
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -16,7 +14,7 @@ spec:
   schematic:
     cue:
       template: |
-        patch: spec: template: spec: containers: [...{
+        patch: spec: template: spec: containers: [{
         	lifecycle: {
         		if parameter.postStart != _|_ {
         			postStart: parameter.postStart
@@ -25,7 +23,7 @@ spec:
         			preStop: parameter.preStop
         		}
         	}
-        }]
+        }, ...]
         parameter: {
         	postStart?: #LifeCycleHandler
         	preStop?:   #LifeCycleHandler

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

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: nocalhost develop configuration.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: nocalhost
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -20,27 +18,10 @@ spec:
         	"encoding/json"
         )
 
-        outputs: nocalhostService: {
-        	apiVersion: "v1"
-        	kind:       "Service"
-        	metadata: name: context.name
-        	spec: {
-        		selector: "app.oam.dev/component": context.name
-        		ports: [
-        			{
-        				port:       parameter.port
-        				targetPort: parameter.port
-        			},
-        		]
-        		type: "ClusterIP"
-        	}
-        }
         patch: metadata: annotations: {
         	"dev.nocalhost/application-name":      context.appName
         	"dev.nocalhost/application-namespace": context.namespace
         	"dev.nocalhost":                       json.Marshal({
-        		name:        context.name
-        		serviceType: parameter.serviceType
         		containers: [
         			{
         				name: context.name
@@ -48,24 +29,7 @@ spec:
         					if parameter.gitUrl != _|_ {
         						gitUrl: parameter.gitUrl
         					}
-        					if parameter.image == "go" {
-        						image: "nocalhost-docker.pkg.coding.net/nocalhost/dev-images/golang:latest"
-        					}
-        					if parameter.image == "java" {
-        						image: "nocalhost-docker.pkg.coding.net/nocalhost/dev-images/java:latest"
-        					}
-        					if parameter.image == "python" {
-        						image: "nocalhost-docker.pkg.coding.net/nocalhost/dev-images/python:latest"
-        					}
-        					if parameter.image == "node" {
-        						image: "nocalhost-docker.pkg.coding.net/nocalhost/dev-images/node:latest"
-        					}
-        					if parameter.image == "ruby" {
-        						image: "nocalhost-docker.pkg.coding.net/nocalhost/dev-images/ruby:latest"
-        					}
-        					if parameter.image != "go" && parameter.image != "java" && parameter.image != "python" && parameter.image != "node" && parameter.image != "ruby" {
-        						image: parameter.image
-        					}
+        					image:   parameter.image
         					shell:   parameter.shell
         					workDir: parameter.workDir
         					if parameter.storageClass != _|_ {
@@ -104,33 +68,27 @@ spec:
         					if parameter.portForward != _|_ {
         						portForward: parameter.portForward
         					}
-        					if parameter.portForward == _|_ {
-        						portForward: ["\(parameter.port)" + ":" + "\(parameter.port)"]
-        					}
         				}
         			},
         		]
         	})
         }
-        language: "go" | "java" | "python" | "node" | "ruby"
         parameter: {
-        	port:          int
-        	serviceType:   *"deployment" | string
         	gitUrl?:       string
-        	image:         language | string
+        	image:         string
         	shell:         *"bash" | string
         	workDir:       *"/home/nocalhost-dev" | string
         	storageClass?: string
-        	command: {
-        		run:   *["sh", "run.sh"] | [...string]
-        		debug: *["sh", "debug.sh"] | [...string]
+        	command?: {
+        		run?: [...string]
+        		debug?: [...string]
         	}
         	debug?: remoteDebugPort?: int
         	hotReload: *true | bool
         	sync: {
-        		type:              *"send" | string
-        		filePattern:       *["./"] | [...string]
-        		ignoreFilePattern: *[".git", ".vscode", ".idea", ".gradle", "build"] | [...string]
+        		type: *"send" | string
+        		filePattern?: [...string]
+        		ignoreFilePattern?: [...string]
         	}
         	env?: [...{
         		name:  string

charts/vela-core/templates/defwithtemplate/node-affinity.yaml

@@ -5,8 +5,6 @@ kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: affinity specify node affinity and toleration on K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: node-affinity
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -1,247 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/notification.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Send message to webhook
-  name: notification
-  namespace: {{.Values.systemDefinitionNamespace}}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/base64"
-        )
-
-        parameter: {
-        	dingding?: {
-        		url: value | secretRef
-        		message: {
-        			text?: *null | {
-        				content: string
-        			}
-        			// +usage=msgType can be text, link, mardown, actionCard, feedCard
-        			msgtype: string
-        			link?:   *null | {
-        				text?:       string
-        				title?:      string
-        				messageUrl?: string
-        				picUrl?:     string
-        			}
-        			markdown?: *null | {
-        				text:  string
-        				title: string
-        			}
-        			at?: *null | {
-        				atMobiles?: *null | [...string]
-        				isAtAll?:   bool
-        			}
-        			actionCard?: *null | {
-        				text:           string
-        				title:          string
-        				hideAvatar:     string
-        				btnOrientation: string
-        				singleTitle:    string
-        				singleURL:      string
-        				btns:           *null | [...*null | {
-        					title:     string
-        					actionURL: string
-        				}]
-        			}
-        			feedCard?: *null | {
-        				links: *null | [...*null | {
-        					text?:       string
-        					title?:      string
-        					messageUrl?: string
-        					picUrl?:     string
-        				}]
-        			}
-        		}
-        	}
-
-        	slack?: {
-        		url: value | secretRef
-        		message: {
-        			text:         string
-        			blocks?:      *null | [...block]
-        			attachments?: *null | {
-        				blocks?: *null | [...block]
-        				color?:  string
-        			}
-        			thread_ts?: string
-        			mrkdwn?:    *true | bool
-        		}
-        	}
-
-        	email?: {
-        		from: {
-        			address:  string
-        			alias?:   string
-        			password: value | secretRef
-        			host:     string
-        			port:     *587 | int
-        		}
-        		to: [...string]
-        		content: {
-        			subject: string
-        			body:    string
-        		}
-        	}
-        }
-        block: {
-        	type:      string
-        	block_id?: string
-        	elements?: [...{
-        		type:       string
-        		action_id?: string
-        		url?:       string
-        		value?:     string
-        		style?:     string
-        		text?:      textType
-        		confirm?: {
-        			title:   textType
-        			text:    textType
-        			confirm: textType
-        			deny:    textType
-        			style?:  string
-        		}
-        		options?: [...option]
-        		initial_options?: [...option]
-        		placeholder?:  textType
-        		initial_date?: string
-        		image_url?:    string
-        		alt_text?:     string
-        		option_groups?: [...option]
-        		max_selected_items?: int
-        		initial_value?:      string
-        		multiline?:          bool
-        		min_length?:         int
-        		max_length?:         int
-        		dispatch_action_config?: trigger_actions_on?: [...string]
-        		initial_time?: string
-        	}]
-        }
-        textType: {
-        	type:      string
-        	text:      string
-        	emoji?:    bool
-        	verbatim?: bool
-        }
-        option: {
-        	text:         textType
-        	value:        string
-        	description?: textType
-        	url?:         string
-        }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
-        // send webhook notification
-        ding: op.#Steps & {
-        	if parameter.dingding != _|_ {
-        		if parameter.dingding.url.value != _|_ {
-        			ding1: op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: parameter.dingding.url.value
-        			}
-        		}
-        		if parameter.dingding.url.secretRef != _|_ && parameter.dingding.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					apiVersion: "v1"
-        					kind:       "Secret"
-        					metadata: {
-        						name:      parameter.dingding.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			ding2:       op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        slack: op.#Steps & {
-        	if parameter.slack != _|_ {
-        		if parameter.slack.url.value != _|_ {
-        			slack1: op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: parameter.slack.url.value
-        			}
-        		}
-        		if parameter.slack.url.secretRef != _|_ && parameter.slack.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.slack.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			slack2:      op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        email: op.#Steps & {
-        	if parameter.email != _|_ {
-        		if parameter.email.from.password.value != _|_ {
-        			email1: op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: parameter.email.from.password.value
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-
-        		if parameter.email.from.password.secretRef != _|_ && parameter.email.from.password.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.email.from.password.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			email2:      op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: stringValue.str
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-        	}
-        }
-