Feat: optimize "application-resource-tree-view" (#6096)

* feature: Optimize "application-resource-tree-view"

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>

* fix: go fmt

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>

* fix: modif staticcheck

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>

---------

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>

.github/CODEOWNERS

@@ -16,10 +16,6 @@ pkg/stdlib                         @leejanee @FogDong @Somefive
 # Owner of Workflow
 pkg/workflow                       @leejanee @FogDong @Somefive @wangyikewxgm @chivalryq
 
-# Owner of rollout
-pkg/controller/common/rollout/     @wangyikewxgm @wonderflow
-runtime/rollout                    @wangyikewxgm @wonderflow
-
 # Owner of vela templates
 vela-templates/                     @Somefive @barnettZQG @wonderflow @FogDong @wangyikewxgm @chivalryq
 

.github/workflows/back-port.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
 
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@a759fd2d7d3314c9bb57d97a0350a12e878d3c7a
+        uses: zeebe-io/backport-action@b9f8a0a03e4697a60b4daa3a4b3bb054bf90c9bd
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/chart.yml

@@ -9,24 +9,12 @@ on:
 permissions:
   contents: read
 
-env:
-  BUCKET: ${{ secrets.OSS_BUCKET }}
-  ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
-  ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-  ARTIFACT_HUB_REPOSITORY_ID: ${{ secrets.ARTIFACT_HUB_REPOSITORY_ID }}
-
 jobs:  
   publish-charts:
     env:
       HELM_CHARTS_DIR: charts
       HELM_CHART: charts/vela-core
-      LEGACY_HELM_CHART: legacy/charts/vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART: runtime/rollout/charts
-      LOCAL_OSS_DIRECTORY: .oss
       HELM_CHART_NAME: vela-core
-      LEGACY_HELM_CHART_NAME: vela-core-legacy
-      VELA_ROLLOUT_HELM_CHART_NAME: vela-rollout
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -46,13 +34,6 @@ jobs:
       - name: Generate helm doc
         run: |
           make helm-doc-gen
-      - name: Prepare legacy chart
-        run: |
-          rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
-          rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
-      - name: Prepare vela chart
-        run: |
-          rsync -r $VELA_ROLLOUT_HELM_CHART $HELM_CHARTS_DIR
       - name: Get the version
         id: get_version
         run: |
@@ -63,35 +44,24 @@ jobs:
           image_tag=${{ steps.get_version.outputs.VERSION }}
           chart_version=${{ steps.get_version.outputs.VERSION }}
           sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $LEGACY_HELM_CHART/values.yaml
-          sed -i "s/latest/${image_tag}/g" $VELA_ROLLOUT_HELM_CHART/values.yaml
           chart_smever=${chart_version#"v"}
           sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$chart_smever/g" $VELA_ROLLOUT_HELM_CHART/Chart.yaml
-      - name: Install ossutil
-        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
-      - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
-      - name: sync cloud to local
-        run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
-      - name: add artifacthub stuff to the repo
+
+      - uses: jnwng/github-app-installation-token-action@v2
+        id: get_app_token
+        with:
+          appId: 340472
+          installationId: 38064967
+          privateKey: ${{ secrets.GH_KUBEVELA_APP_PRIVATE_KEY }}
+      - name: Sync Chart Repo
         run: |
-          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
-          rsync $HELM_CHART/README.md $VELA_ROLLOUT_HELM_CHART/README.md
-          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
-          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
-      - name: Package helm charts
-        run: |
-          helm package $HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $LEGACY_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm package $VELA_ROLLOUT_HELM_CHART --destination $LOCAL_OSS_DIRECTORY
-          helm repo index --url https://$BUCKET.$ENDPOINT/core $LOCAL_OSS_DIRECTORY
-      - name: sync local to cloud
-        run: |
-          image_tag=${{ steps.get_version.outputs.VERSION }}
-          chart_semver=${image_tag#"v"}
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/index.yaml oss://$BUCKET/core/index.yaml
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$HELM_CHART_NAME-${chart_semver}.tgz 
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$LEGACY_HELM_CHART_NAME-${chart_semver}.tgz
-          ./ossutil --config-file .ossutilconfig cp -f $LOCAL_OSS_DIRECTORY/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz oss://$BUCKET/core/$VELA_ROLLOUT_HELM_CHART_NAME-${chart_semver}.tgz
+          git config --global user.email "135009839+kubevela[bot]@users.noreply.github.com"
+          git config --global user.name "kubevela[bot]"
+          git clone https://x-access-token:${{ steps.get_app_token.outputs.token }}@github.com/kubevela/charts.git kubevela-charts
+          helm package $HELM_CHART --destination ./kubevela-charts/docs/
+          helm repo index --url https://kubevela.github.io/charts ./kubevela-charts/docs/
+          cd kubevela-charts/
+          git add docs/
+          chart_version=${{ steps.get_version.outputs.VERSION }}
+          git commit -m "update vela-core chart ${chart_version}"
+          git push https://x-access-token:${{ steps.get_app_token.outputs.token }}@github.com/kubevela/charts.git

.github/workflows/commit-lint.yml

@@ -15,7 +15,7 @@ jobs:
   check:
     runs-on: ubuntu-22.04
     steps:
-      - uses: thehanimo/pr-title-checker@v1.3.7
+      - uses: thehanimo/pr-title-checker@v1.4.0
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           pass_on_octokit_error: true

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

@@ -1,124 +0,0 @@
-name: E2E Rollout Test
-
-on:
-#  push:
-#    branches:
-#      - master
-#      - release-*
-#    tags:
-#      - v*
-  workflow_dispatch: {}
-#  pull_request:
-#    branches:
-#      - master
-#      - release-*
-
-permissions:
-  contents: read
-
-env:
-  # Common versions
-  GO_VERSION: '1.19'
-
-jobs:
-
-  detect-noop:
-    permissions:
-      actions: write
-    runs-on: ubuntu-22.04
-    outputs:
-      noop: ${{ steps.noop.outputs.should_skip }}
-    steps:
-      - name: Detect No-op Changes
-        id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
-
-  e2e-rollout-tests:
-    runs-on: self-hosted
-    needs: [ detect-noop ]
-    if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ["v1.26"]
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
-      cancel-in-progress: true
-
-
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-
-      - name: Setup Go
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
-      - name: Get Ginkgo
-        run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo
-          go get github.com/onsi/gomega/...
-
-      - name: Tear down K3d if exist
-        run: |
-          k3d cluster delete || true
-          k3d cluster delete worker || true
-
-      - name: Calculate K3d args
-        run: |
-          EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.26 ]]; then
-            EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
-          fi
-          echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
-
-      - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
-        with:
-          version: ${{ matrix.k8s-version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          k3d-args: ${{ env.EGRESS_ARG }}
-
-      - name: Load image to k3d cluster
-        run: make image-load image-load-runtime-cluster
-
-      - name: Prepare for e2e tests
-        run: |
-          make vela-cli
-          make e2e-cleanup
-          make e2e-setup-core
-          make setup-runtime-e2e-cluster
-          helm test -n vela-system kubevela --timeout 5m
-
-      - name: Run e2e tests
-        run: make e2e-rollout-test
-
-      - name: Stop kubevela, get profile
-        run: make end-e2e
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out
-          flags: e2e-rollout-tests
-          name: codecov-umbrella
-
-      - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out
-
-      - name: Cleanup image
-        if: ${{ always() }}
-        run: |
-          make image-cleanup
-          docker image prune -a -f --filter "until=24h"
-

.github/workflows/e2e-test.yml

@@ -77,15 +77,9 @@ jobs:
 
       - name: Get Ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo
+          go install github.com/onsi/ginkgo/v2/ginkgo@v2.10.0
           go get github.com/onsi/gomega/...
 
-      - name: Setup KinD
-        run: |
-          go install sigs.k8s.io/kind@v0.19.0
-          kind delete cluster --name kind || true
-          kind create cluster --name kind --image=kindest/node:v1.26.4
-
       - name: Load image
         run: |
           mkdir -p $HOME/tmp/

.github/workflows/go.yml

@@ -83,7 +83,7 @@ jobs:
       # version, but we prefer this action because it leaves 'annotations' (i.e.
       # it comments on PRs to point out linter violations).
       - name: Lint
-        uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
+        uses: golangci/golangci-lint-action@5f1fec7010f6ae3b84ea4f7b2129beb8639b564f # v3.5.0
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 

.github/workflows/issue-commands.yml

@@ -1,4 +1,4 @@
-name: Run commands for issues and pull requetss
+name: Run commands for issues and pull requests
 on:
   issues:
     types: [labeled, opened]
@@ -11,6 +11,9 @@ permissions:
 jobs:
   bot:
     runs-on: ubuntu-22.04
+    permissions:
+      pull-requests: write
+      issues: write
     steps:
       - name: Checkout Actions
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -29,7 +32,7 @@ jobs:
       - name: Run Commands
         uses: ./actions/commands
         with:
-          token: ${{secrets.VELA_BOT_TOKEN}}
+          token: ${{ secrets.GITHUB_TOKEN }}
           configPath: issue-commands
 
   backport:
@@ -76,7 +79,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@a759fd2d7d3314c9bb57d97a0350a12e878d3c7a
+        uses: zeebe-io/backport-action@b9f8a0a03e4697a60b4daa3a4b3bb054bf90c9bd
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}
@@ -86,7 +89,6 @@ jobs:
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/retest')
     permissions:
       actions: write
-      contents: write
       pull-requests: write
       issues: write
     steps:

.github/workflows/registry.yml

@@ -7,10 +7,6 @@ on:
       - "v*"
   workflow_dispatch: {}
 
-env:
-  ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-
 permissions:
   contents: read
 
@@ -46,19 +42,13 @@ jobs:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
       - uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
       - uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2.4.1
         with:
           driver-opts: image=moby/buildkit:master
 
       - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
-        name: Build & Pushing vela-core for Dockerhub, GHCR and ACR
+        name: Build & Pushing vela-core for Dockerhub, GHCR
         with:
           context: .
           file: Dockerfile
@@ -74,10 +64,9 @@ jobs:
           tags: |-
             docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository_owner }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
 
       - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
-        name: Build & Pushing CLI for Dockerhub, GHCR and ACR
+        name: Build & Pushing CLI for Dockerhub, GHCR
         with:
           context: .
           file: Dockerfile.cli
@@ -93,84 +82,3 @@ jobs:
           tags: |-
             docker.io/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository_owner }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
-
-  publish-addon-images:
-    permissions:
-      packages: write
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            VERSION=latest
-          fi
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-      - name: Get git revision
-        id: vars
-        shell: bash
-        run: |
-          echo "git_revision=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Login ghcr.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login docker.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: ${{ secrets.ACR_DOMAIN }}
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
-      - uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2.4.1
-        with:
-          driver-opts: image=moby/buildkit:master
-
-      - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
-        name: Build & Pushing runtime rollout Dockerhub, GHCR and ACR
-        with:
-          context: .
-          file: runtime/rollout/Dockerfile
-          labels: |-
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          build-args: |
-            GITVERSION=git-${{ steps.vars.outputs.git_revision }}
-            VERSION=${{ steps.get_version.outputs.VERSION }}
-            GOPROXY=https://proxy.golang.org
-          tags: |-
-            docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ github.repository_owner }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-            ${{ secrets.ACR_DOMAIN }}/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
-
-  publish-capabilities:
-    env:
-      CAPABILITY_BUCKET: kubevela-registry
-      CAPABILITY_DIR: capabilities
-      CAPABILITY_ENDPOINT: oss-cn-beijing.aliyuncs.com
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-      - name: Install ossutil
-        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
-      - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${CAPABILITY_ENDPOINT} -c .ossutilconfig
-      - name: sync capabilities bucket to local
-        run: ./ossutil --config-file .ossutilconfig sync oss://$CAPABILITY_BUCKET $CAPABILITY_DIR
-      - name: rsync all capabilites
-        run: rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
-      - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f

.github/workflows/release.yml

@@ -6,12 +6,6 @@ on:
       - "v*"
   workflow_dispatch: { }
 
-env:
-  BUCKET: ${{ secrets.CLI_OSS_BUCKET }}
-  ENDPOINT: ${{ secrets.CLI_OSS_ENDPOINT }}
-  ACCESS_KEY: ${{ secrets.CLI_OSS_ACCESS_KEY }}
-  ACCESS_KEY_SECRET: ${{ secrets.CLI_OSS_ACCESS_KEY_SECRET }}
-
 permissions:
   contents: read
 
@@ -46,27 +40,6 @@ jobs:
           args: release --rm-dist --timeout 60m
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Since goreleaser haven't supported aliyun OSS, we need to upload the release manually
-      - name: Get version
-        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Install ossutil
-        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
-      - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT}
-      - name: split files to be upload
-        run: mkdir -p ./dist/files_upload && mv ./dist/*.tar.gz ./dist/files_upload && mv ./dist/*.zip ./dist/files_upload
-      - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync ./dist/files_upload oss://$BUCKET/binary/vela/${{ env.VELA_VERSION }}
-      - name: sync the latest version file
-        if: ${{ !contains(env.VELA_VERSION,'alpha') && !contains(env.VELA_VERSION,'beta') && !contains(env.VELA_VERSION,'rc') }}
-        run: |
-          LATEST_VERSION=$(curl -fsSl https://static.kubevela.net/binary/vela/latest_version)
-          verlte() {
-            [  "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
-          }
-          verlte ${{ env.VELA_VERSION }} $LATEST_VERSION && echo "${{ env.VELA_VERSION }} <= $LATEST_VERSION, skip update" && exit 0
-          echo ${{ env.VELA_VERSION }} > ./latest_version
-          ./ossutil --config-file .ossutilconfig cp -u ./latest_version oss://$BUCKET/binary/vela/latest_version
   upload-plugin-homebrew:
     permissions:
       contents: write

.gitignore

@@ -50,8 +50,6 @@ tmp/
 # check docs
 git-page/
 
-# e2e rollout runtime image build
-runtime/rollout/e2e/tmp
 vela.json
 
 dist/

Makefile

@@ -88,10 +88,6 @@ 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
 
 ## image-load: load docker image to the kind cluster
@@ -99,14 +95,6 @@ image-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
 	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
-## image-load-runtime-cluster: Load the run-time cluster image
-image-load-runtime-cluster:
-	/bin/sh hack/e2e/build_runtime_rollout.sh
-	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
-	rm -rf runtime/rollout/e2e/tmp
-	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
-	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME) || echo "no worker cluster"
-
 ## core-test: Run tests
 core-test:
 	go test ./pkg/... -coverprofile cover.out
@@ -115,10 +103,6 @@ core-test:
 manager:
 	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go
 
-## vela-runtime-rollout-manager: Build vela runtime rollout manager binary
-vela-runtime-rollout-manager:
-	$(GOBUILD_ENV) go build -o ./runtime/rollout/bin/manager -a -ldflags $(LDFLAGS) ./runtime/rollout/cmd/main.go
-
 ## manifests: Generate manifests e.g. CRD, RBAC etc.
 manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)

README.md

@@ -38,7 +38,7 @@ No ad-hoc scripts, no dirty glue code, just deploy. The deployment workflow in K
 #### **Built-in observability, multi-tenancy and security support**
 
 Choose from the wide range of LDAP integrations we provided out-of-box, enjoy enhanced [multi-tenancy and multi-cluster authorization and authentication](https://kubevela.net/docs/platform-engineers/auth/advance),
-pick and apply fine-grained RBAC modules and customize them per your own supply chain requirements.
+pick and apply fine-grained RBAC modules and customize them as per your own supply chain requirements.
 All delivery process has fully [automated observability dashboards](https://kubevela.net/docs/platform-engineers/operations/observability).
 
 #### **Multi-cloud/hybrid-environments app delivery as first-class citizen**

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

@@ -29,7 +29,6 @@ import (
 	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
@@ -358,19 +357,6 @@ const (
 	WorkflowStepType DefinitionType = "WorkflowStep"
 )
 
-// AppRolloutStatus defines the observed state of AppRollout
-type AppRolloutStatus struct {
-	v1alpha1.RolloutStatus `json:",inline"`
-
-	// LastUpgradedTargetAppRevision contains the name of the app that we upgraded to
-	// We will restart the rollout if this is not the same as the spec
-	LastUpgradedTargetAppRevision string `json:"lastTargetAppRevision"`
-
-	// LastSourceAppRevision contains the name of the app that we need to upgrade from.
-	// We will restart the rollout if this is not the same as the spec
-	LastSourceAppRevision string `json:"LastSourceAppRevision,omitempty"`
-}
-
 // ApplicationTrait defines the trait of application
 type ApplicationTrait struct {
 	Type string `json:"type"`
@@ -414,29 +400,11 @@ type ClusterSelector struct {
 	Labels map[string]string `json:"labels,omitempty"`
 }
 
-// Distribution defines the replica distribution of an AppRevision to a cluster.
-type Distribution struct {
-	// Replicas is the replica number.
-	Replicas int `json:"replicas,omitempty"`
-}
-
-// ClusterPlacement defines the cluster placement rules for an app revision.
-type ClusterPlacement struct {
-	// ClusterSelector selects the cluster to  deploy apps to.
-	// If not specified, it indicates the host cluster per se.
-	ClusterSelector *ClusterSelector `json:"clusterSelector,omitempty"`
-
-	// Distribution defines the replica distribution of an AppRevision to a cluster.
-	Distribution Distribution `json:"distribution,omitempty"`
-}
-
 const (
 	// PolicyResourceCreator create the policy resource.
 	PolicyResourceCreator string = "policy"
 	// WorkflowResourceCreator create the resource in workflow.
 	WorkflowResourceCreator string = "workflow"
-	// DebugResourceCreator create the debug resource.
-	DebugResourceCreator string = "debug"
 )
 
 // OAMObjectReference defines the object reference for an oam resource
@@ -533,8 +501,6 @@ const (
 	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
 )
@@ -545,7 +511,6 @@ var conditions = map[ApplicationConditionType]string{
 	PolicyCondition:   "Policy",
 	RenderCondition:   "Render",
 	WorkflowCondition: "Workflow",
-	RolloutCondition:  "Rollout",
 	ReadyCondition:    "Ready",
 }
 

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

@@ -28,22 +28,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
@@ -257,27 +241,6 @@ func (in *ClusterObjectReference) DeepCopy() *ClusterObjectReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterPlacement) DeepCopyInto(out *ClusterPlacement) {
-	*out = *in
-	if in.ClusterSelector != nil {
-		in, out := &in.ClusterSelector, &out.ClusterSelector
-		*out = new(ClusterSelector)
-		(*in).DeepCopyInto(*out)
-	}
-	out.Distribution = in.Distribution
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacement.
-func (in *ClusterPlacement) DeepCopy() *ClusterPlacement {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterPlacement)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterSelector) DeepCopyInto(out *ClusterSelector) {
 	*out = *in
@@ -315,21 +278,6 @@ func (in *DefinitionReference) DeepCopy() *DefinitionReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Distribution) DeepCopyInto(out *Distribution) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Distribution.
-func (in *Distribution) DeepCopy() *Distribution {
-	if in == nil {
-		return nil
-	}
-	out := new(Distribution)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Helm) DeepCopyInto(out *Helm) {
 	*out = *in

apis/core.oam.dev/groupversion_info.go

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

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

@@ -17,7 +17,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
@@ -56,8 +58,9 @@ const (
 
 // GarbageCollectPolicyRule defines a single garbage-collect policy rule
 type GarbageCollectPolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-	Strategy GarbageCollectStrategy     `json:"strategy"`
+	Selector    ResourcePolicyRuleSelector `json:"selector"`
+	Strategy    GarbageCollectStrategy     `json:"strategy"`
+	Propagation *GarbageCollectPropagation `json:"propagation"`
 }
 
 // GarbageCollectStrategy the strategy for target resource to recycle
@@ -73,6 +76,16 @@ const (
 	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
 )
 
+// GarbageCollectPropagation the deletion propagation setting similar to metav1.DeletionPropagation
+type GarbageCollectPropagation string
+
+const (
+	// GarbageCollectPropagationOrphan orphan child resources while deleting target resources
+	GarbageCollectPropagationOrphan = "orphan"
+	// GarbageCollectPropagationCascading delete child resources in background while deleting target resources
+	GarbageCollectPropagationCascading = "cascading"
+)
+
 // Type the type name of the policy
 func (in *GarbageCollectPolicySpec) Type() string {
 	return GarbageCollectPolicyType
@@ -87,3 +100,18 @@ func (in *GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstruct
 	}
 	return nil
 }
+
+// FindDeleteOption find delete option for target resource
+func (in *GarbageCollectPolicySpec) FindDeleteOption(manifest *unstructured.Unstructured) []client.DeleteOption {
+	for _, rule := range in.Rules {
+		if rule.Selector.Match(manifest) && rule.Propagation != nil {
+			switch *rule.Propagation {
+			case GarbageCollectPropagationOrphan:
+				return []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationOrphan)}
+			case GarbageCollectPropagationCascading:
+				return []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationBackground)}
+			}
+		}
+	}
+	return nil
+}

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

@@ -314,6 +314,11 @@ func (in *EnvTraitPatch) DeepCopy() *EnvTraitPatch {
 func (in *GarbageCollectPolicyRule) DeepCopyInto(out *GarbageCollectPolicyRule) {
 	*out = *in
 	in.Selector.DeepCopyInto(&out.Selector)
+	if in.Propagation != nil {
+		in, out := &in.Propagation, &out.Propagation
+		*out = new(GarbageCollectPropagation)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRule.

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

@@ -1,123 +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 (
-	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/standard.oam.dev/v1alpha1"
-)
-
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// AppStatus defines the observed state of Application
-type AppStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-	v1alpha1.RolloutStatus `json:",inline"`
-
-	Phase common.ApplicationPhase `json:"status,omitempty"`
-
-	// Components record the related Components created by Application Controller
-	Components []corev1.ObjectReference `json:"components,omitempty"`
-
-	// Services record the status of the application services
-	Services []common.ApplicationComponentStatus `json:"services,omitempty"`
-
-	// ResourceTracker record the status of the ResourceTracker
-	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
-
-	// LatestRevision of the application configuration it generates
-	// +optional
-	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
-}
-
-// ApplicationTrait defines the trait of application
-type ApplicationTrait struct {
-	Name string `json:"name"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-}
-
-// ApplicationComponent describe the component of application
-type ApplicationComponent struct {
-	Name         string `json:"name"`
-	WorkloadType string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Settings runtime.RawExtension `json:"settings,omitempty"`
-
-	// Traits define the trait of one component, the type must be array to keep the order.
-	Traits []ApplicationTrait `json:"traits,omitempty"`
-
-	// +kubebuilder:pruning:PreserveUnknownFields
-	// scopes in ApplicationComponent defines the component-level scopes
-	// the format is <scope-type:scope-instance-name> pairs, the key represents type of `ScopeDefinition` while the value represent the name of scope instance.
-	Scopes map[string]string `json:"scopes,omitempty"`
-}
-
-// ApplicationSpec is the spec of Application
-type ApplicationSpec struct {
-	Components []ApplicationComponent `json:"components"`
-
-	// TODO(wonderflow): we should have application level scopes supported here
-
-	// RolloutPlan is the details on how to rollout the resources
-	// The controller simply replace the old resources with the new one if there is no rollout plan involved
-	// +optional
-	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
-}
-
-// Application is the Schema for the applications API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName={app,velaapp}
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
-// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
-// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
-// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type Application struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ApplicationSpec  `json:"spec,omitempty"`
-	Status common.AppStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ApplicationList contains a list of Application
-type ApplicationList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Application `json:"items"`
-}
-
-// GetComponent get the component from the application based on its workload type
-func (app *Application) GetComponent(workloadType string) *ApplicationComponent {
-	for _, c := range app.Spec.Components {
-		if c.WorkloadType == workloadType {
-			return &c
-		}
-	}
-	return nil
-}

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

@@ -1,68 +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 (
-	"reflect"
-	"testing"
-)
-
-func TestApplicationGetComponent(t *testing.T) {
-	ac1 := ApplicationComponent{
-		Name:         "ac1",
-		WorkloadType: "type1",
-	}
-	ac2 := ApplicationComponent{
-		Name:         "ac2",
-		WorkloadType: "type2",
-	}
-	tests := map[string]struct {
-		app           *Application
-		componentName string
-		want          *ApplicationComponent
-	}{
-		"test get one": {
-			app: &Application{
-				Spec: ApplicationSpec{
-					Components: []ApplicationComponent{
-						ac1, ac2,
-					},
-				},
-			},
-			componentName: ac1.WorkloadType,
-			want:          &ac1,
-		},
-		"test get none": {
-			app: &Application{
-				Spec: ApplicationSpec{
-					Components: []ApplicationComponent{
-						ac2,
-					},
-				},
-			},
-			componentName: ac1.WorkloadType,
-			want:          nil,
-		},
-	}
-	for name, tt := range tests {
-		t.Run(name, func(t *testing.T) {
-			if got := tt.app.GetComponent(tt.componentName); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetComponent() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

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

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

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

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

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

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

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

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

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

@@ -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 v1alpha2
-
-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"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// HealthStatus represents health status strings.
-type HealthStatus string
-
-const (
-	// StatusHealthy represents healthy status.
-	StatusHealthy HealthStatus = "HEALTHY"
-	// StatusUnhealthy represents unhealthy status.
-	StatusUnhealthy = "UNHEALTHY"
-	// StatusUnknown represents unknown status.
-	StatusUnknown = "UNKNOWN"
-)
-
-var _ oam.Scope = &HealthScope{}
-
-// A HealthScopeSpec defines the desired state of a HealthScope.
-type HealthScopeSpec struct {
-	// ProbeTimeout is the amount of time in seconds to wait when receiving a response before marked failure.
-	ProbeTimeout *int32 `json:"probe-timeout,omitempty"`
-
-	// ProbeInterval is the amount of time in seconds between probing tries.
-	ProbeInterval *int32 `json:"probe-interval,omitempty"`
-
-	// AppRefs records references of applications' components
-	AppRefs []AppReference `json:"appReferences,omitempty"`
-
-	// WorkloadReferences to the workloads that are in this scope.
-	// +deprecated
-	WorkloadReferences []corev1.ObjectReference `json:"workloadRefs"`
-}
-
-// AppReference records references of an application's components
-type AppReference struct {
-	AppName        string          `json:"appName,omitempty"`
-	CompReferences []CompReference `json:"compReferences,omitempty"`
-}
-
-// CompReference records references of a component's resources
-type CompReference struct {
-	CompName string                   `json:"compName,omitempty"`
-	Workload corev1.ObjectReference   `json:"workload,omitempty"`
-	Traits   []corev1.ObjectReference `json:"traits,omitempty"`
-}
-
-// A HealthScopeStatus represents the observed state of a HealthScope.
-type HealthScopeStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-
-	// ScopeHealthCondition represents health condition summary of the scope
-	ScopeHealthCondition ScopeHealthCondition `json:"scopeHealthCondition"`
-
-	// AppHealthConditions represents health condition of applications in the scope
-	AppHealthConditions []*AppHealthCondition `json:"appHealthConditions,omitempty"`
-
-	// WorkloadHealthConditions represents health condition of workloads in the scope
-	// Use AppHealthConditions to provide app level status
-	// +deprecated
-	WorkloadHealthConditions []*WorkloadHealthCondition `json:"healthConditions,omitempty"`
-}
-
-// AppHealthCondition represents health condition of an application
-type AppHealthCondition struct {
-	AppName    string                     `json:"appName"`
-	EnvName    string                     `json:"envName,omitempty"`
-	Components []*WorkloadHealthCondition `json:"components,omitempty"`
-}
-
-// ScopeHealthCondition represents health condition summary of a scope.
-type ScopeHealthCondition struct {
-	HealthStatus       HealthStatus `json:"healthStatus"`
-	Total              int64        `json:"total,omitempty"`
-	HealthyWorkloads   int64        `json:"healthyWorkloads,omitempty"`
-	UnhealthyWorkloads int64        `json:"unhealthyWorkloads,omitempty"`
-	UnknownWorkloads   int64        `json:"unknownWorkloads,omitempty"`
-}
-
-// WorkloadHealthCondition represents informative health condition of a workload.
-type WorkloadHealthCondition struct {
-	// ComponentName represents the component name if target is a workload
-	ComponentName  string                 `json:"componentName,omitempty"`
-	TargetWorkload corev1.ObjectReference `json:"targetWorkload,omitempty"`
-	HealthStatus   HealthStatus           `json:"healthStatus"`
-	Diagnosis      string                 `json:"diagnosis,omitempty"`
-	// WorkloadStatus represents status of workloads whose HealthStatus is UNKNOWN.
-	WorkloadStatus  string                  `json:"workloadStatus,omitempty"`
-	CustomStatusMsg string                  `json:"customStatusMsg,omitempty"`
-	Traits          []*TraitHealthCondition `json:"traits,omitempty"`
-}
-
-// TraitHealthCondition represents informative health condition of a trait.
-type TraitHealthCondition struct {
-	Type            string       `json:"type"`
-	Resource        string       `json:"resource"`
-	HealthStatus    HealthStatus `json:"healthStatus"`
-	Diagnosis       string       `json:"diagnosis,omitempty"`
-	CustomStatusMsg string       `json:"customStatusMsg,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// A HealthScope determines an aggregate health status based of the health of components.
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".status.health",name=HEALTH,type=string
-type HealthScope struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   HealthScopeSpec   `json:"spec,omitempty"`
-	Status HealthScopeStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// HealthScopeList contains a list of HealthScope.
-type HealthScopeList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []HealthScope `json:"items"`
-}

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

@@ -1,673 +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 (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/types"
-)
-
-// A WorkloadDefinitionSpec defines the desired state of a WorkloadDefinition.
-type WorkloadDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this workload kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
-
-	// ChildResourceKinds are the list of GVK of the child resources this workload generates
-	ChildResourceKinds []common.ChildResourceKind `json:"childResourceKinds,omitempty"`
-
-	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
-	// can be used by trait to create resource selectors(e.g. label selector for pods).
-	// +optional
-	RevisionLabel string `json:"revisionLabel,omitempty"`
-
-	// PodSpecPath indicates where/if this workload has K8s podSpec field
-	// if one workload has podSpec, trait can do lot's of assumption such as port, env, volume fields.
-	// +optional
-	PodSpecPath string `json:"podSpecPath,omitempty"`
-
-	// Status defines the custom health policy and status message for workload
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the workload
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// WorkloadDefinitionStatus is the status of WorkloadDefinition
-type WorkloadDefinitionStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// A WorkloadDefinition registers a kind of Kubernetes custom resource as a
-// valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
-// is used to validate the schema of the workload when it is embedded in an OAM
-// Component.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
-// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
-type WorkloadDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
-	Status WorkloadDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for WorkloadDefinition
-func (wd *WorkloadDefinition) SetConditions(c ...condition.Condition) {
-	wd.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from WorkloadDefinition
-func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
-	return wd.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// WorkloadDefinitionList contains a list of WorkloadDefinition.
-type WorkloadDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []WorkloadDefinition `json:"items"`
-}
-
-// A TraitDefinitionSpec defines the desired state of a TraitDefinition.
-type TraitDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this trait kind.
-	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
-
-	// Revision indicates whether a trait is aware of component revision
-	// +optional
-	RevisionEnabled bool `json:"revisionEnabled,omitempty"`
-
-	// WorkloadRefPath indicates where/if a trait accepts a workloadRef object
-	// +optional
-	WorkloadRefPath string `json:"workloadRefPath,omitempty"`
-
-	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
-	// +optional
-	PodDisruptive bool `json:"podDisruptive,omitempty"`
-
-	// AppliesToWorkloads specifies the list of workload kinds this trait
-	// applies to. Workload kinds are specified in kind.group/version format,
-	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
-	// all workload kinds.
-	// +optional
-	AppliesToWorkloads []string `json:"appliesToWorkloads,omitempty"`
-
-	// ConflictsWith specifies the list of traits(CRD name, Definition name, CRD group)
-	// which could not apply to the same workloads with this trait.
-	// Traits that omit this field can work with any other traits.
-	// Example rules:
-	// "service" # Trait definition name
-	// "services.k8s.io" # API resource/crd name
-	// "*.networking.k8s.io" # API group
-	// "labelSelector:foo=bar" # label selector
-	// labelSelector format: https://pkg.go.dev/k8s.io/apimachinery/pkg/labels#Parse
-	// +optional
-	ConflictsWith []string `json:"conflictsWith,omitempty"`
-
-	// Schematic defines the data format and template of the encapsulation of the trait
-	// +optional
-	Schematic *common.Schematic `json:"schematic,omitempty"`
-
-	// Status defines the custom health policy and status message for trait
-	// +optional
-	Status *common.Status `json:"status,omitempty"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// TraitDefinitionStatus is the status of TraitDefinition
-type TraitDefinitionStatus struct {
-	// ConditionedStatus reflects the observed status of a resource
-	condition.ConditionedStatus `json:",inline"`
-	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
-	ConfigMapRef string `json:"configMapRef,omitempty"`
-	// LatestRevision of the trait definition
-	// +optional
-	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// A TraitDefinition registers a kind of Kubernetes custom resource as a valid
-// OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
-// to validate the schema of the trait when it is embedded in an OAM
-// ApplicationConfiguration.
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
-// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
-type TraitDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
-	Status TraitDefinitionStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for TraitDefinition
-func (td *TraitDefinition) SetConditions(c ...condition.Condition) {
-	td.Status.SetConditions(c...)
-}
-
-// GetCondition gets condition from TraitDefinition
-func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) condition.Condition {
-	return td.Status.GetCondition(conditionType)
-}
-
-// +kubebuilder:object:root=true
-
-// TraitDefinitionList contains a list of TraitDefinition.
-type TraitDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []TraitDefinition `json:"items"`
-}
-
-// A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
-type ScopeDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this scope kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
-
-	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
-	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
-
-	// AllowComponentOverlap specifies whether an OAM component may exist in
-	// multiple instances of this kind of scope.
-	AllowComponentOverlap bool `json:"allowComponentOverlap"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// A ScopeDefinition registers a kind of Kubernetes custom resource as a valid
-// OAM scope kind by referencing its CustomResourceDefinition. The CRD is used
-// to validate the schema of the scope when it is embedded in an OAM
-// ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
-type ScopeDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ScopeDefinitionSpec `json:"spec,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ScopeDefinitionList contains a list of ScopeDefinition.
-type ScopeDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ScopeDefinition `json:"items"`
-}
-
-// A ComponentParameter defines a configurable parameter of a component.
-type ComponentParameter struct {
-	// Name of this parameter. OAM ApplicationConfigurations will specify
-	// parameter values using this name.
-	Name string `json:"name"`
-
-	// FieldPaths specifies an array of fields within this Component's workload
-	// that will be overwritten by the value of this parameter. The type of the
-	// parameter (e.g. int, string) is inferred from the type of these fields;
-	// All fields must be of the same type. Fields are specified as JSON field
-	// paths without a leading dot, for example 'spec.replicas'.
-	FieldPaths []string `json:"fieldPaths"`
-
-	// +kubebuilder:default:=false
-	// Required specifies whether or not a value for this parameter must be
-	// supplied when authoring an ApplicationConfiguration.
-	// +optional
-	Required *bool `json:"required,omitempty"`
-
-	// Description of this parameter.
-	// +optional
-	Description *string `json:"description,omitempty"`
-}
-
-// A ComponentSpec defines the desired state of a Component.
-type ComponentSpec struct {
-	// A Workload that will be created for each ApplicationConfiguration that
-	// includes this Component. Workload is an instance of a workloadDefinition.
-	// We either use the GVK info or a special "type" field in the workload to associate
-	// the content of the workload with its workloadDefinition
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Workload runtime.RawExtension `json:"workload"`
-
-	// HelmRelease records a Helm release used by a Helm module workload.
-	// +optional
-	Helm *common.Helm `json:"helm,omitempty"`
-
-	// Parameters exposed by this component. ApplicationConfigurations that
-	// reference this component may specify values for these parameters, which
-	// will in turn be injected into the embedded workload.
-	// +optional
-	Parameters []ComponentParameter `json:"parameters,omitempty"`
-}
-
-// A ComponentStatus represents the observed state of a Component.
-type ComponentStatus struct {
-	// The generation observed by the component controller.
-	// +optional
-	ObservedGeneration int64 `json:"observedGeneration"`
-
-	condition.ConditionedStatus `json:",inline"`
-
-	// LatestRevision of component
-	// +optional
-	LatestRevision *common.Revision `json:"latestRevision,omitempty"`
-
-	// One Component should only be used by one AppConfig
-}
-
-// +kubebuilder:object:root=true
-
-// A Component describes how an OAM workload kind may be instantiated.
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".spec.workload.kind",name=WORKLOAD-KIND,type=string
-// +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
-type Component struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ComponentSpec   `json:"spec,omitempty"`
-	Status ComponentStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ComponentList contains a list of Component.
-type ComponentList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Component `json:"items"`
-}
-
-// A ComponentParameterValue specifies a value for a named parameter. The
-// associated component must publish a parameter with this name.
-type ComponentParameterValue struct {
-	// Name of the component parameter to set.
-	Name string `json:"name"`
-
-	// Value to set.
-	Value intstr.IntOrString `json:"value"`
-}
-
-// A ComponentTrait specifies a trait that should be applied to a component.
-type ComponentTrait struct {
-	// A Trait that will be created for the component
-	// +kubebuilder:validation:EmbeddedResource
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Trait runtime.RawExtension `json:"trait"`
-
-	// DataOutputs specify the data output sources from this trait.
-	// +optional
-	DataOutputs []DataOutput `json:"dataOutputs,omitempty"`
-
-	// DataInputs specify the data input sinks into this trait.
-	// +optional
-	DataInputs []DataInput `json:"dataInputs,omitempty"`
-}
-
-// A ComponentScope specifies a scope in which a component should exist.
-type ComponentScope struct {
-	// A ScopeReference must refer to an OAM scope resource.
-	ScopeReference corev1.ObjectReference `json:"scopeRef"`
-}
-
-// An ApplicationConfigurationComponent specifies a component of an
-// ApplicationConfiguration. Each component is used to instantiate a workload.
-type ApplicationConfigurationComponent struct {
-	// ComponentName specifies a component whose latest revision will be bind
-	// with ApplicationConfiguration. When the spec of the referenced component
-	// changes, ApplicationConfiguration will automatically migrate all trait
-	// affect from the prior revision to the new one. This is mutually exclusive
-	// with RevisionName.
-	// +optional
-	ComponentName string `json:"componentName,omitempty"`
-
-	// RevisionName of a specific component revision to which to bind
-	// ApplicationConfiguration. This is mutually exclusive with componentName.
-	// +optional
-	RevisionName string `json:"revisionName,omitempty"`
-
-	// DataOutputs specify the data output sources from this component.
-	DataOutputs []DataOutput `json:"dataOutputs,omitempty"`
-
-	// DataInputs specify the data input sinks into this component.
-	DataInputs []DataInput `json:"dataInputs,omitempty"`
-
-	// ParameterValues specify values for the the specified component's
-	// parameters. Any parameter required by the component must be specified.
-	// +optional
-	ParameterValues []ComponentParameterValue `json:"parameterValues,omitempty"`
-
-	// Traits of the specified component.
-	// +optional
-	Traits []ComponentTrait `json:"traits,omitempty"`
-
-	// Scopes in which the specified component should exist.
-	// +optional
-	Scopes []ComponentScope `json:"scopes,omitempty"`
-}
-
-// An ApplicationConfigurationSpec defines the desired state of a
-// ApplicationConfiguration.
-type ApplicationConfigurationSpec struct {
-	// Components of which this ApplicationConfiguration consists. Each
-	// component will be used to instantiate a workload.
-	Components []ApplicationConfigurationComponent `json:"components"`
-}
-
-// A TraitStatus represents the state of a trait.
-type TraitStatus string
-
-// A WorkloadTrait represents a trait associated with a workload and its status
-type WorkloadTrait struct {
-	// Status is a place holder for a customized controller to fill
-	// if it needs a single place to summarize the status of the trait
-	Status TraitStatus `json:"status,omitempty"`
-
-	// Reference to a trait created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"traitRef"`
-
-	// Message will allow controller to leave some additional information for this trait
-	Message string `json:"message,omitempty"`
-
-	// AppliedGeneration indicates the generation observed by the appConfig controller.
-	// The same field is also recorded in the annotations of traits.
-	// A trait is possible to be deleted from cluster after created.
-	// This field is useful to track the observed generation of traits after they are
-	// deleted.
-	AppliedGeneration int64 `json:"appliedGeneration,omitempty"`
-
-	// DependencyUnsatisfied notify does the trait has dependency unsatisfied
-	DependencyUnsatisfied bool `json:"dependencyUnsatisfied,omitempty"`
-}
-
-// A ScopeStatus represents the state of a scope.
-type ScopeStatus string
-
-// A WorkloadScope represents a scope associated with a workload and its status
-type WorkloadScope struct {
-	// Status is a place holder for a customized controller to fill
-	// if it needs a single place to summarize the status of the scope
-	Status ScopeStatus `json:"status,omitempty"`
-
-	// Reference to a scope created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"scopeRef"`
-}
-
-// A WorkloadStatus represents the status of a workload.
-type WorkloadStatus struct {
-	// Status is a place holder for a customized controller to fill
-	// if it needs a single place to summarize the entire status of the workload
-	Status string `json:"status,omitempty"`
-
-	// ComponentName that produced this workload.
-	ComponentName string `json:"componentName,omitempty"`
-
-	// ComponentRevisionName of current component
-	ComponentRevisionName string `json:"componentRevisionName,omitempty"`
-
-	// DependencyUnsatisfied notify does the workload has dependency unsatisfied
-	DependencyUnsatisfied bool `json:"dependencyUnsatisfied,omitempty"`
-
-	// AppliedComponentRevision indicates the applied component revision name of this workload
-	AppliedComponentRevision string `json:"appliedComponentRevision,omitempty"`
-
-	// Reference to a workload created by an ApplicationConfiguration.
-	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
-
-	// Traits associated with this workload.
-	Traits []WorkloadTrait `json:"traits,omitempty"`
-
-	// Scopes associated with this workload.
-	Scopes []WorkloadScope `json:"scopes,omitempty"`
-}
-
-// HistoryWorkload contain the old component revision that are still running
-type HistoryWorkload struct {
-	// Revision of this workload
-	Revision string `json:"revision,omitempty"`
-
-	// Reference to running workload.
-	Reference corev1.ObjectReference `json:"workloadRef,omitempty"`
-}
-
-// A ApplicationStatus represents the state of the entire application.
-type ApplicationStatus string
-
-// An ApplicationConfigurationStatus represents the observed state of a
-// ApplicationConfiguration.
-type ApplicationConfigurationStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-
-	// Status is a place holder for a customized controller to fill
-	// if it needs a single place to summarize the status of the entire application
-	Status ApplicationStatus `json:"status,omitempty"`
-
-	Dependency DependencyStatus `json:"dependency,omitempty"`
-
-	// RollingStatus indicates what phase are we in the rollout phase
-	RollingStatus types.RollingStatus `json:"rollingStatus,omitempty"`
-
-	// Workloads created by this ApplicationConfiguration.
-	Workloads []WorkloadStatus `json:"workloads,omitempty"`
-
-	// The generation observed by the appConfig controller.
-	// +optional
-	ObservedGeneration int64 `json:"observedGeneration"`
-
-	// HistoryWorkloads will record history but still working revision workloads.
-	HistoryWorkloads []HistoryWorkload `json:"historyWorkloads,omitempty"`
-}
-
-// DependencyStatus represents the observed state of the dependency of
-// an ApplicationConfiguration.
-type DependencyStatus struct {
-	Unsatisfied []UnstaifiedDependency `json:"unsatisfied,omitempty"`
-}
-
-// UnstaifiedDependency describes unsatisfied dependency flow between
-// one pair of objects.
-type UnstaifiedDependency struct {
-	Reason string               `json:"reason"`
-	From   DependencyFromObject `json:"from"`
-	To     DependencyToObject   `json:"to"`
-}
-
-// DependencyFromObject represents the object that dependency data comes from.
-type DependencyFromObject struct {
-	corev1.ObjectReference `json:",inline"`
-	FieldPath              string `json:"fieldPath,omitempty"`
-}
-
-// DependencyToObject represents the object that dependency data goes to.
-type DependencyToObject struct {
-	corev1.ObjectReference `json:",inline"`
-	FieldPaths             []string `json:"fieldPaths,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// An ApplicationConfiguration represents an OAM application.
-// +kubebuilder:resource:shortName=appconfig,categories={oam}
-// +kubebuilder:subresource:status
-type ApplicationConfiguration struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ApplicationConfigurationSpec   `json:"spec,omitempty"`
-	Status ApplicationConfigurationStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ApplicationConfigurationList contains a list of ApplicationConfiguration.
-type ApplicationConfigurationList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationConfiguration `json:"items"`
-}
-
-// DataOutput specifies a data output source from an object.
-type DataOutput struct {
-	// Name is the unique name of a DataOutput in an ApplicationConfiguration.
-	Name string `json:"name,omitempty"`
-
-	// FieldPath refers to the value of an object's field.
-	FieldPath string `json:"fieldPath,omitempty"`
-
-	// Conditions specify the conditions that should be satisfied before emitting a data output.
-	// Different conditions are AND-ed together.
-	// If no conditions is specified, it is by default to check output value not empty.
-	// +optional
-	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-	// OutputStore specifies the object used to store intermediate data generated by Operations
-	OutputStore StoreReference `json:"outputStore,omitempty"`
-}
-
-// StoreReference specifies the referenced object in DataOutput or DataInput
-type StoreReference struct {
-	corev1.ObjectReference `json:",inline"`
-	// Operations specify the data processing operations
-	Operations []DataOperation `json:"operations,omitempty"`
-}
-
-// DataOperation defines the specific operation for data
-type DataOperation struct {
-	// Type specifies the type of DataOperation
-	Type string `json:"type"`
-	// Operator specifies the operation under this DataOperation type
-	Operator DataOperator `json:"op"`
-	// ToFieldPath refers to the value of an object's field
-	ToFieldPath string `json:"toFieldPath"`
-	// ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
-	ToDataPath string `json:"toDataPath,omitempty"`
-	// +optional
-	// Value specifies an expected value
-	// This is mutually exclusive with ValueFrom
-	Value string `json:"value,omitempty"`
-	// +optional
-	// ValueFrom specifies expected value from object such as workload and trait
-	// This is mutually exclusive with Value
-	ValueFrom  ValueFrom              `json:"valueFrom,omitempty"`
-	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-}
-
-// DataOperator defines the type of Operator in DataOperation
-type DataOperator string
-
-const (
-	// AddOperator specifies the add operation for data passing
-	AddOperator DataOperator = "add"
-	// DeleteOperator specifies the delete operation for data passing
-	DeleteOperator DataOperator = "delete"
-	// ReplaceOperator specifies the replace operation for data passing
-	ReplaceOperator DataOperator = "replace"
-)
-
-// DataInput specifies a data input sink to an object.
-// If input is array, it will be appended to the target field paths.
-type DataInput struct {
-	// ValueFrom specifies the value source.
-	ValueFrom DataInputValueFrom `json:"valueFrom,omitempty"`
-
-	// ToFieldPaths specifies the field paths of an object to fill passed value.
-	ToFieldPaths []string `json:"toFieldPaths,omitempty"`
-
-	// StrategyMergeKeys specifies the merge key if the toFieldPaths target is an array.
-	// The StrategyMergeKeys is optional, by default, if the toFieldPaths target is an array, we will append.
-	// If StrategyMergeKeys specified, we will check the key in the target array.
-	// If any key exist, do update; if no key exist, append.
-	StrategyMergeKeys []string `json:"strategyMergeKeys,omitempty"`
-
-	// When the Conditions is satified, ToFieldPaths will be filled with passed value
-	Conditions []ConditionRequirement `json:"conditions,omitempty"`
-
-	// InputStore specifies the object used to read intermediate data genereted by DataOutput
-	InputStore StoreReference `json:"inputStore,omitempty"`
-}
-
-// DataInputValueFrom specifies the value source for a data input.
-type DataInputValueFrom struct {
-	// DataOutputName matches a name of a DataOutput in the same AppConfig.
-	DataOutputName string `json:"dataOutputName"`
-}
-
-// ConditionRequirement specifies the requirement to match a value.
-type ConditionRequirement struct {
-	Operator ConditionOperator `json:"op"`
-
-	// +optional
-	// Value specifies an expected value
-	// This is mutually exclusive with ValueFrom
-	Value string `json:"value,omitempty"`
-	// +optional
-	// ValueFrom specifies expected value from AppConfig
-	// This is mutually exclusive with Value
-	ValueFrom ValueFrom `json:"valueFrom,omitempty"`
-
-	// +optional
-	// FieldPath specifies got value from workload/trait object
-	FieldPath string `json:"fieldPath,omitempty"`
-}
-
-// ValueFrom gets value from AppConfig object by specifying a path
-type ValueFrom struct {
-	FieldPath string `json:"fieldPath"`
-}
-
-// ConditionOperator specifies the operator to match a value.
-type ConditionOperator string
-
-const (
-	// ConditionEqual indicates equal to given value
-	ConditionEqual ConditionOperator = "eq"
-	// ConditionNotEqual indicates not equal to given value
-	ConditionNotEqual ConditionOperator = "notEq"
-	// ConditionNotEmpty indicates given value not empty
-	ConditionNotEmpty ConditionOperator = "notEmpty"
-)

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

@@ -1,355 +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
-
-package v1alpha2
-
-import (
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/util/intstr"
-)
-
-// An OperatingSystem required by a containerised workload.
-type OperatingSystem string
-
-// Supported operating system types.
-const (
-	OperatingSystemLinux   OperatingSystem = "linux"
-	OperatingSystemWindows OperatingSystem = "windows"
-)
-
-// A CPUArchitecture required by a containerised workload.
-type CPUArchitecture string
-
-// Supported architectures
-const (
-	CPUArchitectureI386  CPUArchitecture = "i386"
-	CPUArchitectureAMD64 CPUArchitecture = "amd64"
-	CPUArchitectureARM   CPUArchitecture = "arm"
-	CPUArchitectureARM64 CPUArchitecture = "arm64"
-)
-
-// A SecretKeySelector is a reference to a secret key in an arbitrary namespace.
-type SecretKeySelector struct {
-	// The name of the secret.
-	Name string `json:"name"`
-
-	// The key to select.
-	Key string `json:"key"`
-}
-
-// TODO(negz): The OAM spec calls for float64 quantities in some cases, but this
-// is incompatible with controller-gen and Kubernetes API conventions. We should
-// reassess whether resource.Quantity is appropriate after resolving
-// https://github.com/oam-dev/spec/issues/313
-
-// CPUResources required by a container.
-type CPUResources struct {
-	// Required CPU count. 1.0 represents one CPU core.
-	Required resource.Quantity `json:"required"`
-}
-
-// MemoryResources required by a container.
-type MemoryResources struct {
-	// Required memory.
-	Required resource.Quantity `json:"required"`
-}
-
-// GPUResources required by a container.
-type GPUResources struct {
-	// Required GPU count.
-	Required resource.Quantity `json:"required"`
-}
-
-// DiskResource required by a container.
-type DiskResource struct {
-	// Required disk space.
-	Required resource.Quantity `json:"required"`
-
-	// Ephemeral specifies whether an external disk needs to be mounted.
-	// +optional
-	Ephemeral *bool `json:"ephemeral,omitempty"`
-}
-
-// A VolumeAccessMode determines how a volume may be accessed.
-type VolumeAccessMode string
-
-// Volume access modes.
-const (
-	VolumeAccessModeRO VolumeAccessMode = "RO"
-	VolumeAccessModeRW VolumeAccessMode = "RW"
-)
-
-// A VolumeSharingPolicy determines how a volume may be shared.
-type VolumeSharingPolicy string
-
-// Volume sharing policies.
-const (
-	VolumeSharingPolicyExclusive VolumeSharingPolicy = "Exclusive"
-	VolumeSharingPolicyShared    VolumeSharingPolicy = "Shared"
-)
-
-// VolumeResource required by a container.
-type VolumeResource struct {
-	// Name of this volume. Must be unique within its container.
-	Name string `json:"name"`
-
-	// MountPath at which this volume will be mounted within its container.
-	MountPath string `json:"mountPath"`
-
-	// TODO(negz): Use +kubebuilder:default marker to default AccessMode to RW
-	// and SharingPolicy to Exclusive once we're generating v1 CRDs.
-
-	// AccessMode of this volume; RO (read only) or RW (read and write).
-	// +optional
-	// +kubebuilder:validation:Enum=RO;RW
-	AccessMode *VolumeAccessMode `json:"accessMode,omitempty"`
-
-	// SharingPolicy of this volume; Exclusive or Shared.
-	// +optional
-	// +kubebuilder:validation:Enum=Exclusive;Shared
-	SharingPolicy *VolumeSharingPolicy `json:"sharingPolicy,omitempty"`
-
-	// Disk requirements of this volume.
-	// +optional
-	Disk *DiskResource `json:"disk,omitempty"`
-}
-
-// ExtendedResource required by a container.
-type ExtendedResource struct {
-	// Name of the external resource. Resource names are specified in
-	// kind.group/version format, e.g. motionsensor.ext.example.com/v1.
-	Name string `json:"name"`
-
-	// Required extended resource(s), e.g. 8 or "very-cool-widget"
-	Required intstr.IntOrString `json:"required"`
-}
-
-// ContainerResources specifies a container's required compute resources.
-type ContainerResources struct {
-	// CPU required by this container.
-	CPU CPUResources `json:"cpu"`
-
-	// Memory required by this container.
-	Memory MemoryResources `json:"memory"`
-
-	// GPU required by this container.
-	// +optional
-	GPU *GPUResources `json:"gpu,omitempty"`
-
-	// Volumes required by this container.
-	// +optional
-	Volumes []VolumeResource `json:"volumes,omitempty"`
-
-	// Extended resources required by this container.
-	// +optional
-	Extended []ExtendedResource `json:"extended,omitempty"`
-}
-
-// A ContainerEnvVar specifies an environment variable that should be set within
-// a container.
-type ContainerEnvVar struct {
-	// Name of the environment variable. Must be composed of valid Unicode
-	// letter and number characters, as well as _ and -.
-	// +kubebuilder:validation:Pattern=^[-_a-zA-Z0-9]+$
-	Name string `json:"name"`
-
-	// Value of the environment variable.
-	// +optional
-	Value *string `json:"value,omitempty"`
-
-	// FromSecret is a secret key reference which can be used to assign a value
-	// to the environment variable.
-	// +optional
-	FromSecret *SecretKeySelector `json:"fromSecret,omitempty"`
-}
-
-// A ContainerConfigFile specifies a configuration file that should be written
-// within a container.
-type ContainerConfigFile struct {
-	// Path within the container at which the configuration file should be
-	// written.
-	Path string `json:"path"`
-
-	// Value that should be written to the configuration file.
-	// +optional
-	Value *string `json:"value,omitempty"`
-
-	// 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.
-	// +optional
-	FromSecret *SecretKeySelector `json:"fromSecret,omitempty"`
-}
-
-// A TransportProtocol represents a transport layer protocol.
-type TransportProtocol string
-
-// Transport protocols.
-const (
-	TransportProtocolTCP TransportProtocol = "TCP"
-	TransportProtocolUDP TransportProtocol = "UDP"
-)
-
-// A ContainerPort specifies a port that is exposed by a container.
-type ContainerPort struct {
-	// Name of this port. Must be unique within its container. Must be lowercase
-	// alphabetical characters.
-	// +kubebuilder:validation:Pattern=^[a-z]+$
-	Name string `json:"name"`
-
-	// Port number. Must be unique within its container.
-	Port int32 `json:"containerPort"`
-
-	// TODO(negz): Use +kubebuilder:default marker to default Protocol to TCP
-	// once we're generating v1 CRDs.
-
-	// Protocol used by the server listening on this port.
-	// +kubebuilder:validation:Enum=TCP;UDP
-	// +optional
-	Protocol *TransportProtocol `json:"protocol,omitempty"`
-}
-
-// An ExecProbe probes a container's health by executing a command.
-type ExecProbe struct {
-	// Command to be run by this probe.
-	Command []string `json:"command"`
-}
-
-// A HTTPHeader to be passed when probing a container.
-type HTTPHeader struct {
-	// Name of this HTTP header. Must be unique per probe.
-	Name string `json:"name"`
-
-	// Value of this HTTP header.
-	Value string `json:"value"`
-}
-
-// A HTTPGetProbe probes a container's health by sending an HTTP GET request.
-type HTTPGetProbe struct {
-	// Path to probe, e.g. '/healthz'.
-	Path string `json:"path"`
-
-	// Port to probe.
-	Port int32 `json:"port"`
-
-	// HTTPHeaders to send with the GET request.
-	// +optional
-	HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"`
-}
-
-// A TCPSocketProbe probes a container's health by connecting to a TCP socket.
-type TCPSocketProbe struct {
-	// Port this probe should connect to.
-	Port int32 `json:"port"`
-}
-
-// A ContainerHealthProbe specifies how to probe the health of a container.
-// Exactly one of Exec, HTTPGet, or TCPSocket must be specified.
-type ContainerHealthProbe struct {
-	// Exec probes a container's health by executing a command.
-	// +optional
-	Exec *ExecProbe `json:"exec,omitempty"`
-
-	// HTTPGet probes a container's health by sending an HTTP GET request.
-	// +optional
-	HTTPGet *HTTPGetProbe `json:"httpGet,omitempty"`
-
-	// TCPSocketProbe probes a container's health by connecting to a TCP socket.
-	// +optional
-	TCPSocket *TCPSocketProbe `json:"tcpSocket,omitempty"`
-
-	// InitialDelaySeconds after a container starts before the first probe.
-	// +optional
-	InitialDelaySeconds *int32 `json:"initialDelaySeconds,omitempty"`
-
-	// TODO(negz): Use +kubebuilder:default marker to default PeriodSeconds,
-	// TimeoutSeconds, SuccessThreshold, and FailureThreshold to 10, 1, 1, and 3
-	// respectively once we're generating v1 CRDs.
-
-	// PeriodSeconds between probes.
-	// +optional
-	PeriodSeconds *int32 `json:"periodSeconds,omitempty"`
-
-	// TimeoutSeconds after which the probe times out.
-	// +optional
-	TimeoutSeconds *int32 `json:"timeoutSeconds,omitempty"`
-
-	// SuccessThreshold specifies how many consecutive probes must success in
-	// order for the container to be considered healthy.
-	// +optional
-	SuccessThreshold *int32 `json:"successThreshold,omitempty"`
-
-	// FailureThreshold specifies how many consecutive probes must fail in order
-	// for the container to be considered healthy.
-	// +optional
-	FailureThreshold *int32 `json:"failureThreshold,omitempty"`
-}
-
-// A Container represents an Open Containers Initiative (OCI) container.
-type Container struct {
-	// Name of this container. Must be unique within its workload.
-	Name string `json:"name"`
-
-	// 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.
-	Image string `json:"image"`
-
-	// Resources required by this container
-	// +optional
-	Resources *ContainerResources `json:"resources,omitempty"`
-
-	// Command to be run by this container.
-	// +optional
-	Command []string `json:"command,omitempty"`
-
-	// Arguments to be passed to the command run by this container.
-	// +optional
-	Arguments []string `json:"args,omitempty"`
-
-	// Environment variables that should be set within this container.
-	// +optional
-	Environment []ContainerEnvVar `json:"env,omitempty"`
-
-	// ConfigFiles that should be written within this container.
-	// +optional
-	ConfigFiles []ContainerConfigFile `json:"config,omitempty"`
-
-	// Ports exposed by this container.
-	// +optional
-	Ports []ContainerPort `json:"ports,omitempty"`
-
-	// A LivenessProbe assesses whether this container is alive. Containers that
-	// fail liveness probes will be restarted.
-	// +optional
-	LivenessProbe *ContainerHealthProbe `json:"livenessProbe,omitempty"`
-
-	// A ReadinessProbe assesses whether this container is ready to serve
-	// requests. Containers that fail readiness probes will be withdrawn from
-	// service.
-	// +optional
-	ReadinessProbe *ContainerHealthProbe `json:"readinessProbe,omitempty"`
-
-	// TODO(negz): Ideally the key within this secret would be configurable, but
-	// the current OAM spec allows only a secret name.
-
-	// ImagePullSecret specifies the name of a Secret from which the
-	// credentials required to pull this container's image can be loaded.
-	// +optional
-	ImagePullSecret *string `json:"imagePullSecret,omitempty"`
-}

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

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

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

@@ -1,65 +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.
-*/
-
-// This code is manually implemented, but should be generated in the future.
-
-package v1alpha2
-
-import (
-	corev1 "k8s.io/api/core/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-)
-
-// GetCondition of this ApplicationConfiguration.
-func (ac *ApplicationConfiguration) GetCondition(ct condition.ConditionType) condition.Condition {
-	return ac.Status.GetCondition(ct)
-}
-
-// SetConditions of this ApplicationConfiguration.
-func (ac *ApplicationConfiguration) SetConditions(c ...condition.Condition) {
-	ac.Status.SetConditions(c...)
-}
-
-// GetCondition of this Component.
-func (cm *Component) GetCondition(ct condition.ConditionType) condition.Condition {
-	return cm.Status.GetCondition(ct)
-}
-
-// SetConditions of this Component.
-func (cm *Component) SetConditions(c ...condition.Condition) {
-	cm.Status.SetConditions(c...)
-}
-
-// GetCondition of this HealthScope.
-func (hs *HealthScope) GetCondition(ct condition.ConditionType) condition.Condition {
-	return hs.Status.GetCondition(ct)
-}
-
-// SetConditions of this HealthScope.
-func (hs *HealthScope) SetConditions(c ...condition.Condition) {
-	hs.Status.SetConditions(c...)
-}
-
-// GetWorkloadReferences to get all workload references for scope.
-func (hs *HealthScope) GetWorkloadReferences() []corev1.ObjectReference {
-	return hs.Spec.WorkloadReferences
-}
-
-// AddWorkloadReference to add a workload reference to this scope.
-func (hs *HealthScope) AddWorkloadReference(r corev1.ObjectReference) {
-	hs.Spec.WorkloadReferences = append(hs.Spec.WorkloadReferences, r)
-}

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

@@ -1,124 +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 (
-	"reflect"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-// Package type metadata.
-const (
-	Group   = common.Group
-	Version = "v1alpha2"
-)
-
-var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: Group, Version: Version}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-)
-
-// ComponentDefinition type metadata.
-var (
-	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
-	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
-	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
-	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
-)
-
-// WorkloadDefinition type metadata.
-var (
-	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
-	WorkloadDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: WorkloadDefinitionKind}.String()
-	WorkloadDefinitionKindAPIVersion   = WorkloadDefinitionKind + "." + SchemeGroupVersion.String()
-	WorkloadDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(WorkloadDefinitionKind)
-)
-
-// TraitDefinition type metadata.
-var (
-	TraitDefinitionKind             = reflect.TypeOf(TraitDefinition{}).Name()
-	TraitDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: TraitDefinitionKind}.String()
-	TraitDefinitionKindAPIVersion   = TraitDefinitionKind + "." + SchemeGroupVersion.String()
-	TraitDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(TraitDefinitionKind)
-)
-
-// ScopeDefinition type metadata.
-var (
-	ScopeDefinitionKind             = reflect.TypeOf(ScopeDefinition{}).Name()
-	ScopeDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ScopeDefinitionKind}.String()
-	ScopeDefinitionKindAPIVersion   = ScopeDefinitionKind + "." + SchemeGroupVersion.String()
-	ScopeDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ScopeDefinitionKind)
-)
-
-// Component type metadata.
-var (
-	ComponentKind             = reflect.TypeOf(Component{}).Name()
-	ComponentGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentKind}.String()
-	ComponentKindAPIVersion   = ComponentKind + "." + SchemeGroupVersion.String()
-	ComponentGroupVersionKind = SchemeGroupVersion.WithKind(ComponentKind)
-)
-
-// ApplicationConfiguration type metadata.
-var (
-	ApplicationConfigurationKind             = reflect.TypeOf(ApplicationConfiguration{}).Name()
-	ApplicationConfigurationGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationConfigurationKind}.String()
-	ApplicationConfigurationKindAPIVersion   = ApplicationConfigurationKind + "." + SchemeGroupVersion.String()
-	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
-)
-
-// HealthScope type metadata.
-var (
-	HealthScopeKind             = reflect.TypeOf(HealthScope{}).Name()
-	HealthScopeGroupKind        = schema.GroupKind{Group: Group, Kind: HealthScopeKind}.String()
-	HealthScopeKindAPIVersion   = HealthScopeKind + "." + SchemeGroupVersion.String()
-	HealthScopeGroupVersionKind = SchemeGroupVersion.WithKind(HealthScopeKind)
-)
-
-// Application type metadata.
-var (
-	ApplicationKind            = reflect.TypeOf(Application{}).Name()
-	ApplicationGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationKind}.String()
-	ApplicationKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
-)
-
-// ApplicationRevision type metadata
-var (
-	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
-	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
-	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
-	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
-)
-
-func init() {
-	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
-	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
-	SchemeBuilder.Register(&TraitDefinition{}, &TraitDefinitionList{})
-	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
-	SchemeBuilder.Register(&Component{}, &ComponentList{})
-	SchemeBuilder.Register(&ApplicationConfiguration{}, &ApplicationConfigurationList{})
-	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
-	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
-}

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

@@ -29,18 +29,6 @@ import (
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
-const (
-	// TypeHealthy application are believed to be determined as healthy by a health scope.
-	TypeHealthy condition.ConditionType = "Healthy"
-)
-
-// Reasons an application is or is not healthy
-const (
-	ReasonHealthy        condition.ConditionReason = "AllComponentsHealthy"
-	ReasonUnhealthy      condition.ConditionReason = "UnhealthyOrUnknownComponents"
-	ReasonHealthCheckErr condition.ConditionReason = "HealthCheckeError"
-)
-
 // AppPolicy defines a global policy for all components in the app.
 type AppPolicy struct {
 	// Name is the unique name of the policy.
@@ -74,8 +62,6 @@ type ApplicationSpec struct {
 	// - will have a context in annotation.
 	// - should mark "finish" phase in status.conditions.
 	Workflow *Workflow `json:"workflow,omitempty"`
-
-	// TODO(wonderflow): we should have application level scopes supported here
 }
 
 // +kubebuilder:object:root=true

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

@@ -53,18 +53,12 @@ type ApplicationRevisionCompressibleFields struct {
 	// TraitDefinitions records the snapshot of the traitDefinitions related with the created/modified Application
 	TraitDefinitions map[string]*TraitDefinition `json:"traitDefinitions,omitempty"`
 
-	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
-	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
-
 	// PolicyDefinitions records the snapshot of the PolicyDefinitions related with the created/modified Application
 	PolicyDefinitions map[string]PolicyDefinition `json:"policyDefinitions,omitempty"`
 
 	// WorkflowStepDefinitions records the snapshot of the WorkflowStepDefinitions related with the created/modified Application
 	WorkflowStepDefinitions map[string]*WorkflowStepDefinition `json:"workflowStepDefinitions,omitempty"`
 
-	// ScopeGVK records the apiVersion to GVK mapping
-	ScopeGVK map[string]metav1.GroupVersionKind `json:"scopeGVK,omitempty"`
-
 	// Policies records the external policies
 	Policies map[string]v1alpha1.Policy `json:"policies,omitempty"`
 

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

@@ -38,8 +38,6 @@ func TestApplicationRevisionCompression(t *testing.T) {
 	spec.WorkloadDefinitions["def"] = WorkloadDefinition{Spec: WorkloadDefinitionSpec{Reference: common.DefinitionReference{Name: "testdef"}}}
 	spec.TraitDefinitions = make(map[string]*TraitDefinition)
 	spec.TraitDefinitions["def"] = &TraitDefinition{Spec: TraitDefinitionSpec{ControlPlaneOnly: true}}
-	spec.ScopeDefinitions = make(map[string]ScopeDefinition)
-	spec.ScopeDefinitions["def"] = ScopeDefinition{Spec: ScopeDefinitionSpec{AllowComponentOverlap: true}}
 	spec.PolicyDefinitions = make(map[string]PolicyDefinition)
 	spec.PolicyDefinitions["def"] = PolicyDefinition{Spec: PolicyDefinitionSpec{ManageHealthCheck: true}}
 	spec.WorkflowStepDefinitions = make(map[string]*WorkflowStepDefinition)

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

@@ -232,49 +232,3 @@ type TraitDefinitionList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []TraitDefinition `json:"items"`
 }
-
-// A ScopeDefinitionSpec defines the desired state of a ScopeDefinition.
-type ScopeDefinitionSpec struct {
-	// Reference to the CustomResourceDefinition that defines this scope kind.
-	Reference common.DefinitionReference `json:"definitionRef"`
-
-	// WorkloadRefsPath indicates if/where a scope accepts workloadRef objects
-	WorkloadRefsPath string `json:"workloadRefsPath,omitempty"`
-
-	// AllowComponentOverlap specifies whether an OAM component may exist in
-	// multiple instances of this kind of scope.
-	AllowComponentOverlap bool `json:"allowComponentOverlap"`
-
-	// Extension is used for extension needs by OAM platform builders
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Extension *runtime.RawExtension `json:"extension,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// A ScopeDefinition registers a kind of Kubernetes custom resource as a valid
-// OAM scope kind by referencing its CustomResourceDefinition. The CRD is used
-// to validate the schema of the scope when it is embedded in an OAM
-// ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
-// +kubebuilder:storageversion
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type ScopeDefinition struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec ScopeDefinitionSpec `json:"spec,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ScopeDefinitionList contains a list of ScopeDefinition.
-type ScopeDefinitionList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ScopeDefinition `json:"items"`
-}

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

@@ -107,14 +107,6 @@ var (
 	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
 )
 
-// ScopeDefinition type metadata.
-var (
-	ScopeDefinitionKind             = reflect.TypeOf(ScopeDefinition{}).Name()
-	ScopeDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ScopeDefinitionKind}.String()
-	ScopeDefinitionKindAPIVersion   = ScopeDefinitionKind + "." + SchemeGroupVersion.String()
-	ScopeDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ScopeDefinitionKind)
-)
-
 // ResourceTracker type metadata.
 var (
 	ResourceTrackerKind            = reflect.TypeOf(ResourceTracker{}).Name()
@@ -130,7 +122,6 @@ func init() {
 	SchemeBuilder.Register(&PolicyDefinition{}, &PolicyDefinitionList{})
 	SchemeBuilder.Register(&WorkflowStepDefinition{}, &WorkflowStepDefinitionList{})
 	SchemeBuilder.Register(&DefinitionRevision{}, &DefinitionRevisionList{})
-	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})

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

@@ -205,7 +205,6 @@ func TestResourceTrackerCompression(t *testing.T) {
 		"../../../charts/vela-core/templates/kubevela-controller.yaml",
 		"../../../charts/vela-core/README.md",
 		"../../../pkg/velaql/providers/query/testdata/machinelearning.seldon.io_seldondeployments.yaml",
-		"../../../legacy/charts/vela-core-legacy/crds/standard.oam.dev_podspecworkloads.yaml",
 	}
 	for _, p := range paths {
 		b, err := os.ReadFile(p)

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

@@ -23,7 +23,6 @@ package v1beta1
 
 import (
 	"github.com/kubevela/workflow/api/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -177,13 +176,6 @@ func (in *ApplicationRevisionCompressibleFields) DeepCopyInto(out *ApplicationRe
 			(*out)[key] = outVal
 		}
 	}
-	if in.ScopeDefinitions != nil {
-		in, out := &in.ScopeDefinitions, &out.ScopeDefinitions
-		*out = make(map[string]ScopeDefinition, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
 	if in.PolicyDefinitions != nil {
 		in, out := &in.PolicyDefinitions, &out.PolicyDefinitions
 		*out = make(map[string]PolicyDefinition, len(*in))
@@ -206,13 +198,6 @@ func (in *ApplicationRevisionCompressibleFields) DeepCopyInto(out *ApplicationRe
 			(*out)[key] = outVal
 		}
 	}
-	if in.ScopeGVK != nil {
-		in, out := &in.ScopeGVK, &out.ScopeGVK
-		*out = make(map[string]v1.GroupVersionKind, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
 	if in.Policies != nil {
 		in, out := &in.Policies, &out.Policies
 		*out = make(map[string]core_oam_devv1alpha1.Policy, len(*in))
@@ -806,85 +791,6 @@ func (in *ResourceTrackerStatus) DeepCopy() *ResourceTrackerStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScopeDefinition) DeepCopyInto(out *ScopeDefinition) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDefinition.
-func (in *ScopeDefinition) DeepCopy() *ScopeDefinition {
-	if in == nil {
-		return nil
-	}
-	out := new(ScopeDefinition)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ScopeDefinition) 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 *ScopeDefinitionList) DeepCopyInto(out *ScopeDefinitionList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ScopeDefinition, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDefinitionList.
-func (in *ScopeDefinitionList) DeepCopy() *ScopeDefinitionList {
-	if in == nil {
-		return nil
-	}
-	out := new(ScopeDefinitionList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ScopeDefinitionList) 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 *ScopeDefinitionSpec) DeepCopyInto(out *ScopeDefinitionSpec) {
-	*out = *in
-	out.Reference = in.Reference
-	if in.Extension != nil {
-		in, out := &in.Extension, &out.Extension
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScopeDefinitionSpec.
-func (in *ScopeDefinitionSpec) DeepCopy() *ScopeDefinitionSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ScopeDefinitionSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	*out = *in

apis/generate.go

@@ -25,10 +25,6 @@ limitations under the License.
 // Generate deepcopy methodsets and CRD manifests
 //go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1,generateEmbeddedObjectMeta=true output:artifacts:config=../config/crd/base
 
-// Generate legacy_support for K8s 1.12~1.15 versions CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:generateEmbeddedObjectMeta=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
-//go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
-
 package apis
 
 import (

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

@@ -1,43 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package v1alpha1 contains API Schema definitions for the standard v1alpha1 API group
-// +kubebuilder:object:generate=true
-// +groupName=standard.oam.dev
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-)
-
-const (
-	// GroupName of the CRDs
-	GroupName = "standard.oam.dev"
-	// Version of the group of CRDs
-	Version = "v1alpha1"
-)
-
-var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: Version}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
-	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
-)

apis/standard.oam.dev/v1alpha1/register.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 v1alpha1
-
-import (
-	"reflect"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-// Rollout type metadata
-var (
-	RolloutKind            = reflect.TypeOf(Rollout{}).Name()
-	RolloutGroupKind       = schema.GroupKind{Group: GroupName, Kind: RolloutKind}.String()
-	RolloutKindAPIVersion  = RolloutKind + "." + SchemeGroupVersion.String()
-	RolloutKindVersionKind = SchemeGroupVersion.WithKind(RolloutKind)
-)
-
-func init() {
-	SchemeBuilder.Register(&Rollout{}, &RolloutList{})
-}

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

@@ -1,285 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-)
-
-// RolloutStrategyType defines strategies for pods rollout
-type RolloutStrategyType string
-
-const (
-	// IncreaseFirstRolloutStrategyType indicates that we increase the target resources first
-	IncreaseFirstRolloutStrategyType RolloutStrategyType = "IncreaseFirst"
-
-	// DecreaseFirstRolloutStrategyType indicates that we decrease the source resources first
-	DecreaseFirstRolloutStrategyType RolloutStrategyType = "DecreaseFirst"
-)
-
-// HookType can be pre, post or during rollout
-type HookType string
-
-const (
-	// InitializeRolloutHook execute webhook during the rollout initializing phase
-	InitializeRolloutHook HookType = "initialize-rollout"
-	// PreBatchRolloutHook execute webhook before each batch rollout
-	PreBatchRolloutHook HookType = "pre-batch-rollout"
-	// PostBatchRolloutHook execute webhook after each batch rollout
-	PostBatchRolloutHook HookType = "post-batch-rollout"
-	// FinalizeRolloutHook execute the webhook during the rollout finalizing phase
-	FinalizeRolloutHook HookType = "finalize-rollout"
-)
-
-// RollingState is the overall rollout state
-type RollingState string
-
-const (
-	// LocatingTargetAppState indicates that the rollout is in the stage of locating target app
-	// we use this state to make sure we special handle the target app successfully only once
-	LocatingTargetAppState RollingState = "locatingTargetApp"
-	// VerifyingSpecState indicates that the rollout is in the stage of verifying the rollout settings
-	// and the controller can locate both the target and the source
-	VerifyingSpecState RollingState = "verifyingSpec"
-	// InitializingState indicates that the rollout is initializing all the new resources
-	InitializingState RollingState = "initializing"
-	// RollingInBatchesState indicates that the rollout starts rolling
-	RollingInBatchesState RollingState = "rollingInBatches"
-	// FinalisingState indicates that the rollout is finalizing, possibly clean up the old resources, adjust traffic
-	FinalisingState RollingState = "finalising"
-	// RolloutFailingState indicates that the rollout is failing
-	// one needs to finalize it before mark it as failed by cleaning up the old resources, adjust traffic
-	RolloutFailingState RollingState = "rolloutFailing"
-	// RolloutSucceedState indicates that rollout successfully completed to match the desired target state
-	RolloutSucceedState RollingState = "rolloutSucceed"
-	// RolloutAbandoningState indicates that the rollout is being abandoned
-	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
-	RolloutAbandoningState RollingState = "rolloutAbandoning"
-	// RolloutDeletingState indicates that the rollout is being deleted
-	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
-	RolloutDeletingState RollingState = "RolloutDeletingState"
-	// RolloutFailedState indicates that rollout is failed, the target replica is not reached
-	// we can not move forward anymore, we will let the client to decide when or whether to revert.
-	RolloutFailedState RollingState = "rolloutFailed"
-)
-
-// BatchRollingState is the sub state when the rollout is on the fly
-type BatchRollingState string
-
-const (
-	// BatchInitializingState still rolling the batch, the batch rolling is not completed yet
-	BatchInitializingState BatchRollingState = "batchInitializing"
-	// BatchInRollingState still rolling the batch, the batch rolling is not completed yet
-	BatchInRollingState BatchRollingState = "batchInRolling"
-	// BatchVerifyingState verifying if the application is ready to roll.
-	BatchVerifyingState BatchRollingState = "batchVerifying"
-	// BatchRolloutFailedState indicates that the batch didn't get the manual or automatic approval
-	BatchRolloutFailedState BatchRollingState = "batchVerifyFailed"
-	// BatchFinalizingState indicates that all the pods in the are available, we can move on to the next batch
-	BatchFinalizingState BatchRollingState = "batchFinalizing"
-	// BatchReadyState indicates that all the pods in the are upgraded and its state is ready
-	BatchReadyState BatchRollingState = "batchReady"
-)
-
-// RolloutPlan fines the details of the rollout plan
-type RolloutPlan struct {
-
-	// RolloutStrategy defines strategies for the rollout plan
-	// The default is IncreaseFirstRolloutStrategyType
-	// +optional
-	RolloutStrategy RolloutStrategyType `json:"rolloutStrategy,omitempty"`
-
-	// The size of the target resource. The default is the same
-	// as the size of the source resource.
-	// +optional
-	TargetSize *int32 `json:"targetSize,omitempty"`
-
-	// The number of batches, default = 1
-	// +optional
-	NumBatches *int32 `json:"numBatches,omitempty"`
-
-	// The exact distribution among batches.
-	// its size has to be exactly the same as the NumBatches (if set)
-	// The total number cannot exceed the targetSize or the size of the source resource
-	// We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum
-	// We highly recommend to leave the last batch's replica field empty
-	// +optional
-	RolloutBatches []RolloutBatch `json:"rolloutBatches,omitempty"`
-
-	// All pods in the batches up to the batchPartition (included) will have
-	// the target resource specification while the rest still have the source resource
-	// This is designed for the operators to manually rollout
-	// Default is the the number of batches which will rollout all the batches
-	// +optional
-	BatchPartition *int32 `json:"batchPartition,omitempty"`
-
-	// Paused the rollout, default is false
-	// +optional
-	Paused bool `json:"paused,omitempty"`
-
-	// RolloutWebhooks provide a way for the rollout to interact with an external process
-	// +optional
-	RolloutWebhooks []RolloutWebhook `json:"rolloutWebhooks,omitempty"`
-
-	// CanaryMetric provides a way for the rollout process to automatically check certain metrics
-	// before complete the process
-	// +optional
-	CanaryMetric []CanaryMetric `json:"canaryMetric,omitempty"`
-}
-
-// RolloutBatch is used to describe how the each batch rollout should be
-type RolloutBatch struct {
-	// Replicas is the number of pods to upgrade in this batch
-	// it can be an absolute number (ex: 5) or a percentage of total pods
-	// we will ignore the percentage of the last batch to just fill the gap
-	// +optional
-	// it is mutually exclusive with the PodList field
-	Replicas intstr.IntOrString `json:"replicas,omitempty"`
-
-	// The list of Pods to get upgraded
-	// +optional
-	// it is mutually exclusive with the Replicas field
-	PodList []string `json:"podList,omitempty"`
-
-	// MaxUnavailable is the max allowed number of pods that is unavailable
-	// during the upgrade. We will mark the batch as ready as long as there are less
-	// or equal number of pods unavailable than this number.
-	// default = 0
-	// +optional
-	MaxUnavailable *intstr.IntOrString `json:"maxUnavailable,omitempty"`
-
-	// The wait time, in seconds, between instances upgrades, default = 0
-	// +optional
-	InstanceInterval *int32 `json:"instanceInterval,omitempty"`
-
-	// RolloutWebhooks provides a way for the batch rollout to interact with an external process
-	// +optional
-	BatchRolloutWebhooks []RolloutWebhook `json:"batchRolloutWebhooks,omitempty"`
-
-	// CanaryMetric provides a way for the batch rollout process to automatically check certain metrics
-	// before moving to the next batch
-	// +optional
-	CanaryMetric []CanaryMetric `json:"canaryMetric,omitempty"`
-}
-
-// RolloutWebhook holds the reference to external checks used for canary analysis
-type RolloutWebhook struct {
-	// Type of this webhook
-	Type HookType `json:"type"`
-
-	// Name of this webhook
-	Name string `json:"name"`
-
-	// URL address of this webhook
-	URL string `json:"url"`
-
-	// Method the HTTP call method, default is POST
-	Method string `json:"method,omitempty"`
-
-	// ExpectedStatus contains all the expected http status code that we will accept as success
-	ExpectedStatus []int `json:"expectedStatus,omitempty"`
-
-	// Metadata (key-value pairs) for this webhook
-	// +optional
-	Metadata *map[string]string `json:"metadata,omitempty"`
-}
-
-// RolloutWebhookPayload holds the info and metadata sent to webhooks
-type RolloutWebhookPayload struct {
-	// Name of the upgrading resource
-	Name string `json:"name"`
-
-	// Namespace of the upgrading resource
-	Namespace string `json:"namespace"`
-
-	// Phase of the rollout
-	Phase string `json:"phase"`
-
-	// Metadata (key-value pairs) are the extra data send to this webhook
-	Metadata map[string]string `json:"metadata,omitempty"`
-}
-
-// CanaryMetric holds the reference to metrics used for canary analysis
-type CanaryMetric struct {
-	// Name of the metric
-	Name string `json:"name"`
-
-	// Interval represents the windows size
-	Interval string `json:"interval,omitempty"`
-
-	// Range value accepted for this metric
-	// +optional
-	MetricsRange *MetricsExpectedRange `json:"metricsRange,omitempty"`
-
-	// TemplateRef references a metric template object
-	// +optional
-	TemplateRef *corev1.ObjectReference `json:"templateRef,omitempty"`
-}
-
-// MetricsExpectedRange defines the range used for metrics validation
-type MetricsExpectedRange struct {
-	// Minimum value
-	// +optional
-	Min *intstr.IntOrString `json:"min,omitempty"`
-
-	// Maximum value
-	// +optional
-	Max *intstr.IntOrString `json:"max,omitempty"`
-}
-
-// RolloutStatus defines the observed state of a rollout plan
-type RolloutStatus struct {
-	// Conditions represents the latest available observations of a CloneSet's current state.
-	condition.ConditionedStatus `json:",inline"`
-
-	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
-	// and does not change until the rollout is restarted
-	RolloutOriginalSize int32 `json:"rolloutOriginalSize,omitempty"`
-
-	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
-	// and does not change until the rollout is restarted
-	RolloutTargetSize int32 `json:"rolloutTargetSize,omitempty"`
-
-	// NewPodTemplateIdentifier is a string that uniquely represent the new pod template
-	// each workload type could use different ways to identify that so we cannot compare between resources
-	NewPodTemplateIdentifier string `json:"targetGeneration,omitempty"`
-
-	// lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template
-	// each workload type could use different ways to identify that so we cannot compare between resources
-	// We update this field only after a successful rollout
-	LastAppliedPodTemplateIdentifier string `json:"lastAppliedPodTemplateIdentifier,omitempty"`
-
-	// RollingState is the Rollout State
-	RollingState RollingState `json:"rollingState"`
-
-	// BatchRollingState only meaningful when the Status is rolling
-	// +optional
-	BatchRollingState BatchRollingState `json:"batchRollingState"`
-
-	// The current batch the rollout is working on/blocked
-	// it starts from 0
-	CurrentBatch int32 `json:"currentBatch"`
-
-	// UpgradedReplicas is the number of Pods upgraded by the rollout controller
-	UpgradedReplicas int32 `json:"upgradedReplicas"`
-
-	// UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-	UpgradedReadyReplicas int32 `json:"upgradedReadyReplicas"`
-}

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

@@ -1,430 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog/v2"
-)
-
-// RolloutEvent is used to describe the events during rollout
-type RolloutEvent string
-
-const (
-	// RollingFailedEvent indicates that we encountered an unexpected error during upgrading and can't be retried
-	RollingFailedEvent RolloutEvent = "RollingFailedEvent"
-
-	// RollingRetriableFailureEvent indicates that we encountered an unexpected but retriable error
-	RollingRetriableFailureEvent RolloutEvent = "RollingRetriableFailureEvent"
-
-	// AppLocatedEvent indicates that apps are located successfully
-	AppLocatedEvent RolloutEvent = "AppLocatedEvent"
-
-	// RollingModifiedEvent indicates that the rolling target or source has changed
-	RollingModifiedEvent RolloutEvent = "RollingModifiedEvent"
-
-	// RollingDeletedEvent indicates that the rolling is being deleted
-	RollingDeletedEvent RolloutEvent = "RollingDeletedEvent"
-
-	// RollingSpecVerifiedEvent indicates that we have successfully verified that the rollout spec
-	RollingSpecVerifiedEvent RolloutEvent = "RollingSpecVerifiedEvent"
-
-	// RollingInitializedEvent indicates that we have finished initializing all the workload resources
-	RollingInitializedEvent RolloutEvent = "RollingInitializedEvent"
-
-	// AllBatchFinishedEvent indicates that all batches are upgraded
-	AllBatchFinishedEvent RolloutEvent = "AllBatchFinishedEvent"
-
-	// RollingFinalizedEvent indicates that we have finalized the rollout which includes but not
-	// limited to the resource garbage collection
-	RollingFinalizedEvent RolloutEvent = "AllBatchFinishedEvent"
-
-	// InitializedOneBatchEvent indicates that we have successfully rolled out one batch
-	InitializedOneBatchEvent RolloutEvent = "InitializedOneBatchEvent"
-
-	// FinishedOneBatchEvent indicates that we have successfully rolled out one batch
-	FinishedOneBatchEvent RolloutEvent = "FinishedOneBatchEvent"
-
-	// RolloutOneBatchEvent indicates that we have rollout one batch
-	RolloutOneBatchEvent RolloutEvent = "RolloutOneBatchEvent"
-
-	// OneBatchAvailableEvent indicates that the batch resource is considered available
-	// this events comes after we have examine the pod readiness check and traffic shifting if needed
-	OneBatchAvailableEvent RolloutEvent = "OneBatchAvailable"
-
-	// BatchRolloutApprovedEvent indicates that we got the approval manually
-	BatchRolloutApprovedEvent RolloutEvent = "BatchRolloutApprovedEvent"
-
-	// BatchRolloutFailedEvent indicates that we are waiting for the approval of the
-	BatchRolloutFailedEvent RolloutEvent = "BatchRolloutFailedEvent"
-)
-
-// These are valid conditions of the rollout.
-const (
-	// RolloutSpecVerifying indicates that the rollout just started with verification
-	RolloutSpecVerifying condition.ConditionType = "RolloutSpecVerifying"
-	// RolloutInitializing means we start to initialize the cluster
-	RolloutInitializing condition.ConditionType = "RolloutInitializing"
-	// RolloutInProgress means we are upgrading resources.
-	RolloutInProgress condition.ConditionType = "RolloutInProgress"
-	// RolloutFinalizing means the rollout is finalizing
-	RolloutFinalizing condition.ConditionType = "RolloutFinalizing"
-	// RolloutFailing means the rollout is failing
-	RolloutFailing condition.ConditionType = "RolloutFailing"
-	// RolloutAbandoning means that the rollout is being abandoned.
-	RolloutAbandoning condition.ConditionType = "RolloutAbandoning"
-	// RolloutDeleting means that the rollout is being deleted.
-	RolloutDeleting condition.ConditionType = "RolloutDeleting"
-	// RolloutFailed means that the rollout failed.
-	RolloutFailed condition.ConditionType = "RolloutFailed"
-	// RolloutSucceed means that the rollout is done.
-	RolloutSucceed condition.ConditionType = "RolloutSucceed"
-	// BatchInitializing
-	BatchInitializing condition.ConditionType = "BatchInitializing"
-	// BatchPaused
-	BatchPaused condition.ConditionType = "BatchPaused"
-	// BatchVerifying
-	BatchVerifying condition.ConditionType = "BatchVerifying"
-	// BatchRolloutFailed
-	BatchRolloutFailed condition.ConditionType = "BatchRolloutFailed"
-	// BatchFinalizing
-	BatchFinalizing condition.ConditionType = "BatchFinalizing"
-	// BatchReady
-	BatchReady condition.ConditionType = "BatchReady"
-)
-
-// NewPositiveCondition creates a positive condition type
-func NewPositiveCondition(condType condition.ConditionType) condition.Condition {
-	return condition.Condition{
-		Type:               condType,
-		Status:             v1.ConditionTrue,
-		LastTransitionTime: metav1.NewTime(time.Now()),
-	}
-}
-
-// NewNegativeCondition creates a false condition type
-func NewNegativeCondition(condType condition.ConditionType, message string) condition.Condition {
-	return condition.Condition{
-		Type:               condType,
-		Status:             v1.ConditionFalse,
-		LastTransitionTime: metav1.NewTime(time.Now()),
-		Message:            message,
-	}
-}
-
-const invalidRollingStateTransition = "the rollout state transition from `%s` state  with `%s` is invalid"
-
-const invalidBatchRollingStateTransition = "the batch rolling state transition from `%s` state  with `%s` is invalid"
-
-func (r *RolloutStatus) getRolloutConditionType() condition.ConditionType {
-	// figure out which condition type should we put in the condition depends on its state
-	switch r.RollingState {
-	case VerifyingSpecState:
-		return RolloutSpecVerifying
-
-	case InitializingState:
-		return RolloutInitializing
-
-	case RollingInBatchesState:
-		switch r.BatchRollingState {
-		case BatchInitializingState:
-			return BatchInitializing
-
-		case BatchVerifyingState:
-			return BatchVerifying
-
-		case BatchFinalizingState:
-			return BatchFinalizing
-
-		case BatchRolloutFailedState:
-			return BatchRolloutFailed
-
-		case BatchReadyState:
-			return BatchReady
-
-		default:
-			return RolloutInProgress
-		}
-
-	case FinalisingState:
-		return RolloutFinalizing
-
-	case RolloutFailingState:
-		return RolloutFailing
-
-	case RolloutAbandoningState:
-		return RolloutAbandoning
-
-	case RolloutDeletingState:
-		return RolloutDeleting
-
-	case RolloutSucceedState:
-		return RolloutSucceed
-
-	default:
-		return RolloutFailed
-	}
-}
-
-// RolloutRetry is a special state transition since we need an error message
-func (r *RolloutStatus) RolloutRetry(reason string) {
-	// we can still retry, no change on the state
-	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
-}
-
-// RolloutFailed is a special state transition since we need an error message
-func (r *RolloutStatus) RolloutFailed(reason string) {
-	// set the condition first which depends on the state
-	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
-	r.RollingState = RolloutFailedState
-}
-
-// RolloutFailing is a special state transition that always moves the rollout state to the failing state
-func (r *RolloutStatus) RolloutFailing(reason string) {
-	// set the condition first which depends on the state
-	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
-	r.RollingState = RolloutFailingState
-	r.BatchRollingState = BatchInitializingState
-}
-
-// ResetStatus resets the status of the rollout to start from beginning
-func (r *RolloutStatus) ResetStatus() {
-	r.NewPodTemplateIdentifier = ""
-	r.RolloutTargetSize = -1
-	r.LastAppliedPodTemplateIdentifier = ""
-	r.RollingState = LocatingTargetAppState
-	r.BatchRollingState = BatchInitializingState
-	r.CurrentBatch = 0
-	r.UpgradedReplicas = 0
-	r.UpgradedReadyReplicas = 0
-}
-
-// SetRolloutCondition sets the supplied condition, replacing any existing condition
-// of the same type unless they are identical.
-func (r *RolloutStatus) SetRolloutCondition(new condition.Condition) {
-	exists := false
-	for i, existing := range r.Conditions {
-		if existing.Type != new.Type {
-			continue
-		}
-		// we want to update the condition when the LTT changes
-		if existing.Type == new.Type &&
-			existing.Status == new.Status &&
-			existing.Reason == new.Reason &&
-			existing.Message == new.Message &&
-			existing.LastTransitionTime == new.LastTransitionTime {
-			exists = true
-			continue
-		}
-
-		r.Conditions[i] = new
-		exists = true
-	}
-	if !exists {
-		r.Conditions = append(r.Conditions, new)
-	}
-}
-
-// we can't panic since it will crash the other controllers
-func (r *RolloutStatus) illegalStateTransition(err error) {
-	r.RolloutFailed(err.Error())
-}
-
-// StateTransition is the center place to do rollout state transition
-// it returns an error if the transition is invalid
-// it changes the coming rollout state if it's valid
-func (r *RolloutStatus) StateTransition(event RolloutEvent) {
-	rollingState := r.RollingState
-	batchRollingState := r.BatchRollingState
-	defer func() {
-		klog.InfoS("try to execute a rollout state transition",
-			"pre rolling state", rollingState,
-			"pre batch rolling state", batchRollingState,
-			"post rolling state", r.RollingState,
-			"post batch rolling state", r.BatchRollingState)
-	}()
-
-	// we have special transition for these types of event since they require additional info
-	if event == RollingFailedEvent || event == RollingRetriableFailureEvent {
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-		return
-	}
-	// special handle modified event here
-	if event == RollingModifiedEvent {
-		if r.RollingState == RolloutDeletingState {
-			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-			return
-		}
-		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
-			r.ResetStatus()
-		} else {
-			r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
-			r.RollingState = RolloutAbandoningState
-			r.BatchRollingState = BatchInitializingState
-		}
-		return
-	}
-
-	// special handle deleted event here, it can happen at many states
-	if event == RollingDeletedEvent {
-		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
-			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-			return
-		}
-		r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout is being deleted"))
-		r.RollingState = RolloutDeletingState
-		r.BatchRollingState = BatchInitializingState
-		return
-	}
-
-	// special handle appLocatedEvent event here, it only applies to one state but it's legal to happen at other states
-	if event == AppLocatedEvent {
-		if r.RollingState == LocatingTargetAppState {
-			r.RollingState = VerifyingSpecState
-		}
-		return
-	}
-
-	switch rollingState {
-	case VerifyingSpecState:
-		if event == RollingSpecVerifiedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = InitializingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case InitializingState:
-		if event == RollingInitializedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RollingInBatchesState
-			r.BatchRollingState = BatchInitializingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RollingInBatchesState:
-		r.batchStateTransition(event)
-		return
-
-	case RolloutAbandoningState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.ResetStatus()
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RolloutDeletingState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RolloutFailedState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case FinalisingState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RolloutSucceedState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RolloutFailingState:
-		if event == RollingFinalizedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.RollingState = RolloutFailedState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RolloutSucceedState, RolloutFailedState:
-		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	default:
-		r.illegalStateTransition(fmt.Errorf("invalid rolling state %s before transition", rollingState))
-	}
-}
-
-// batchStateTransition handles the state transition when the rollout is in action
-func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
-	batchRollingState := r.BatchRollingState
-	if event == BatchRolloutFailedEvent {
-		r.BatchRollingState = BatchRolloutFailedState
-		r.RollingState = RolloutFailedState
-		r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), "failed"))
-		return
-	}
-	switch batchRollingState {
-	case BatchInitializingState:
-		if event == InitializedOneBatchEvent {
-			r.BatchRollingState = BatchInRollingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
-
-	case BatchInRollingState:
-		if event == RolloutOneBatchEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.BatchRollingState = BatchVerifyingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
-
-	case BatchVerifyingState:
-		if event == OneBatchAvailableEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.BatchRollingState = BatchFinalizingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
-
-	case BatchFinalizingState:
-		if event == FinishedOneBatchEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.BatchRollingState = BatchReadyState
-			return
-		}
-		if event == AllBatchFinishedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			// transition out of the batch loop
-			r.BatchRollingState = BatchReadyState
-			r.RollingState = FinalisingState
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
-
-	case BatchReadyState:
-		if event == BatchRolloutApprovedEvent {
-			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
-			r.BatchRollingState = BatchInitializingState
-			r.CurrentBatch++
-			return
-		}
-		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
-
-	default:
-		r.illegalStateTransition(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
-	}
-}

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

@@ -1,77 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// Rollout is the Schema for the Rollout API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam},shortName=rollout
-// +kubebuilder:subresource:status
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutTargetSize`
-// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.upgradedReplicas`
-// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.upgradedReadyReplicas`
-// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState`
-// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState`
-// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
-type Rollout struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   RolloutSpec       `json:"spec,omitempty"`
-	Status CompRolloutStatus `json:"status,omitempty"`
-}
-
-// RolloutSpec defines how to describe an update between different compRevision
-type RolloutSpec struct {
-	// TargetRevisionName contains the name of the componentRevisionName that we need to upgrade to.
-	TargetRevisionName string `json:"targetRevisionName"`
-
-	// SourceRevisionName contains the name of the componentRevisionName  that we need to upgrade from.
-	// it can be empty only when it's the first time to deploy the application
-	SourceRevisionName string `json:"sourceRevisionName,omitempty"`
-
-	// ComponentName specify the component name
-	ComponentName string `json:"componentName"`
-
-	// RolloutPlan is the details on how to rollout the resources
-	RolloutPlan RolloutPlan `json:"rolloutPlan"`
-}
-
-// CompRolloutStatus defines the observed state of rollout
-type CompRolloutStatus struct {
-	RolloutStatus `json:",inline"`
-
-	// LastUpgradedTargetRevision contains the name of the componentRevisionName that we upgraded to
-	// We will restart the rollout if this is not the same as the spec
-	LastUpgradedTargetRevision string `json:"lastTargetRevision"`
-
-	// LastSourceRevision contains the name of the componentRevisionName that we need to upgrade from.
-	// We will restart the rollout if this is not the same as the spec
-	LastSourceRevision string `json:"LastSourceRevision,omitempty"`
-}
-
-// RolloutList contains a list of Rollout
-// +kubebuilder:object:root=true
-type RolloutList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Rollout `json:"items"`
-}

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

@@ -1,334 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright 2023 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	v1 "k8s.io/api/core/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/intstr"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CanaryMetric) DeepCopyInto(out *CanaryMetric) {
-	*out = *in
-	if in.MetricsRange != nil {
-		in, out := &in.MetricsRange, &out.MetricsRange
-		*out = new(MetricsExpectedRange)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.TemplateRef != nil {
-		in, out := &in.TemplateRef, &out.TemplateRef
-		*out = new(v1.ObjectReference)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryMetric.
-func (in *CanaryMetric) DeepCopy() *CanaryMetric {
-	if in == nil {
-		return nil
-	}
-	out := new(CanaryMetric)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CompRolloutStatus) DeepCopyInto(out *CompRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CompRolloutStatus.
-func (in *CompRolloutStatus) DeepCopy() *CompRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(CompRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsExpectedRange) DeepCopyInto(out *MetricsExpectedRange) {
-	*out = *in
-	if in.Min != nil {
-		in, out := &in.Min, &out.Min
-		*out = new(intstr.IntOrString)
-		**out = **in
-	}
-	if in.Max != nil {
-		in, out := &in.Max, &out.Max
-		*out = new(intstr.IntOrString)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsExpectedRange.
-func (in *MetricsExpectedRange) DeepCopy() *MetricsExpectedRange {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsExpectedRange)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Rollout) DeepCopyInto(out *Rollout) {
-	*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 Rollout.
-func (in *Rollout) DeepCopy() *Rollout {
-	if in == nil {
-		return nil
-	}
-	out := new(Rollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Rollout) DeepCopyObject() runtime.Object {
-	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 *RolloutBatch) DeepCopyInto(out *RolloutBatch) {
-	*out = *in
-	out.Replicas = in.Replicas
-	if in.PodList != nil {
-		in, out := &in.PodList, &out.PodList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.MaxUnavailable != nil {
-		in, out := &in.MaxUnavailable, &out.MaxUnavailable
-		*out = new(intstr.IntOrString)
-		**out = **in
-	}
-	if in.InstanceInterval != nil {
-		in, out := &in.InstanceInterval, &out.InstanceInterval
-		*out = new(int32)
-		**out = **in
-	}
-	if in.BatchRolloutWebhooks != nil {
-		in, out := &in.BatchRolloutWebhooks, &out.BatchRolloutWebhooks
-		*out = make([]RolloutWebhook, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.CanaryMetric != nil {
-		in, out := &in.CanaryMetric, &out.CanaryMetric
-		*out = make([]CanaryMetric, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutBatch.
-func (in *RolloutBatch) DeepCopy() *RolloutBatch {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutBatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutList) DeepCopyInto(out *RolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Rollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutList.
-func (in *RolloutList) DeepCopy() *RolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutPlan) DeepCopyInto(out *RolloutPlan) {
-	*out = *in
-	if in.TargetSize != nil {
-		in, out := &in.TargetSize, &out.TargetSize
-		*out = new(int32)
-		**out = **in
-	}
-	if in.NumBatches != nil {
-		in, out := &in.NumBatches, &out.NumBatches
-		*out = new(int32)
-		**out = **in
-	}
-	if in.RolloutBatches != nil {
-		in, out := &in.RolloutBatches, &out.RolloutBatches
-		*out = make([]RolloutBatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.BatchPartition != nil {
-		in, out := &in.BatchPartition, &out.BatchPartition
-		*out = new(int32)
-		**out = **in
-	}
-	if in.RolloutWebhooks != nil {
-		in, out := &in.RolloutWebhooks, &out.RolloutWebhooks
-		*out = make([]RolloutWebhook, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.CanaryMetric != nil {
-		in, out := &in.CanaryMetric, &out.CanaryMetric
-		*out = make([]CanaryMetric, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutPlan.
-func (in *RolloutPlan) DeepCopy() *RolloutPlan {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutPlan)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutSpec) DeepCopyInto(out *RolloutSpec) {
-	*out = *in
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutSpec.
-func (in *RolloutSpec) DeepCopy() *RolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutStatus) DeepCopyInto(out *RolloutStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutStatus.
-func (in *RolloutStatus) DeepCopy() *RolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutWebhook) DeepCopyInto(out *RolloutWebhook) {
-	*out = *in
-	if in.ExpectedStatus != nil {
-		in, out := &in.ExpectedStatus, &out.ExpectedStatus
-		*out = make([]int, len(*in))
-		copy(*out, *in)
-	}
-	if in.Metadata != nil {
-		in, out := &in.Metadata, &out.Metadata
-		*out = new(map[string]string)
-		if **in != nil {
-			in, out := *in, *out
-			*out = make(map[string]string, len(*in))
-			for key, val := range *in {
-				(*out)[key] = val
-			}
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutWebhook.
-func (in *RolloutWebhook) DeepCopy() *RolloutWebhook {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutWebhook)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutWebhookPayload) DeepCopyInto(out *RolloutWebhookPayload) {
-	*out = *in
-	if in.Metadata != nil {
-		in, out := &in.Metadata, &out.Metadata
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutWebhookPayload.
-func (in *RolloutWebhookPayload) DeepCopy() *RolloutWebhookPayload {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutWebhookPayload)
-	in.DeepCopyInto(out)
-	return out
-}

apis/types/capability.go

@@ -64,8 +64,6 @@ const (
 	TypeWorkload CapType = "workload"
 	// TypeTrait represents OAM Trait
 	TypeTrait CapType = "trait"
-	// TypeScope represent OAM Scope
-	TypeScope CapType = "scope"
 	// TypeWorkflowStep represent OAM Workflow
 	TypeWorkflowStep CapType = "workflowstep"
 	// TypePolicy represent OAM Policy

apis/types/componentmanifest.go

@@ -17,22 +17,19 @@ limitations under the License.
 package types
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 // ComponentManifest contains resources rendered from an application component.
 type ComponentManifest struct {
-	Name             string
-	Namespace        string
-	RevisionName     string
-	RevisionHash     string
-	ExternalRevision string
+	Name         string
+	Namespace    string
+	RevisionName string
+	RevisionHash string
 	// StandardWorkload contains K8s resource generated from "output" block of ComponentDefinition
 	StandardWorkload *unstructured.Unstructured
 	// Traits contains both resources generated from "outputs" block of ComponentDefinition and resources generated from TraitDefinition
 	Traits []*unstructured.Unstructured
-	Scopes []*corev1.ObjectReference
 
 	// PackagedWorkloadResources contain all the workload related resources. It could be a Helm
 	// Release, Git Repo or anything that can package and run a workload.

apis/types/event.go

@@ -23,19 +23,14 @@ const (
 	ReasonPolicyGenerated = "PolicyGenerated"
 	ReasonRevisoned       = "Revisioned"
 	ReasonApplied         = "Applied"
-	ReasonHealthCheck     = "HealthChecked"
 	ReasonDeployed        = "Deployed"
-	ReasonRollout         = "Rollout"
 
-	ReasonFailedParse       = "FailedParse"
-	ReasonFailedRender      = "FailedRender"
-	ReasonFailedRevision    = "FailedRevision"
-	ReasonFailedWorkflow    = "FailedWorkflow"
-	ReasonFailedApply       = "FailedApply"
-	ReasonFailedHealthCheck = "FailedHealthCheck"
-	ReasonFailedStateKeep   = "FailedStateKeep"
-	ReasonFailedGC          = "FailedGC"
-	ReasonFailedRollout     = "FailedRollout"
+	ReasonFailedParse     = "FailedParse"
+	ReasonFailedRevision  = "FailedRevision"
+	ReasonFailedWorkflow  = "FailedWorkflow"
+	ReasonFailedApply     = "FailedApply"
+	ReasonFailedStateKeep = "FailedStateKeep"
+	ReasonFailedGC        = "FailedGC"
 )
 
 // event message for Application
@@ -44,16 +39,6 @@ const (
 	MessageRendered         = "Rendered successfully"
 	MessagePolicyGenerated  = "Policy generated successfully"
 	MessageRevisioned       = "Revisioned successfully"
-	MessageApplied          = "Applied successfully"
 	MessageWorkflowFinished = "Workflow finished"
-	MessageHealthCheck      = "Health checked healthy"
 	MessageDeployed         = "Deployed successfully"
-	MessageRollout          = "Rollout successfully"
-
-	MessageFailedParse       = "fail to parse application, err: %v"
-	MessageFailedRender      = "fail to render application, err: %v"
-	MessageFailedRevision    = "fail to handle application revision, err: %v"
-	MessageFailedApply       = "fail to apply component, err: %v"
-	MessageFailedHealthCheck = "fail to health check, err: %v"
-	MessageFailedGC          = "fail to garbage collection, err: %v"
 )

apis/types/rolling.go

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

apis/types/types.go

@@ -64,8 +64,6 @@ const (
 	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"
-	// LabelDefinitionScope is the label which describe whether the capability's scope
-	LabelDefinitionScope = "custom.definition.oam.dev/scope"
 	// LabelNodeRoleGateway gateway role of node
 	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
 	// LabelNodeRoleWorker worker role of node
@@ -157,8 +155,6 @@ const LabelArg = "label"
 
 // DefaultFilterAnnots are annotations that won't pass to workload or trait
 var DefaultFilterAnnots = []string{
-	oam.AnnotationAppRollout,
-	oam.AnnotationRollingComponent,
 	oam.AnnotationInplaceUpgrade,
 	oam.AnnotationFilterLabelKeys,
 	oam.AnnotationFilterAnnotationKeys,

charts/vela-core/README.md

@@ -38,16 +38,13 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 
 ### KubeVela core parameters
 
-| Name                          | Description                                                                                   | Value  |
-| ----------------------------- | --------------------------------------------------------------------------------------------- | ------ |
-| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`  |
-| `applicationRevisionLimit`    | Application revision limit                                                                    | `2`    |
-| `definitionRevisionLimit`     | Definition revision limit                                                                     | `2`    |
-| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`    |
-| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`   |
-| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `v0.3` |
-| `disableCaps`                 | Disable capability                                                                            | `all`  |
-| `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`  |
+| Name                          | Description                                                                                   | Value |
+| ----------------------------- | --------------------------------------------------------------------------------------------- | ----- |
+| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil` |
+| `applicationRevisionLimit`    | Application revision limit                                                                    | `2`   |
+| `definitionRevisionLimit`     | Definition revision limit                                                                     | `2`   |
+| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`   |
+| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`  |
 
 ### KubeVela workflow parameters
 
@@ -86,7 +83,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `optimize.enableInMemoryWorkflowContext`                     | Optimize workflow by use in-memory context.                                                                                                                                                                                      | `false` |
 | `optimize.disableResourceApplyDoubleCheck`                   | Optimize workflow by ignoring resource double check after apply.                                                                                                                                                                 | `false` |
 | `optimize.enableResourceTrackerDeleteOnlyTrigger`            | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                                                                                                              | `true`  |
-| `featureGates.enableLegacyComponentRevision`                 | if disabled, only component with rollout trait will create component revisions                                                                                                                                                   | `false` |
 | `featureGates.gzipResourceTracker`                           | compress ResourceTracker using gzip (good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers.                                                                                      | `false` |
 | `featureGates.zstdResourceTracker`                           | compress ResourceTracker using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers. Note that zstd will be prioritized if you enable other compression options. | `true`  |
 | `featureGates.applyOnce`                                     | if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker                                                                                            | `false` |

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

@@ -19,868 +19,6 @@ spec:
     singular: application
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.components[*].name
-      name: COMPONENT
-      type: string
-    - jsonPath: .spec.components[*].type
-      name: TYPE
-      type: string
-    - jsonPath: .status.status
-      name: PHASE
-      type: string
-    - jsonPath: .status.services[*].healthy
-      name: HEALTHY
-      type: boolean
-    - jsonPath: .status.services[*].message
-      name: STATUS
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: AGE
-      type: date
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: Application is the Schema for the applications API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ApplicationSpec is the spec of Application
-            properties:
-              components:
-                items:
-                  description: ApplicationComponent describe the component of application
-                  properties:
-                    name:
-                      type: string
-                    scopes:
-                      additionalProperties:
-                        type: string
-                      description: scopes in ApplicationComponent defines the component-level
-                        scopes the format is <scope-type:scope-instance-name> pairs,
-                        the key represents type of `ScopeDefinition` while the value
-                        represent the name of scope instance.
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    settings:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    traits:
-                      description: Traits define the trait of one component, the type
-                        must be array to keep the order.
-                      items:
-                        description: ApplicationTrait defines the trait of application
-                        properties:
-                          name:
-                            type: string
-                          properties:
-                            type: object
-                            x-kubernetes-preserve-unknown-fields: true
-                        required:
-                        - name
-                        type: object
-                      type: array
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources
-                  The controller simply replace the old resources with the new one
-                  if there is no rollout plan involved
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition
-                      (included) will have the target resource specification while
-                      the rest still have the source resource This is designed for
-                      the operators to manually rollout Default is the the number
-                      of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process
-                      to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used
-                        for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead
-                                of an entire object, this string should contain a
-                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
-                                For example, if the object reference is to a container
-                                within a pod, this would take on a value like: "spec.containers{name}"
-                                (where "name" refers to the name of the container
-                                that triggered the event) or if no container name
-                                is specified "spec.containers[2]" (container with
-                                index 2 in this pod). This syntax is chosen only to
-                                have some well-defined way of referencing a part of
-                                an object. TODO: this design is not final and this
-                                field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info:
-                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this
-                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                              type: string
-                          type: object
-                          x-kubernetes-map-type: atomic
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has
-                      to be exactly the same as the NumBatches (if set) The total
-                      number cannot exceed the targetSize or the size of the source
-                      resource We will IGNORE the last batch's replica field if it's
-                      a percentage since round errors can lead to inaccurate sum We
-                      highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch
-                        rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch
-                            rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external
-                              checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected
-                                  http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default
-                                  is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout
-                            process to automatically check certain metrics before
-                            moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics
-                              used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template
-                                  object
-                                properties:
-                                  apiVersion:
-                                    description: API version of the referent.
-                                    type: string
-                                  fieldPath:
-                                    description: 'If referring to a piece of an object
-                                      instead of an entire object, this string should
-                                      contain a valid JSON/Go field access statement,
-                                      such as desiredState.manifest.containers[2].
-                                      For example, if the object reference is to a
-                                      container within a pod, this would take on a
-                                      value like: "spec.containers{name}" (where "name"
-                                      refers to the name of the container that triggered
-                                      the event) or if no container name is specified
-                                      "spec.containers[2]" (container with index 2
-                                      in this pod). This syntax is chosen only to
-                                      have some well-defined way of referencing a
-                                      part of an object. TODO: this design is not
-                                      final and this field is subject to change in
-                                      the future.'
-                                    type: string
-                                  kind:
-                                    description: 'Kind of the referent. More info:
-                                      https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                  name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                  namespace:
-                                    description: 'Namespace of the referent. More
-                                      info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                    type: string
-                                  resourceVersion:
-                                    description: 'Specific resourceVersion to which
-                                      this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                    type: string
-                                  uid:
-                                    description: 'UID of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                    type: string
-                                type: object
-                                x-kubernetes-map-type: atomic
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances
-                            upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of
-                            pods that is unavailable during the upgrade. We will mark
-                            the batch as ready as long as there are less or equal
-                            number of pods unavailable than this number. default =
-                            0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually
-                            exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade
-                            in this batch it can be an absolute number (ex: 5) or
-                            a percentage of total pods we will ignore the percentage
-                            of the last batch to just fill the gap it is mutually
-                            exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout
-                      plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to
-                      interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external
-                        checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http
-                            status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the
-                      same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
-            required:
-            - components
-            type: object
-          status:
-            description: AppStatus defines the observed state of Application
-            properties:
-              appliedResources:
-                description: AppliedResources record the resources that the  workflow
-                  step apply.
-                items:
-                  description: ClusterObjectReference defines the object reference
-                    with cluster.
-                  properties:
-                    apiVersion:
-                      description: API version of the referent.
-                      type: string
-                    cluster:
-                      type: string
-                    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
-                        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
-                  x-kubernetes-map-type: atomic
-                type: array
-              components:
-                description: Components record the related Components created by Application
-                  Controller
-                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. \n 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
-                  x-kubernetes-map-type: atomic
-                type: array
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              latestRevision:
-                description: LatestRevision of the application configuration it generates
-                properties:
-                  name:
-                    type: string
-                  revision:
-                    format: int64
-                    type: integer
-                  revisionHash:
-                    description: RevisionHash record the hash value of the spec of
-                      ApplicationRevision object.
-                    type: string
-                required:
-                - name
-                - revision
-                type: object
-              observedGeneration:
-                description: The generation observed by the application controller.
-                format: int64
-                type: integer
-              policy:
-                description: PolicyStatus records the status of policy Deprecated
-                  This field is only used by EnvBinding Policy which is deprecated.
-                items:
-                  description: PolicyStatus records the status of policy Deprecated
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                    type:
-                      type: string
-                  required:
-                  - name
-                  - type
-                  type: object
-                type: array
-              services:
-                description: Services record the status of the application services
-                items:
-                  description: ApplicationComponentStatus record the health status
-                    of App component
-                  properties:
-                    cluster:
-                      type: string
-                    env:
-                      type: string
-                    healthy:
-                      type: boolean
-                    message:
-                      type: string
-                    name:
-                      type: string
-                    namespace:
-                      type: string
-                    scopes:
-                      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. \n
-                          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
-                        x-kubernetes-map-type: atomic
-                      type: array
-                    traits:
-                      items:
-                        description: ApplicationTraitStatus records the trait health
-                          status
-                        properties:
-                          healthy:
-                            type: boolean
-                          message:
-                            type: string
-                          type:
-                            type: string
-                        required:
-                        - healthy
-                        - type
-                        type: object
-                      type: array
-                    workloadDefinition:
-                      description: WorkloadDefinition is the definition of a WorkloadDefinition,
-                        such as deployments/apps.v1
-                      properties:
-                        apiVersion:
-                          type: string
-                        kind:
-                          type: string
-                      required:
-                      - apiVersion
-                      - kind
-                      type: object
-                  required:
-                  - healthy
-                  - name
-                  type: object
-                type: array
-              status:
-                description: ApplicationPhase is a label for the condition of an application
-                  at the current time
-                type: string
-              workflow:
-                description: Workflow record the status of workflow
-                properties:
-                  appRevision:
-                    type: string
-                  contextBackend:
-                    description: "ObjectReference contains enough information to let
-                      you inspect or modify the referred object. --- New uses of this
-                      type are discouraged because of difficulty describing its usage
-                      when embedded in APIs. 1. Ignored fields.  It includes many
-                      fields which are not generally honored.  For instance, ResourceVersion
-                      and FieldPath are both very rarely valid in actual usage. 2.
-                      Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular
-                      restrictions like, \"must refer only to types A and B\" or \"UID
-                      not honored\" or \"name must be restricted\". Those cannot be
-                      well described when embedded. 3. Inconsistent validation.  Because
-                      the usages are different, the validation rules are different
-                      by usage, which makes it hard for users to predict what will
-                      happen. 4. The fields are both imprecise and overly precise.
-                      \ Kind is not a precise mapping to a URL. This can produce ambiguity
-                      during interpretation and require a REST mapping.  In most cases,
-                      the dependency is on the group,resource tuple and the version
-                      of the actual struct is irrelevant. 5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type will affect numerous schemas.  Don't make new APIs
-                      embed an underspecified API type they do not control. \n 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
-                    x-kubernetes-map-type: atomic
-                  endTime:
-                    format: date-time
-                    nullable: true
-                    type: string
-                  finished:
-                    type: boolean
-                  message:
-                    type: string
-                  mode:
-                    type: string
-                  startTime:
-                    format: date-time
-                    type: string
-                  status:
-                    description: WorkflowRunPhase is a label for the condition of
-                      a WorkflowRun at the current time
-                    type: string
-                  steps:
-                    items:
-                      description: WorkflowStepStatus record the status of a workflow
-                        step, include step status and subStep status
-                      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
-                        name:
-                          type: string
-                        phase:
-                          description: WorkflowStepPhase describes the phase of a
-                            workflow step.
-                          type: string
-                        reason:
-                          description: A brief CamelCase message indicating details
-                            about why the workflowStep is in this state.
-                          type: string
-                        subSteps:
-                          items:
-                            description: StepStatus record the base status of workflow
-                              step, which could be workflow step or subStep
-                            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
-                              name:
-                                type: string
-                              phase:
-                                description: WorkflowStepPhase describes the phase
-                                  of a workflow step.
-                                type: string
-                              reason:
-                                description: A brief CamelCase message indicating
-                                  details about why the workflowStep is in this state.
-                                type: string
-                              type:
-                                type: string
-                            required:
-                            - id
-                            type: object
-                          type: array
-                        type:
-                          type: string
-                      required:
-                      - id
-                      type: object
-                    type: array
-                  suspend:
-                    type: boolean
-                  suspendState:
-                    type: string
-                  terminated:
-                    type: boolean
-                required:
-                - finished
-                - mode
-                - suspend
-                - terminated
-                type: object
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources:
-      status: {}
   - additionalPrinterColumns:
     - jsonPath: .spec.components[*].name
       name: COMPONENT

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

@@ -18,333 +18,6 @@ spec:
     singular: componentdefinition
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.workload.definition.kind
-      name: WORKLOAD-KIND
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: ComponentDefinition is the Schema for the componentdefinitions
-          API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ComponentDefinitionSpec defines the desired state of ComponentDefinition
-            properties:
-              childResourceKinds:
-                description: ChildResourceKinds are the list of GVK of the child resources
-                  this workload generates
-                items:
-                  description: A ChildResourceKind defines a child Kubernetes resource
-                    kind with a selector
-                  properties:
-                    apiVersion:
-                      description: APIVersion of the child resource
-                      type: string
-                    kind:
-                      description: Kind of the child resource
-                      type: string
-                    selector:
-                      additionalProperties:
-                        type: string
-                      description: Selector to select the child resources that the
-                        workload wants to expose to traits
-                      type: object
-                  required:
-                  - apiVersion
-                  - kind
-                  type: object
-                type: array
-              extension:
-                description: Extension is used for extension needs by OAM platform
-                  builders
-                type: object
-                x-kubernetes-preserve-unknown-fields: true
-              podSpecPath:
-                description: PodSpecPath indicates where/if this workload has K8s
-                  podSpec field if one workload has podSpec, trait can do lot's of
-                  assumption such as port, env, volume fields.
-                type: string
-              revisionLabel:
-                description: RevisionLabel indicates which label for underlying resources(e.g.
-                  pods) of this workload can be used by trait to create resource selectors(e.g.
-                  label selector for pods).
-                type: string
-              schematic:
-                description: Schematic defines the data format and template of the
-                  encapsulation of the workload
-                properties:
-                  cue:
-                    description: CUE defines the encapsulation in CUE format
-                    properties:
-                      template:
-                        description: Template defines the abstraction template data
-                          of the capability, it will replace the old CUE template
-                          in extension field. Template is a required field if CUE
-                          is defined in Capability Definition.
-                        type: string
-                    required:
-                    - template
-                    type: object
-                  helm:
-                    description: A Helm represents resources used by a Helm module
-                    properties:
-                      release:
-                        description: Release records a Helm release used by a Helm
-                          module workload.
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                      repository:
-                        description: HelmRelease records a Helm repository used by
-                          a Helm module workload.
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                    required:
-                    - release
-                    - repository
-                    type: object
-                  kube:
-                    description: Kube defines the encapsulation in raw Kubernetes
-                      resource format
-                    properties:
-                      parameters:
-                        description: Parameters defines configurable parameters
-                        items:
-                          description: A KubeParameter defines a configurable parameter
-                            of a component.
-                          properties:
-                            description:
-                              description: Description of this parameter.
-                              type: string
-                            fieldPaths:
-                              description: "FieldPaths specifies an array of fields
-                                within this workload that will be overwritten by the
-                                value of this parameter. \tAll fields must be of the
-                                same type. Fields are specified as JSON field paths
-                                without a leading dot, for example 'spec.replicas'."
-                              items:
-                                type: string
-                              type: array
-                            name:
-                              description: Name of this parameter
-                              type: string
-                            required:
-                              default: false
-                              description: Required specifies whether or not a value
-                                for this parameter must be supplied when authoring
-                                an Application.
-                              type: boolean
-                            type:
-                              description: 'ValueType indicates the type of the parameter
-                                value, and only supports basic data types: string,
-                                number, boolean.'
-                              enum:
-                              - string
-                              - number
-                              - boolean
-                              type: string
-                          required:
-                          - fieldPaths
-                          - name
-                          - type
-                          type: object
-                        type: array
-                      template:
-                        description: Template defines the raw Kubernetes resource
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                    required:
-                    - template
-                    type: object
-                  terraform:
-                    description: Terraform is the struct to describe cloud resources
-                      managed by Hashicorp Terraform
-                    properties:
-                      configuration:
-                        description: Configuration is Terraform Configuration
-                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
-                      path:
-                        description: Path is the sub-directory of remote git repository.
-                          It's valid when remote is set
-                        type: string
-                      providerRef:
-                        description: ProviderReference specifies the reference to
-                          Provider
-                        properties:
-                          name:
-                            description: Name of the referenced object.
-                            type: string
-                          namespace:
-                            default: default
-                            description: Namespace of the referenced object.
-                            type: string
-                        required:
-                        - name
-                        type: object
-                      type:
-                        default: hcl
-                        description: Type specifies which Terraform configuration
-                          it is, HCL or JSON syntax
-                        enum:
-                        - hcl
-                        - 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
-                type: object
-              status:
-                description: Status defines the custom health policy and status message
-                  for workload
-                properties:
-                  customStatus:
-                    description: CustomStatus defines the custom status message that
-                      could display to user
-                    type: string
-                  healthPolicy:
-                    description: HealthPolicy defines the health check policy for
-                      the abstraction
-                    type: string
-                type: object
-              workload:
-                description: Workload is a workload type descriptor
-                properties:
-                  definition:
-                    description: Definition mutually exclusive to workload.type, a
-                      embedded WorkloadDefinition
-                    properties:
-                      apiVersion:
-                        type: string
-                      kind:
-                        type: string
-                    required:
-                    - apiVersion
-                    - kind
-                    type: object
-                  type:
-                    description: Type ref to a WorkloadDefinition via name
-                    type: string
-                type: object
-            required:
-            - workload
-            type: object
-          status:
-            description: ComponentDefinitionStatus is the status of ComponentDefinition
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
-              latestRevision:
-                description: LatestRevision of the component definition
-                properties:
-                  name:
-                    type: string
-                  revision:
-                    format: int64
-                    type: integer
-                  revisionHash:
-                    description: RevisionHash record the hash value of the spec of
-                      ApplicationRevision object.
-                    type: string
-                required:
-                - name
-                - revision
-                type: object
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources:
-      status: {}
   - additionalPrinterColumns:
     - jsonPath: .spec.workload.definition.kind
       name: WORKLOAD-KIND

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

@@ -1,586 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  name: healthscopes.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: HealthScope
-    listKind: HealthScopeList
-    plural: healthscopes
-    singular: healthscope
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .status.health
-      name: HEALTH
-      type: string
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: A HealthScope determines an aggregate health status based of
-          the health of components.
-        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 HealthScopeSpec defines the desired state of a HealthScope.
-            properties:
-              appReferences:
-                description: AppRefs records references of applications' components
-                items:
-                  description: AppReference records references of an application's
-                    components
-                  properties:
-                    appName:
-                      type: string
-                    compReferences:
-                      items:
-                        description: CompReference records references of a component's
-                          resources
-                        properties:
-                          compName:
-                            type: string
-                          traits:
-                            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.
-                                \n 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
-                              x-kubernetes-map-type: atomic
-                            type: array
-                          workload:
-                            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. \n 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
-                            x-kubernetes-map-type: atomic
-                        type: object
-                      type: array
-                  type: object
-                type: array
-              probe-interval:
-                description: ProbeInterval is the amount of time in seconds between
-                  probing tries.
-                format: int32
-                type: integer
-              probe-timeout:
-                description: ProbeTimeout is the amount of time in seconds to wait
-                  when receiving a response before marked failure.
-                format: int32
-                type: integer
-              workloadRefs:
-                description: WorkloadReferences to the workloads that are in this
-                  scope.
-                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. \n 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
-                  x-kubernetes-map-type: atomic
-                type: array
-            required:
-            - workloadRefs
-            type: object
-          status:
-            description: A HealthScopeStatus represents the observed state of a HealthScope.
-            properties:
-              appHealthConditions:
-                description: AppHealthConditions represents health condition of applications
-                  in the scope
-                items:
-                  description: AppHealthCondition represents health condition of an
-                    application
-                  properties:
-                    appName:
-                      type: string
-                    components:
-                      items:
-                        description: WorkloadHealthCondition represents informative
-                          health condition of a workload.
-                        properties:
-                          componentName:
-                            description: ComponentName represents the component name
-                              if target is a workload
-                            type: string
-                          customStatusMsg:
-                            type: string
-                          diagnosis:
-                            type: string
-                          healthStatus:
-                            description: HealthStatus represents health status strings.
-                            type: string
-                          targetWorkload:
-                            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. \n 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
-                            x-kubernetes-map-type: atomic
-                          traits:
-                            items:
-                              description: TraitHealthCondition represents informative
-                                health condition of a trait.
-                              properties:
-                                customStatusMsg:
-                                  type: string
-                                diagnosis:
-                                  type: string
-                                healthStatus:
-                                  description: HealthStatus represents health status
-                                    strings.
-                                  type: string
-                                resource:
-                                  type: string
-                                type:
-                                  type: string
-                              required:
-                              - healthStatus
-                              - resource
-                              - type
-                              type: object
-                            type: array
-                          workloadStatus:
-                            description: WorkloadStatus represents status of workloads
-                              whose HealthStatus is UNKNOWN.
-                            type: string
-                        required:
-                        - healthStatus
-                        type: object
-                      type: array
-                    envName:
-                      type: string
-                  required:
-                  - appName
-                  type: object
-                type: array
-              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
-              healthConditions:
-                description: WorkloadHealthConditions represents health condition
-                  of workloads in the scope Use AppHealthConditions to provide app
-                  level status
-                items:
-                  description: WorkloadHealthCondition represents informative health
-                    condition of a workload.
-                  properties:
-                    componentName:
-                      description: ComponentName represents the component name if
-                        target is a workload
-                      type: string
-                    customStatusMsg:
-                      type: string
-                    diagnosis:
-                      type: string
-                    healthStatus:
-                      description: HealthStatus represents health status strings.
-                      type: string
-                    targetWorkload:
-                      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. \n 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
-                      x-kubernetes-map-type: atomic
-                    traits:
-                      items:
-                        description: TraitHealthCondition represents informative health
-                          condition of a trait.
-                        properties:
-                          customStatusMsg:
-                            type: string
-                          diagnosis:
-                            type: string
-                          healthStatus:
-                            description: HealthStatus represents health status strings.
-                            type: string
-                          resource:
-                            type: string
-                          type:
-                            type: string
-                        required:
-                        - healthStatus
-                        - resource
-                        - type
-                        type: object
-                      type: array
-                    workloadStatus:
-                      description: WorkloadStatus represents status of workloads whose
-                        HealthStatus is UNKNOWN.
-                      type: string
-                  required:
-                  - healthStatus
-                  type: object
-                type: array
-              scopeHealthCondition:
-                description: ScopeHealthCondition represents health condition summary
-                  of the scope
-                properties:
-                  healthStatus:
-                    description: HealthStatus represents health status strings.
-                    type: string
-                  healthyWorkloads:
-                    format: int64
-                    type: integer
-                  total:
-                    format: int64
-                    type: integer
-                  unhealthyWorkloads:
-                    format: int64
-                    type: integer
-                  unknownWorkloads:
-                    format: int64
-                    type: integer
-                required:
-                - healthStatus
-                type: object
-            required:
-            - scopeHealthCondition
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}

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

@@ -18,325 +18,6 @@ spec:
     singular: traitdefinition
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.appliesToWorkloads
-      name: APPLIES-TO
-      type: string
-    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
-      name: DESCRIPTION
-      type: string
-    name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: A TraitDefinition registers a kind of Kubernetes custom resource
-          as a valid OAM trait kind by referencing its CustomResourceDefinition. The
-          CRD is used to validate the schema of the trait when it is embedded in an
-          OAM ApplicationConfiguration.
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: A TraitDefinitionSpec defines the desired state of a TraitDefinition.
-            properties:
-              appliesToWorkloads:
-                description: AppliesToWorkloads specifies the list of workload kinds
-                  this trait applies to. Workload kinds are specified in kind.group/version
-                  format, e.g. server.core.oam.dev/v1alpha2. Traits that omit this
-                  field apply to all workload kinds.
-                items:
-                  type: string
-                type: array
-              conflictsWith:
-                description: 'ConflictsWith specifies the list of traits(CRD name,
-                  Definition name, CRD group) which could not apply to the same workloads
-                  with this trait. Traits that omit this field can work with any other
-                  traits. Example rules: "service" # Trait definition name "services.k8s.io"
-                  # API resource/crd name "*.networking.k8s.io" # API group "labelSelector:foo=bar"
-                  # label selector labelSelector format: https://pkg.go.dev/k8s.io/apimachinery/pkg/labels#Parse'
-                items:
-                  type: string
-                type: array
-              definitionRef:
-                description: Reference to the CustomResourceDefinition that defines
-                  this trait kind.
-                properties:
-                  name:
-                    description: Name of the referenced CustomResourceDefinition.
-                    type: string
-                  version:
-                    description: Version indicate which version should be used if
-                      CRD has multiple versions by default it will use the first one
-                      if not specified
-                    type: string
-                required:
-                - name
-                type: object
-              extension:
-                description: Extension is used for extension needs by OAM platform
-                  builders
-                type: object
-                x-kubernetes-preserve-unknown-fields: true
-              podDisruptive:
-                description: PodDisruptive specifies whether using the trait will
-                  cause the pod to restart or not.
-                type: boolean
-              revisionEnabled:
-                description: Revision indicates whether a trait is aware of component
-                  revision
-                type: boolean
-              schematic:
-                description: Schematic defines the data format and template of the
-                  encapsulation of the trait
-                properties:
-                  cue:
-                    description: CUE defines the encapsulation in CUE format
-                    properties:
-                      template:
-                        description: Template defines the abstraction template data
-                          of the capability, it will replace the old CUE template
-                          in extension field. Template is a required field if CUE
-                          is defined in Capability Definition.
-                        type: string
-                    required:
-                    - template
-                    type: object
-                  helm:
-                    description: A Helm represents resources used by a Helm module
-                    properties:
-                      release:
-                        description: Release records a Helm release used by a Helm
-                          module workload.
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                      repository:
-                        description: HelmRelease records a Helm repository used by
-                          a Helm module workload.
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                    required:
-                    - release
-                    - repository
-                    type: object
-                  kube:
-                    description: Kube defines the encapsulation in raw Kubernetes
-                      resource format
-                    properties:
-                      parameters:
-                        description: Parameters defines configurable parameters
-                        items:
-                          description: A KubeParameter defines a configurable parameter
-                            of a component.
-                          properties:
-                            description:
-                              description: Description of this parameter.
-                              type: string
-                            fieldPaths:
-                              description: "FieldPaths specifies an array of fields
-                                within this workload that will be overwritten by the
-                                value of this parameter. \tAll fields must be of the
-                                same type. Fields are specified as JSON field paths
-                                without a leading dot, for example 'spec.replicas'."
-                              items:
-                                type: string
-                              type: array
-                            name:
-                              description: Name of this parameter
-                              type: string
-                            required:
-                              default: false
-                              description: Required specifies whether or not a value
-                                for this parameter must be supplied when authoring
-                                an Application.
-                              type: boolean
-                            type:
-                              description: 'ValueType indicates the type of the parameter
-                                value, and only supports basic data types: string,
-                                number, boolean.'
-                              enum:
-                              - string
-                              - number
-                              - boolean
-                              type: string
-                          required:
-                          - fieldPaths
-                          - name
-                          - type
-                          type: object
-                        type: array
-                      template:
-                        description: Template defines the raw Kubernetes resource
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                    required:
-                    - template
-                    type: object
-                  terraform:
-                    description: Terraform is the struct to describe cloud resources
-                      managed by Hashicorp Terraform
-                    properties:
-                      configuration:
-                        description: Configuration is Terraform Configuration
-                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
-                      deleteResource:
-                        default: true
-                        description: DeleteResource will determine whether provisioned
-                          cloud resources will be deleted when CR is deleted
-                        type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
-                      path:
-                        description: Path is the sub-directory of remote git repository.
-                          It's valid when remote is set
-                        type: string
-                      providerRef:
-                        description: ProviderReference specifies the reference to
-                          Provider
-                        properties:
-                          name:
-                            description: Name of the referenced object.
-                            type: string
-                          namespace:
-                            default: default
-                            description: Namespace of the referenced object.
-                            type: string
-                        required:
-                        - name
-                        type: object
-                      type:
-                        default: hcl
-                        description: Type specifies which Terraform configuration
-                          it is, HCL or JSON syntax
-                        enum:
-                        - hcl
-                        - 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
-                type: object
-              status:
-                description: Status defines the custom health policy and status message
-                  for trait
-                properties:
-                  customStatus:
-                    description: CustomStatus defines the custom status message that
-                      could display to user
-                    type: string
-                  healthPolicy:
-                    description: HealthPolicy defines the health check policy for
-                      the abstraction
-                    type: string
-                type: object
-              workloadRefPath:
-                description: WorkloadRefPath indicates where/if a trait accepts a
-                  workloadRef object
-                type: string
-            type: object
-          status:
-            description: TraitDefinitionStatus is the status of TraitDefinition
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
-              latestRevision:
-                description: LatestRevision of the trait definition
-                properties:
-                  name:
-                    type: string
-                  revision:
-                    format: int64
-                    type: integer
-                  revisionHash:
-                    description: RevisionHash record the hash value of the spec of
-                      ApplicationRevision object.
-                    type: string
-                required:
-                - name
-                - revision
-                type: object
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources:
-      status: {}
   - additionalPrinterColumns:
     - jsonPath: .spec.appliesToWorkloads
       name: APPLIES-TO

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

@@ -9,117 +9,6 @@ metadata:
     cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "kubevela.fullname" .) | quote }}
   {{- end }}
 webhooks:
-  {{- if eq .Values.OAMSpecVer "all"}}
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1alpha2-applicationconfigurations
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mutating.core.oam.dev.v1alpha2.applicationconfigurations
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applicationconfigurations
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1alpha2-components
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mutating.core.oam-dev.v1alpha2.components
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - components
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
-  {{- end }}
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1beta1-approllout
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mutating.core.oam.dev.v1beta1.approllouts
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - approllouts
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutate-standard-oam-dev-v1alpha1-podspecworkload
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mcontainerized.kb.io
-    sideEffects: None
-    admissionReviewVersions:
-    - v1beta1
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - podspecworkloads
   - clientConfig:
       caBundle: Cg==
       service:

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

@@ -9,92 +9,6 @@ metadata:
     cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "kubevela.fullname" .) | quote }}
   {{- end }}
 webhooks:
-  {{- if eq .Values.OAMSpecVer "all"}}
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1alpha2-applicationconfigurations
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
-    {{- end }}
-    name: validating.core.oam.dev.v1alpha2.applicationconfigurations
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applicationconfigurations
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1alpha2-components
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
-    {{- end }}
-    name: validating.core.oam.dev.v1alpha2.components
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - components
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
-  {{- end }}
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1beta1-approllout
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
-    {{- end }}
-    name: validating.core.oam.dev.v1beta1.approllouts
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - approllouts
-        scope: Namespaced
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    timeoutSeconds: 5
   - clientConfig:
       caBundle: Cg==
       service:
@@ -123,28 +37,6 @@ webhooks:
           - traitdefinitions
         scope: Cluster
     timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validate-standard-oam-dev-v1alpha1-podspecworkload
-    failurePolicy: Fail
-    name: vcontainerized.kb.io
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - podspecworkloads
   - clientConfig:
       caBundle: Cg==
       service:
@@ -197,31 +89,4 @@ webhooks:
           - UPDATE
         resources:
           - componentdefinitions
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1beta1-initializers
-    {{- if .Values.admissionWebhooks.patch.enabled  }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: validating.core.oam-dev.v1beta1.initializers
-    sideEffects: None
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-          - DELETE
-        resources:
-          - initializers
 {{- end -}}

charts/vela-core/templates/defwithtemplate/garbage-collect.yaml

@@ -16,6 +16,8 @@ spec:
         	selector: #ResourcePolicyRuleSelector
         	// +usage=Specify the strategy for target resource to recycle
         	strategy: *"onAppUpdate" | "onAppDelete" | "never"
+        	// +usage=Specify the deletion propagation strategy for target resource to delete
+        	propagation?: "orphan" | "cascading"
         }
 
         #ResourcePolicyRuleSelector: {

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

@@ -82,12 +82,12 @@ spec:
         					pathType: parameter.pathType
         					backend: {
         						if legacyAPI {
-        							serviceName: context.name
+        							serviceName: serviceMetaName
         							servicePort: v
         						}
         						if !legacyAPI {
         							service: {
-        								name: context.name
+        								name: serviceMetaName
         								port: number: v
         							}
         						}

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

@@ -269,13 +269,9 @@ spec:
             - "--optimize-enable-resource-tracker-delete-only-trigger=false"
             {{ end }}
             - "--health-addr=:{{ .Values.healthCheck.port }}"
-            {{ if ne .Values.disableCaps "" }}
-            - "--disable-caps={{ .Values.disableCaps }}"
-            {{ end }}
             - "--system-definition-namespace={{ include "systemDefinitionNamespace" . }}"
             - "--application-revision-limit={{ .Values.applicationRevisionLimit }}"
             - "--definition-revision-limit={{ .Values.definitionRevisionLimit }}"
-            - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
             {{ if .Values.multicluster.enabled }}
             - "--enable-cluster-gateway"
             {{ if .Values.multicluster.clusterGateway.direct }}
@@ -297,7 +293,6 @@ spec:
             - "--max-workflow-step-error-retry-times={{ .Values.workflow.step.errorRetryTimes }}"
             - "--feature-gates=EnableSuspendOnFailure={{- .Values.workflow.enableSuspendOnFailure | toString -}}"
             - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
-            - "--feature-gates=LegacyComponentRevision={{- .Values.featureGates.enableLegacyComponentRevision | toString -}}"
             - "--feature-gates=GzipResourceTracker={{- .Values.featureGates.gzipResourceTracker | toString -}}"
             - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
             - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
@@ -338,14 +333,20 @@ spec:
             httpGet:
               path: /readyz
               port: healthz
-            initialDelaySeconds: 30
-            periodSeconds: 5
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           livenessProbe:
             httpGet:
               path: /healthz
               port: healthz
-            initialDelaySeconds: 90
-            periodSeconds: 5
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
           volumeMounts:
             - mountPath: {{ .Values.admissionWebhooks.certificate.mountPath }}
               name: tls-cert-vol

charts/vela-core/templates/velaql/component-pod.yaml

@@ -55,13 +55,13 @@ data:
               phase: pod.object.status.phase
               // refer to https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
               if phase != "Pending" && phase != "Unknown" {
-                if pod.object.podIP != _|_ {
+                if pod.object.status.podIP != _|_ {
                   podIP: pod.object.status.podIP
                 }
-                if pod.object.hostIP != _|_ {
+                if pod.object.status.hostIP != _|_ {
                   hostIP: pod.object.status.hostIP
                 }
-                if pod.object.nodeName != _|_ {
+                if pod.object.spec.nodeName != _|_ {
                   nodeName: pod.object.spec.nodeName
                 }
               }

charts/vela-core/templates/velaql/resourceTree.yaml

@@ -14,6 +14,7 @@ data:
         name?:      string
         cluster?:   string
         clusterNs?: string
+        queryNewest?: bool
     }
     response: ql.#GetApplicationTree & {
         app: {
@@ -29,6 +30,9 @@ data:
                 if parameter.name != _|_ {
                     components: [parameter.name]
                 }
+                if parameter.queryNewest != _|_ {
+                    queryNewest: parameter.queryNewest
+                }
             }
         }
     }

charts/vela-core/values.yaml

@@ -20,15 +20,6 @@ concurrentReconciles: 4
 controllerArgs:
   reSyncPeriod: 5m
 
-## @param OAMSpecVer OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.3"
-
-## @param disableCaps Disable capability
-disableCaps: "all"
-
-## @param dependCheckWait dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready
-dependCheckWait: 30s
-
 
 ## @section KubeVela workflow parameters
 
@@ -83,6 +74,21 @@ webhookService:
 healthCheck:
   port: 9440
 
+## @skip readinessProbe
+readinessProbe:
+  failureThreshold: 3
+  initialDelaySeconds: 30
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
+## @skip livenessProbe
+livenessProbe:
+  failureThreshold: 3
+  initialDelaySeconds: 90
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
+
 ## @section KubeVela controller optimization parameters
 ##@param optimize.cachedGvks Optimize types of resources to be cached.
 ##@param optimize.markWithProb Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately.
@@ -100,7 +106,6 @@ optimize:
   disableResourceApplyDoubleCheck: false
   enableResourceTrackerDeleteOnlyTrigger: true
 
-##@param featureGates.enableLegacyComponentRevision if disabled, only component with rollout trait will create component revisions
 ##@param featureGates.gzipResourceTracker compress ResourceTracker using gzip (good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers.
 ##@param featureGates.zstdResourceTracker compress ResourceTracker using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers. Note that zstd will be prioritized if you enable other compression options.
 ##@param featureGates.applyOnce if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker
@@ -116,7 +121,6 @@ optimize:
 ##@param featureGates.disableWorkflowContextConfigMapCache disable the workflow context's configmap informer cache
 ##@param
 featureGates:
-  enableLegacyComponentRevision: false
   gzipResourceTracker: false
   zstdResourceTracker: true
   applyOnce: false

cmd/core/app/options/options.go

@@ -49,7 +49,6 @@ type CoreOptions struct {
 	LogDebug                   bool
 	ControllerArgs             *oamcontroller.Args
 	HealthAddr                 string
-	DisableCaps                string
 	StorageDriver              string
 	InformerSyncPeriod         time.Duration
 	QPS                        float64
@@ -80,17 +79,13 @@ func NewCoreOptions() *CoreOptions {
 			RevisionLimit:                                50,
 			AppRevisionLimit:                             10,
 			DefRevisionLimit:                             20,
-			CustomRevisionHookURL:                        "",
 			AutoGenWorkloadDefinition:                    true,
 			ConcurrentReconciles:                         4,
-			DependCheckWait:                              30 * time.Second,
-			OAMSpecVer:                                   "v0.3",
 			EnableCompatibility:                          false,
 			IgnoreAppWithoutControllerRequirement:        false,
 			IgnoreDefinitionWithoutControllerRequirement: false,
 		},
 		HealthAddr:                 ":9440",
-		DisableCaps:                "all",
 		StorageDriver:              "Local",
 		InformerSyncPeriod:         10 * time.Hour,
 		QPS:                        50,
@@ -124,7 +119,6 @@ func (s *CoreOptions) Flags() cliflag.NamedFlagSets {
 	gfs.Uint64Var(&s.LogFileMaxSize, "log-file-max-size", s.LogFileMaxSize, "Defines the maximum size a log file can grow to, Unit is megabytes.")
 	gfs.BoolVar(&s.LogDebug, "log-debug", s.LogDebug, "Enable debug logs for development purpose")
 	gfs.StringVar(&s.HealthAddr, "health-addr", s.HealthAddr, "The address the health endpoint binds to.")
-	gfs.StringVar(&s.DisableCaps, "disable-caps", s.DisableCaps, "To be disabled builtin capability list.")
 	gfs.DurationVar(&s.InformerSyncPeriod, "informer-sync-period", s.InformerSyncPeriod,
 		"The re-sync period for informer in controller-runtime. This is a system-level configuration.")
 	gfs.Float64Var(&s.QPS, "kube-api-qps", s.QPS, "the qps for reconcile clients. Low qps may lead to low throughput. High qps may give stress to api-server. Raise this value if concurrent-reconciles is set to be high.")
@@ -159,7 +153,7 @@ func (s *CoreOptions) Flags() cliflag.NamedFlagSets {
 
 	wfs := fss.FlagSet("wfTypes")
 	wfs.IntVar(&wfTypes.MaxWorkflowWaitBackoffTime, "max-workflow-wait-backoff-time", 60, "Set the max workflow wait backoff time, default is 60")
-	wfs.IntVar(&wfTypes.MaxWorkflowFailedBackoffTime, "max-workflow-failed-backoff-time", 300, "Set the max workflow wait backoff time, default is 300")
+	wfs.IntVar(&wfTypes.MaxWorkflowFailedBackoffTime, "max-workflow-failed-backoff-time", 300, "Set the max workflow failed backoff time, default is 300")
 	wfs.IntVar(&wfTypes.MaxWorkflowStepErrorRetryTimes, "max-workflow-step-error-retry-times", 10, "Set the max workflow step error retry times, default is 10")
 
 	pkgmulticluster.AddFlags(fss.FlagSet("multicluster"))

cmd/core/app/options/options_test.go

@@ -39,7 +39,6 @@ func TestCoreOptions_Flags(t *testing.T) {
 	args := []string{
 		"--application-re-sync-period=5s",
 		"--cluster-metrics-interval=5s",
-		"--disable-caps=true",
 		"--enable-cluster-gateway=true",
 		"--enable-cluster-metrics=true",
 		"--enable-leader-election=true",
@@ -83,7 +82,6 @@ func TestCoreOptions_Flags(t *testing.T) {
 		LogDebug:                   true,
 		ControllerArgs:             &oamcontroller.Args{},
 		HealthAddr:                 "/healthz",
-		DisableCaps:                "true",
 		StorageDriver:              "",
 		InformerSyncPeriod:         3 * time.Second,
 		QPS:                        200,

cmd/core/app/server.go

@@ -45,11 +45,9 @@ import (
 	"github.com/oam-dev/kubevela/cmd/core/app/options"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	"github.com/oam-dev/kubevela/pkg/cache"
-	standardcontroller "github.com/oam-dev/kubevela/pkg/controller"
 	commonconfig "github.com/oam-dev/kubevela/pkg/controller/common"
-	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2"
-	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2/application"
-	"github.com/oam-dev/kubevela/pkg/controller/utils"
+	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1beta1"
+	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1beta1/application"
 	"github.com/oam-dev/kubevela/pkg/features"
 	"github.com/oam-dev/kubevela/pkg/monitor/watcher"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
@@ -87,17 +85,12 @@ func NewCoreCommand() *cobra.Command {
 	meta.Name = types.VelaCoreName
 
 	klog.InfoS("KubeVela information", "version", version.VelaVersion, "revision", version.GitRevision)
-	klog.InfoS("Disable capabilities", "name", s.DisableCaps)
 	klog.InfoS("Vela-Core init", "definition namespace", oam.SystemDefinitionNamespace)
 
 	return cmd
 }
 
 func run(ctx context.Context, s *options.CoreOptions) error {
-	klog.InfoS("KubeVela information", "version", version.VelaVersion, "revision", version.GitRevision)
-	klog.InfoS("Disable capabilities", "name", s.DisableCaps)
-	klog.InfoS("Vela-Core init", "definition namespace", oam.SystemDefinitionNamespace)
-
 	restConfig := ctrl.GetConfigOrDie()
 	restConfig.UserAgent = types.KubeVelaName + "/" + version.GitRevision
 	restConfig.QPS = float32(s.QPS)
@@ -171,11 +164,6 @@ func run(ctx context.Context, s *options.CoreOptions) error {
 		return err
 	}
 
-	if err := utils.CheckDisabledCapabilities(s.DisableCaps); err != nil {
-		klog.ErrorS(err, "Unable to get enabled capabilities")
-		return err
-	}
-
 	pd, err := packages.NewPackageDiscover(mgr.GetConfig())
 	if err != nil {
 		klog.Error(err, "Failed to create CRD discovery for CUE package client")
@@ -247,11 +235,6 @@ func prepareRun(ctx context.Context, mgr manager.Manager, s *options.CoreOptions
 		return err
 	}
 
-	if err := standardcontroller.Setup(mgr, s.DisableCaps, *s.ControllerArgs); err != nil {
-		klog.ErrorS(err, "Unable to setup the vela core controller")
-		return err
-	}
-
 	if err := multicluster.InitClusterInfo(mgr.GetConfig()); err != nil {
 		klog.ErrorS(err, "Init control plane cluster info")
 		return err

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

@@ -14,12 +14,10 @@
 |       revision-limit        |  int   |                50                 | revision-limit is the maximum number of revisions that will be maintained. The default value is 50. |
 | application-revision-limit  |  int   |                10                 | application-revision-limit is the maximum number of application useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 10. |
 |  definition-revision-limit  |  int   |                20                 | definition-revision-limit is the maximum number of component/trait definition useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 20. |
-|  custom-revision-hook-url   | string |                ""                 | custom-revision-hook-url is a webhook url which will let KubeVela core to call with applicationConfiguration and component info and return a customized component revision |
 |    app-config-installed     |  bool  |               true                | app-config-installed indicates if applicationConfiguration CRD is installed |
 | autogen-workload-definition |  bool  |               true                | Automatic generated workloadDefinition which componentDefinition refers to |
 |         health-addr         | string |               :9440               |          The address the health endpoint binds to.           |
 |       apply-once-only       | string |               false               | For the purpose of some production environment that workload or trait should not be affected if no spec change, available options: on, off, force. |
-|        disable-caps         | string |                ""                 |           To be disabled builtin capability list.            |
 |       storage-driver        | string |               Local               |         Application file save to the storage driver          |
 | application-re-sync-period  |  time  |                5m                 | Re-sync period for application to re-sync, also known as the state-keep interval. |
 |      reconcile-timeout      |  time  |                3m                 |           The timeout for controller reconcile.              |

docs/examples/helm-module/scaler-td.yaml

@@ -1,4 +1,4 @@
-apiVersion: core.oam.dev/v1alpha2
+apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:

docs/examples/terraform/cloud-resource-provision-and-consume/ComponentDefinition-alibaba-oss.yaml

@@ -1,4 +1,4 @@
-apiVersion: core.oam.dev/v1alpha2
+apiVersion: core.oam.dev/v1beta1
 kind: ComponentDefinition
 metadata:
   name: alibaba-oss

docs/examples/workflow-with-ocm/README.md

@@ -1,118 +0,0 @@
-# WorkFlow with OCM
-
-In this tutorial, you will create an ack cluster as a production environment and deploy the configured app
-to this production environment.
-
-## Prerequisites
-
-- In order to follow the guide, you will need a Kubernetes cluster version 1.20+ as control-plane cluster, and 
-the cluster's APIServer has an external IP.
-
-- Store the AK/AS of Alibaba Cloud to the Secret. 
-
-    ```shell
-    export ALICLOUD_ACCESS_KEY=xxx; export ALICLOUD_SECRET_KEY=yyy
-    ```
-    
-    ```shell
-    # If you'd like to use Alicloud Security Token Service, also export `ALICLOUD_SECURITY_TOKEN`.
-    export ALICLOUD_SECURITY_TOKEN=zzz
-    ```
-    
-    ```shell
-    sh hack/prepare-alibaba-credentials.sh
-    ```
-    
-    ```shell
-    $ kubectl get secret -n vela-system
-    NAME                                         TYPE                                  DATA   AGE
-    alibaba-account-creds                        Opaque                                1      11s
-    ```
-
-- Install Definitions
-   ```shell
-   kubectl apply -f definitions
-   ```
-
-## Create Initializer terraform-alibaba
-
-Initializer terraform-alibaba will create an environment which allows users use terraform to create cloud resource on aliyun.
-
-```shell
-kubectl apply -f initializers/init-terraform-alibaba.yaml
-```
-
-It will take few minutes to wait the `PHASE` of Initializer `terraform-alibaba` to be `success`.
-
-```shell
-$ kubectl get initializers.core.oam.dev -n vela-system
-NAMESPACE     NAME                  PHASE     AGE
-vela-system   terraform-alibaba     success   94s
-```
-
-## Create Initializer managed-cluster
-
-Initializer managed-cluster can create an ack cluster and use OCM to manage the cluster.
-
-1. You should set the `hubAPIServer` to the public network address in `init-managed-cluster.yaml`
-```yaml
-# init-managed-cluster.yaml
-- name: register-ack
-   type: register-cluster
-   inputs:
-    ...
-   properties:
-     # user should set public network address of your control-plane cluster APIServer
-     hubAPIServer: {{ public network address of APIServer }}
-```
-
-2. Apply the Initializer managed-cluster
-```shell
-kubectl apply -f initializers/init-managed-cluster.yaml
-```
-
-It will take 15 to 20 minutes to create an ack cluster, please wait until the status of `managed-cluster` to be `success`. 
-
-```shell
-$ kubectl get initializers.core.oam.dev -n vela-system
-NAMESPACE     NAME                  PHASE     AGE
-vela-system   managed-cluster       success   45m
-```
-
-3. Check the new ack cluster has been registered
-
-```shell
-$ kubectl get managedclusters.cluster.open-cluster-management.io
-NAME     HUB ACCEPTED   MANAGED CLUSTER URLS         JOINED   AVAILABLE   AGE
-poc-01   true          {{ APIServer address }}       True     True        30s
-```
-
-
-## Deploy the resource to ack cluster
-
-install trait `expose` from default capability center.
-
-```shell
-vela cap install default-cap-center/expose
-```
-
-```shell
-kubectl apply -f app.yaml
-```
-
-check the app `workflow-demo` was created successfully
-
-```shell
-$ kubectl get app workflow-demo
-NAME            COMPONENT         TYPE         PHASE     HEALTHY   STATUS   AGE
-workflow-demo   podinfo-server    webservice   running   true               7s
-```
-
-use kubectl connect to the managed-cluster `poc-01` and check the resources in the app 
-are successfully deployed to the cluster `poc-01`.
-
-```shell
-$ kubectl get deployments
-NAME             READY   UP-TO-DATE   AVAILABLE   AGE
-podinfo-server   1/1     1            1           40s
-```

docs/examples/workflow-with-ocm/app.yaml

@@ -1,48 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-demo
-  namespace: default
-spec:
-  components:
-    - name: podinfo-server
-      type: webservice
-      properties:
-        image: stefanprodan/podinfo:5.2.1
-        port: 9898
-      traits:
-        - type: expose
-          properties:
-            port: [9898]
-
-  policies:
-    - name: prod-env
-      type: env-binding
-      properties:
-        engine: ocm
-        envs:
-          - name: prod
-            patch:
-              components:
-                - name: podinfo-server
-                  type: webservice
-                  properties:
-                    image: stefanprodan/podinfo:6.0.0
-                    port: 9898
-                  traits:
-                    - type: expose
-                      properties:
-                        port: [9898]
-                        type: LoadBalancer
-            placement:
-              clusterSelector:
-                labels:
-                  purpose: test
-
-  workflow:
-    steps:
-      - name: deploy-server
-        type: mutil-env
-        properties:
-          env:       prod
-          policy:    prod-env

docs/examples/workflow-with-ocm/definitions/create-ack.yaml

@@ -1,57 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  name: create-ack
-  namespace: vela-system
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/base64"
-        )
-
-        configuration: op.#Load & {
-        	component: parameter.component
-        }
-
-        apply: op.#Apply & {
-        	value: {
-        		configuration.value.workload
-        	}
-        }
-
-        wait: op.#ConditionalWait & {
-        	continue: apply.value.status.state == "Available"
-        }
-
-        secretName:      apply.value.spec.writeConnectionSecretToRef.name
-        secretNamespace: apply.value.spec.writeConnectionSecretToRef.namespace
-
-        ackConn: op.#Read & {
-        	value: {
-        		apiVersion: "v1"
-        		kind:       "Secret"
-        		metadata: {
-        			name:      secretName
-        			namespace: secretNamespace
-        		}
-        	}
-        }
-
-        parameter: {
-        	component: string
-        }
-
-        connInfo: {
-        	clusterName:      base64.Decode(null, ackConn.value.data["name"])
-        	clusterCACert:    base64.Decode(null, ackConn.value.data["cluster_ca_cert"])
-        	clientCert:       base64.Decode(null, ackConn.value.data["client_cert"])
-        	clientKey:        base64.Decode(null, ackConn.value.data["client_key"])
-        	clusterAPIServer: base64.Decode(null, ackConn.value.data["api_server_internet"])
-        }
-
-
-
-

docs/examples/workflow-with-ocm/definitions/register-cluster.yaml

@@ -1,191 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  name: register-cluster
-  namespace: vela-system
-spec:
-  schematic:
-    cue:
-      template: |
-        import ("vela/op")
-
-        clusterrole: op.#Apply & {
-        	value: {
-        		apiVersion: "rbac.authorization.k8s.io/v1"
-        		kind:       "ClusterRole"
-        		metadata: {
-        			name: "cluster-register"
-        		}
-        		rules: [{
-        			apiGroups: [""]
-        			resources: ["configmaps", "namespaces", "serviceaccounts", "services", "secrets"]
-        			verbs: ["create", "get", "list", "update", "watch", "patch", "delete"]
-        		}, {
-        			apiGroups: ["", "events.k8s.io"]
-        			resources: ["events"]
-        			verbs: ["create", "update", "patch"]
-        		}, {
-        			apiGroups: ["rbac.authorization.k8s.io"]
-        			resources: ["clusterrolebindings", "rolebindings"]
-        			verbs: ["create", "get", "list", "update", "watch", "patch", "delete"]
-        		}, {
-        			apiGroups: ["rbac.authorization.k8s.io"]
-        			resources: ["clusterroles", "roles"]
-        			verbs: ["create", "get", "list", "update", "watch", "patch", "delete", "escalate", "bind"]
-        		}, {
-        			apiGroups: ["rbac.authorization.k8s.io"]
-        			resources: ["clusterroles", "roles"]
-        			verbs: ["create", "get", "list", "update", "watch", "patch", "delete", "escalate", "bind"]
-        		}, {
-        			apiGroups: ["certificates.k8s.io"]
-        			resources: ["certificatesigningrequests"]
-        			verbs: ["create", "get", "list", "watch"]
-        		}, {
-        			apiGroups: ["certificates.k8s.io"]
-        			resources: ["certificatesigningrequests/approval"]
-        			verbs: ["update"]
-        		}, {
-        			apiGroups: ["certificates.k8s.io"]
-        			resources: ["signers"]
-        			resourceNames: ["kubernetes.io/*"]
-        			verbs: ["approve"]
-        		}, {
-        			apiGroups: ["cluster.open-cluster-management.io"]
-        			resources: ["managedclusters"]
-        			verbs: ["create", "get", "list", "update", "watch", "delete"]
-        		}, {
-        			apiGroups: ["register.open-cluster-management.io"]
-        			resources: ["managedclusters", "managedclusters/accept"]
-        			verbs: ["create", "get", "list", "update", "watch", "delete"]
-        		}]
-        	}
-        }
-
-        serviceaccount: op.#Apply & {
-        	value: {
-        		apiVersion: "v1"
-        		kind:       "ServiceAccount"
-        		metadata: {
-        			name:      "cluster-register"
-        			namespace: "default"
-        		}
-        	}
-        }
-
-        rolebinding: op.#Apply & {
-        	value: {
-        		apiVersion: "rbac.authorization.k8s.io/v1"
-        		kind:       "ClusterRoleBinding"
-        		metadata: {
-        			name: "cluster-register"
-        		}
-        		roleRef: {
-        			apiGroup: "rbac.authorization.k8s.io"
-        			kind:     "ClusterRole"
-        			name:     "cluster-register"
-        		}
-        		subjects: [{
-        			kind:      "ServiceAccount"
-        			name:      "cluster-register"
-        			namespace: "default"
-        		}]
-        	}
-        }
-
-        register: op.#Apply & {
-        	value: {
-        		apiVersion: "batch/v1"
-        		kind:       "Job"
-        		metadata: {
-        			name:      "cluster-register"
-        			namespace: "default"
-        		}
-        		spec: {
-        			template: {
-        				spec: {
-        					containers: [{
-        						name:            "cluster-register"
-        						image:           "oamdev/cluster-register:v1.0"
-        						imagePullPolicy: "Always"
-        						command: [
-        							"/app", "--cluster-name=" + "\(parameter.connInfo.clusterName)",
-        							"--hub-api-server=" + "\(parameter.hubAPIServer)",
-        							"--cluster-ca-cert=" + "\(parameter.connInfo.clusterCACert)",
-        							"--client-cert=" + "\(parameter.connInfo.clientCert)",
-        							"--client-key=" + "\(parameter.connInfo.clientKey)",
-        							"--api-server-internet=" + "\(parameter.connInfo.clusterAPIServer)",
-        							"--kube-config=" + "\(parameter.connInfo.kubeConfig)",
-        						]
-        					}]
-        					restartPolicy:      "OnFailure"
-        					serviceAccountName: "cluster-register"
-        				}
-        			}
-        		}
-        	}
-        }
-
-        wait: op.#ConditionalWait & {
-        	continue: register.value.status.succeeded == 1
-        }
-
-        clusterSet: op.#Apply & {
-        	value: {
-        		apiVersion: "cluster.open-cluster-management.io/v1alpha1"
-        		kind:       "ManagedClusterSet"
-        		metadata: name: parameter.env
-        	}
-        }
-
-        clusterSetBinding: op.#Apply & {
-        	value: {
-        		apiVersion: "cluster.open-cluster-management.io/v1alpha1"
-        		kind:       "ManagedClusterSetBinding"
-        		metadata: {
-        			name:      parameter.env
-        			namespace: parameter.initNameSpace
-        		}
-        		spec: clusterSet: parameter.env
-        	}
-        }
-
-        managedCluster: op.#Read & {
-        	value: {
-        		apiVersion: "cluster.open-cluster-management.io/v1"
-        		kind:       "ManagedCluster"
-        		metadata: {
-        			name: parameter.connInfo.clusterName
-        		}
-        	}
-        }
-
-        patchManagedCluster: op.#Apply & {
-        	value: {
-        		managedCluster.value
-        		metadata: labels: {
-        			"cluster.open-cluster-management.io/clusterset": parameter.env
-        		}
-        		metadata: labels: parameter.patchLabels
-        	}
-        }
-
-        parameter: {
-        	env:           string
-        	initNameSpace: *"default" | string
-        	patchLabels: [string]: string
-        	hubAPIServer: *"" | string
-        	connInfo: {
-        		clusterName:      string
-        		clusterCACert:    *"" | string
-        		clientCert:       *"" | string
-        		clientKey:        *"" | string
-        		clusterAPIServer: *"" | string
-        		kubeConfig:       *"" | string
-        	}
-        }
-
-
-
-
-
-

docs/examples/workflow-with-ocm/hack/prepare-alibaba-credentials.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "accessKeyID: ${ALICLOUD_ACCESS_KEY}\naccessKeySecret: ${ALICLOUD_SECRET_KEY}\nsecurityToken: ${ALICLOUD_SECURITY_TOKEN}" > alibaba-credentials.conf
-kubectl create namespace vela-system
-kubectl create secret generic alibaba-account-creds -n vela-system --from-file=credentials=alibaba-credentials.conf
-rm -f alibaba-credentials.conf

docs/examples/workflow-with-ocm/initializers/init-managed-cluster.yaml

@@ -1,48 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  name: managed-cluster
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-        - name: ack-worker
-          type: alibaba-ack
-          properties:
-            writeConnectionSecretToRef:
-              name: ack-conn
-              namespace: vela-system
-      workflow:
-        steps:
-          - name: terraform-ack
-            type: create-ack
-            properties:
-              component: ack-worker
-            outputs:
-              - name: connInfo
-                valueFrom: connInfo
-
-          - name: register-ack
-            type: register-cluster
-            inputs:
-              - from: connInfo
-                parameterKey: connInfo
-            properties:
-              # user should set public network address of APIServer
-              hubAPIServer: {{ public network address of APIServer }}
-              env: prod
-              initNameSpace: default
-              patchLabels:
-                purpose: test
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: terraform-alibaba
-        namespace: vela-system
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: ocm-cluster-manager
-        namespace: vela-system

docs/examples/workflow-with-ocm/initializers/init-terraform-alibaba.yaml

@@ -1,31 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  name: terraform-alibaba
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-        - name: default
-          type: raw
-          properties:
-            apiVersion: terraform.core.oam.dev/v1beta1
-            kind: Provider
-            metadata:
-              namespace: default
-            spec:
-              provider: alibaba
-              region: cn-hongkong
-              credentials:
-                source: Secret
-                secretRef:
-                  namespace: vela-system
-                  name: alibaba-account-creds
-                  key: credentials
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: terraform
-        namespace: vela-system

docs/examples/workflow-with-ocm/rollout/README.md

@@ -1,119 +0,0 @@
-# Rollout with OCM
-
-In this tutorial, you will use rollout in runtime cluster with OCM.
-
-## Prerequisites
-
-- Have a multi-cluster environment witch have installed OCM by following this [guide](../README.md). The name of  managed cluster generally is `poc-01`.
-
-- Install vela-rollout chart in managed-cluster with Helm.
-```shell
-$ helm repo add kubevela https://charts.kubevela.net/core
-```
-```shell
-$ helm install vela-rollout  --create-namespace -n vela-system kubevela/vela-rollout
-```
-
-## Install workflowStepDefinition
-
-Apply workflowStepDefinitions in control-plane cluster.
-
-```shell
-$ kubectl apply -f dispatchRevDef.yaml
-```
-
-```shell
-$ kubectl apply -f dispatchTraits.yaml
-```
-
-## Deploy and rollout
-
-1. Apply application in control-plane cluster.
-
-```shell
-$ kubectl apply -f app-first-scale.yaml
-```
-
-Wait a few minutes, check rollout and workload status in managed cluster.
-```shell
-$ kubectl get rollout
-NAME           TARGET   UPGRADED   READY   BATCH-STATE   ROLLING-STATE    AGE
-nginx-server   2        2          2       batchReady    rolloutSucceed   25h
-```
-```shell
-$ kubectl get deploy
-NAME              READY   UP-TO-DATE   AVAILABLE   AGE
-nginx-server-v1   2/2     2            2           25h
-```
-
-2. Update application to v2.
-
-```shell
-$ kubectl apply -f app-update-v2.yaml
-```
-
-check rollout and workload status.
-```shell
-$ kubectl get rollout
-NAME           TARGET   UPGRADED   READY   BATCH-STATE   ROLLING-STATE    AGE
-nginx-server   2        2          2       batchReady    rolloutSucceed   25h
-```
-```shell
-$ kubectl get deploy
-NAME              READY   UP-TO-DATE   AVAILABLE   AGE
-nginx-server-v2   2/2     2            2           25h
-```
-
-3. Scale up.
-
-```shell
-$ kubectl apply -f app-v2-scale.yaml
-```
-
-check the status of rollout and workload.
-```shell
-$ kubectl get rollout
-NAME           TARGET   UPGRADED   READY   BATCH-STATE   ROLLING-STATE    AGE
-nginx-server   4        4          4       batchReady    rolloutSucceed   25h
-```
-```shell
-$ kubectl get deploy
-NAME              READY   UP-TO-DATE   AVAILABLE   AGE
-nginx-server-v2   4/4     4            4           25h
-```
-
-4. Roll back to v1.
-```shell
-$ kubectl apply -f app-revert.yaml
-```
-
-check rollout and workload status.
-```shell
-$ kubectl get rollout
-NAME           TARGET   UPGRADED   READY   BATCH-STATE   ROLLING-STATE    AGE
-nginx-server   4        4          4       batchReady    rolloutSucceed   25h
-```
-
-```shell
-$ kubectl get deploy
-NAME              READY   UP-TO-DATE   AVAILABLE   AGE
-nginx-server-v1   4/4     4            4           25h
-```
-
-5. Scale down.
-```shell
-$ kubectl apply -f app-scale-down-v1.yaml
-```
-
-check rollout and workload status.
-```shell
-$ kubectl get rollout
-NAME           TARGET   UPGRADED   READY   BATCH-STATE   ROLLING-STATE    AGE
-nginx-server   2        2          2       batchReady    rolloutSucceed   25h
-```
-
-```shell
-$ kubectl get deploy
-NAME              READY   UP-TO-DATE   AVAILABLE   AGE
-nginx-server-v1   2/2     2            2           25h
-```

docs/examples/workflow-with-ocm/rollout/app-first-scale.yaml

@@ -1,36 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-rollout-demo
-  namespace: default
-spec:
-  components:
-    - name: nginx-server
-      externalRevision: nginx-server-v1
-      type: webservice
-      properties:
-        image: nginx:1.20.0
-        port: 80
-      traits:
-        - type: rollout
-          properties:
-            targetRevision: nginx-server-v1
-            targetSize: 2
-            # Rollout the two replicas in two batches
-            rolloutBatches:
-              - replicas: 1
-              - replicas: 1
-
-  workflow:
-    steps:
-      - name: dispatch-comp-rev-v1
-        type: dispatch-comp-rev
-        properties:
-           compRev: nginx-server-v1
-           cluster: poc-01
-
-      - name: dispatchRollout
-        type: dispatch-traits
-        properties:
-          component: nginx-server
-          cluster: poc-01

docs/examples/workflow-with-ocm/rollout/app-revert.yaml

@@ -1,41 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-rollout-demo
-  namespace: default
-spec:
-  components:
-    - name: nginx-server
-      externalRevision: nginx-server-v2
-      type: webservice
-      properties:
-        image: nginx:1.21
-        port: 80
-      traits:
-        - type: rollout
-          properties:
-            targetRevision: nginx-server-v1
-            targetSize: 4
-            rolloutBatches:
-              - replicas: 2
-              - replicas: 2
-
-  workflow:
-    steps:
-      - name: dispatch-comp-rev-v1
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v1
-          cluster: poc-01
-
-      - name: dispatch-comp-rev-v2
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v2
-          cluster: poc-01
-
-      - name: dispatchRollout
-        type: dispatch-traits
-        properties:
-          component: nginx-server
-          cluster: poc-01

docs/examples/workflow-with-ocm/rollout/app-scale-down-v1.yaml

@@ -1,41 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-rollout-demo
-  namespace: default
-spec:
-  components:
-    - name: nginx-server
-      externalRevision: nginx-server-v2
-      type: webservice
-      properties:
-        image: nginx:1.21
-        port: 80
-      traits:
-        - type: rollout
-          properties:
-            targetRevision: nginx-server-v1
-            targetSize: 2
-            rolloutBatches:
-              - replicas: 1
-              - replicas: 1
-
-  workflow:
-    steps:
-      - name: dispatch-comp-rev-v1
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v1
-          cluster: cluster2
-
-      - name: dispatch-comp-rev-v2
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v2
-          cluster: cluster2
-
-      - name: dispatchRollout
-        type: dispatch-traits
-        properties:
-          component: nginx-server
-          cluster: cluster2

docs/examples/workflow-with-ocm/rollout/app-update-v2.yaml

@@ -1,43 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-rollout-demo
-  namespace: default
-spec:
-  components:
-    - name: nginx-server
-      externalRevision: nginx-server-v2
-      type: webservice
-      properties:
-        image: nginx:1.21
-        port: 80
-      traits:
-        - type: rollout
-          properties:
-            targetRevision: nginx-server-v2
-            targetSize: 2
-            # Upgrade the replicas in two batches. Each batch will upgrade only one.
-            rolloutBatches:
-              - replicas: 1
-              - replicas: 1
-
-  workflow:
-    steps:
-      # If we delete this, the ManifestWork will also be removed in managed cluster, which would prohibits us to do rollback later.
-      - name: dispatch-comp-rev-v1
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v1
-          cluster: poc-01
-
-      - name: dispatch-comp-rev-v2
-        type: dispatch-comp-rev
-        properties:
-           compRev: nginx-server-v2
-           cluster: poc-01
-
-      - name: dispatchRollout
-        type: dispatch-traits
-        properties:
-          component: nginx-server
-          cluster: poc-01

docs/examples/workflow-with-ocm/rollout/app-v2-scale.yaml

@@ -1,42 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: workflow-rollout-demo
-  namespace: default
-spec:
-  components:
-    - name: nginx-server
-      externalRevision: nginx-server-v2
-      type: webservice
-      properties:
-        image: nginx:1.21
-        port: 80
-      traits:
-        - type: rollout
-          properties:
-            targetRevision: nginx-server-v2
-            targetSize: 4
-            # This means to rollout two more replicas in two batches.
-            rolloutBatches:
-              - replicas: 1
-              - replicas: 1
-
-  workflow:
-    steps:
-      - name: dispatch-comp-rev-v1
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v1
-          cluster: poc-01
-
-      - name: dispatch-comp-rev-v2
-        type: dispatch-comp-rev
-        properties:
-          compRev: nginx-server-v2
-          cluster: poc-01
-
-      - name: dispatchRollout
-        type: dispatch-traits
-        properties:
-          component: nginx-server
-          cluster: poc-01

docs/examples/workflow-with-ocm/rollout/dispatchRevDef.yaml

@@ -1,60 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  name: dispatch-comp-rev
-  namespace: vela-system
-spec:
-  schematic:
-    cue:
-      template: |
-        import ("vela/op")
-
-        componentRev: op.#Read & {
-        	value: {
-               kind: "ControllerRevision"
-               apiVersion: "apps/v1"
-               metadata: {
-                  name: parameter.compRev
-                  namespace: context.namespace
-               }
-            }
-        }
-
-        apply: op.#Apply & {
-            value: {
-                apiVersion: "work.open-cluster-management.io/v1"
-                kind: "ManifestWork"
-                metadata: {
-                   namespace: parameter.cluster
-                   name: "comprevision-" + parameter.compRev
-                }
-                spec: {
-                   workload: {
-                      manifests: [{
-                         kind: "ControllerRevision"
-                         apiVersion: "apps/v1"
-                         metadata: {
-                            name: parameter.compRev
-                            namespace: context.namespace
-                         }
-                         data: {
-                            apiVersion: "core.oam.dev/v1alpha2"
-                            kind: "Component"
-                            metadata:
-                              name: context.name
-                              namespace: context.namespace
-                            spec:
-                              workload: {
-                                  componentRev.value.data.spec.workload
-                              }
-                         }
-                      }]
-                   }
-                }
-            }
-        }
-
-        parameter: {
-          compRev: string
-          cluster: string
-        }

docs/examples/workflow-with-ocm/rollout/dispatchTraits.yaml

@@ -1,34 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  name: dispatch-traits
-  namespace: vela-system
-spec:
-  schematic:
-    cue:
-      template: |
-        import ("vela/op")
-
-        comp: op.#Load & {
-           component: parameter.component
-        }
-
-        apply: op.#Apply & {
-            value: {
-                apiVersion: "work.open-cluster-management.io/v1"
-                kind: "ManifestWork"
-                metadata: {
-                   namespace: parameter.cluster
-                   name: parameter.component + "-traits"
-                }
-                spec: {
-                   workload: manifests : comp.value.auxiliaries
-                }
-            }
-        }
-
-
-        parameter: {
-          component: string
-          cluster: string
-        }

e2e/addon/mock/testdata/rollout/definitions/rollout.cue

@@ -1,58 +0,0 @@
-rollout: {
-	type: "trait"
-	annotations: {}
-	description: "Rollout the component."
-	attributes: {
-		manageWorkload: true
-		status: {
-			customStatus: #"""
-				message: context.outputs.rollout.status.rollingState
-				"""#
-			healthPolicy: #"""
-				isHealth: context.outputs.rollout.status.batchRollingState == "batchReady"
-				"""#
-		}
-	}
-}
-template: {
-	outputs: rollout: {
-		apiVersion: "standard.oam.dev/v1alpha1"
-		kind:       "Rollout"
-		metadata: {
-			name:      context.name
-			namespace: context.namespace
-		}
-		spec: {
-			if parameter.targetRevision != _|_ {
-				targetRevisionName: parameter.targetRevision
-			}
-			if parameter.targetRevision == _|_ {
-				targetRevisionName: context.revision
-			}
-			componentName: context.name
-			rolloutPlan: {
-				rolloutStrategy: "IncreaseFirst"
-				if parameter.rolloutBatches != _|_ {
-					rolloutBatches: parameter.rolloutBatches
-				}
-				targetSize: parameter.targetSize
-				if parameter["batchPartition"] != _|_ {
-					batchPartition: parameter.batchPartition
-				}
-			}
-		}
-	}
-
-	parameter: {
-		// +usage=Specify the target revision, it should be set if you want to rollback. such as: componentname-v1
-		targetRevision?: string
-		// +usage=Specify the count of replicas.
-		targetSize: int
-		// +usage=Specify the rollout batches, The total number of replicas of all batches needs to be equal to number of targetSize.
-		rolloutBatches?: [...rolloutBatch]
-		// +usage=Specify the batch partition in current deploying. It is used to control batch processes.
-		batchPartition?: int
-	}
-
-	rolloutBatch: replicas: int
-}

e2e/addon/mock/testdata/rollout/metadata.yaml

@@ -1,21 +0,0 @@
-name: rollout
-version: 1.2.3
-description: Provides basic batch publishing capability.
-url: https://kubevela.io/docs/end-user/traits/rollout
-
-tags:
-  - extended_workload
-  - rollout
-
-deployTo:
-  runtimeCluster: true
-
-dependencies: 
-  # install controller by helm.
-  - name: fluxcd
-
-# set invisible means this won't be list and will be enabled when depended on
-# for example, terraform-alibaba depends on terraform which is invisible,
-# when terraform-alibaba is enabled, terraform will be enabled automatically
-# default: false
-invisible: false

e2e/addon/mock/testdata/rollout/readme.md

@@ -1,7 +0,0 @@
-
-# Supported workload type
-
-Rollout Trait supports following component types: webservice、worker and cloneset.
-
-When using webservice/worker as Workload type with Rollout Trait, Workload's name will be controllerRevision's name. And when Workload's type is cloneset, because of clonset support in-place update Workload's name will always be component's name.
-

e2e/addon/mock/testdata/rollout/schemas/trait-uischema-rollout.yaml

@@ -1,10 +0,0 @@
-- jsonKey: batchPartition
-  sort: 1
-- jsonKey: targetSize
-  sort: 3
-- jsonKey: rolloutBatches
-  sort: 5
-- jsonKey: targetRevision
-  sort: 7
-  validate:
-    pattern: ^[a-z0-9]+\-v\d{1,5}$

e2e/addon/mock/testdata/terraform-alibaba/definitions/terraform-alibaba-oss.yaml

@@ -1,4 +1,4 @@
-apiVersion: core.oam.dev/v1alpha2
+apiVersion: core.oam.dev/v1beta1
 kind: ComponentDefinition
 metadata:
   name: alibaba-oss

e2e/raw-objects/samples/rollout-demo/README.md

@@ -1,180 +0,0 @@
-# Quick start
-
-This example show case how one can use a flagger trait to rollout a component with 
-
-## Install OAM flagger
-```shell script
-make
-helm install -n flagger rollout charts/flagger/
-```
-
-## Install Vela core
-```shell script
-make
-bin/vela install
-```
-
-## Run ApplicationConfiguration V1
-```shell script
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/definitions.yaml
-traitdefinition.core.oam.dev/canaries.flagger.app created
-traitdefinition.core.oam.dev/ingresses.extensions created
-workloaddefinition.core.oam.dev/deployments.apps created
-
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/deploy-component-v1.yaml
-component.core.oam.dev/rollout-demo-app created
-
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/appConfig-rollout-v1.yaml
-applicationconfiguration.core.oam.dev/sample-application-rollout created
-```
-
-## Verify that revision workload is created
-```shell script
-kubectl get controllerrevision
-NAME                  CONTROLLER                                REVISION   AGE
-rollout-demo-app-v1   component.core.oam.dev/rollout-demo-app   1          64s
-
-kubectl get deploy
-NAME                  READY   UP-TO-DATE   AVAILABLE   AGE
-rollout-demo-app-v1    1/1    1            1           80s
-```
-
-## Upgrade the component to v2 and change the revision name of the component in the appConfig 
-```shell script
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/deploy-component-v2.yaml
-component.core.oam.dev/rollout-demo-app configured
-
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/appConfig-rollout-v2.yaml
-applicationconfiguration.core.oam.dev/sample-application-rollout created
-```
-
-## Verify that new revision workload is created and the workloads
-```shell script
-kubectl get controllerrevision
-NAME                  CONTROLLER                                REVISION   AGE
-rollout-demo-app-v1   component.core.oam.dev/rollout-demo-app   1          90s
-rollout-demo-app-v2   component.core.oam.dev/rollout-demo-app   2          5s
-```
-
-## Verify that we have created services that select all pods in all the revisions
-```shell script
-kubectl get svc
-NAME                       TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)   AGE
-rollout-demo-app           ClusterIP   10.103.185.101   <none>        80/TCP    2m52s
-rollout-demo-app-canary    ClusterIP   10.99.87.149     <none>        80/TCP    2m22s
-rollout-demo-app-primary   ClusterIP   10.102.31.57     <none>        80/TCP    2m22s
-
-kubectl describe svc rollout-demo-app  
-Name:              rollout-demo-app
-Namespace:         default
-Labels:            app=rollout-demo-app
-Annotations:       <none>
-Selector:          app=rollout-demo-app
-Type:              ClusterIP
-IP:                10.103.185.101
-Port:              http  80/TCP
-TargetPort:        8080/TCP
-Endpoints:         172.17.0.13:8080,172.17.0.14:8080,172.17.0.15:8080 + 4 more...
-Session Affinity:  None
-Events:            <none>
-```
-
-## Verify the version of the canary and primary deployment are what is intended
-```shell script
-kubectl get deploy rollout-demo-app-v1 -o=jsonpath="{.spec.template.spec.containers[0].image}"
-stefanprodan/podinfo:4.0.6
-
-kubectl get deploy rollout-demo-app-v2 -o=jsonpath="{.spec.template.spec.containers[0].image}"
-stefanprodan/podinfo:5.0.2
-```
-
-## Observe the flagger canary 
-```shell script
-kubectl get canary --watch
-NAME                STATUS        WEIGHT   LASTTRANSITIONTIME
-rollout-demo-app    Initializing   0        2020-10-24T10:59:56Z
-rollout-demo-app    Initializing   0        2020-10-24T10:59:56Z
-rollout-demo-app    Initialized    0        2020-10-24T11:00:54Z
-rollout-demo-app    Progressing    0        2020-10-24T11:01:24Z
-rollout-demo-app    Progressing    10       2020-10-24T11:01:54Z
-rollout-demo-app    Progressing    20       2020-10-24T11:02:24Z
-rollout-demo-app    Progressing    30       2020-10-24T11:02:54Z
-rollout-demo-app    Progressing    40       2020-10-24T11:03:24Z
-rollout-demo-app    Progressing    50       2020-10-24T11:03:54Z
-rollout-demo-app    Promoting      0        2020-10-24T11:04:24Z
-rollout-demo-app    Promoting      100      2020-10-24T11:04:54Z
-rollout-demo-app    Finalising     0        2020-10-24T11:05:24Z
-```
-
-## Observe that the rollout through the canary object, you shall see something like this
-```shell script
-kubectl describe canary
-...
-...
-Events:
-  Type     Reason  Age                 From     Message
-  ----     ------  ----                ----     -------
-  Warning  Synced  5m30s               flagger  waiting for rollout to finish: observed deployment generation less then desired generation
-  Normal   Synced  5m (x2 over 5m30s)  flagger  all the metrics providers are available!
-  Normal   Synced  5m                  flagger  Initialization done! rollout-demo-app.default
-  Normal   Synced  4m30s               flagger  New revision detected! Scaling up rollout-demo-app-v2.default
-  Normal   Synced  4m                  flagger  Starting canary analysis for rollout-demo-app-v2.default
-  Normal   Synced  4m                  flagger  Advance rollout-demo-app.default canary weight 10
-  Normal   Synced  3m30s               flagger  Advance rollout-demo-app.default canary weight 20
-  Normal   Synced  3m                  flagger  Advance rollout-demo-app.default canary weight 30
-  Normal   Synced  2m30s               flagger  Advance rollout-demo-app.default canary weight 40
-  Normal   Synced  2m                  flagger  Advance rollout-demo-app.default canary weight 50
-  Normal   Synced  30s                 flagger  Promote rollout-demo-app.default
-  Normal   Synced  30s                 flagger  Promoting the traffic to the new targe in one shot
-  Normal   Synced  0s (x3 over 60s)    flagger  (combined from similar events): Promotion completed!
-
-```
-
-## Verify that the instances of the v2 workload is the same as the canary maxReplica
-```shell script
-kubectl get deploy
-NAME                  READY   UP-TO-DATE   AVAILABLE   AGE
-rollout-demo-app-v1   0/0     0            0           15m
-rollout-demo-app-v2   7/7     7            7           15m
-```
-
-## Roll back to V1
-```shell script
-kubectl apply -f e2e/raw-objects/samples/rollout-demo/appConfig-rollback-v1.yaml
-applicationconfiguration.core.oam.dev/sample-application-rollout configured
-```
-
-## Observe the flagger canary rollback
-```shell script
-kubectl get canary --watch
-NAME                STATUS        WEIGHT   LASTTRANSITIONTIME
-rollback-demo-app   Initialized   0        2020-10-24T11:17:04Z
-rollback-demo-app   Progressing   0        2020-10-24T11:17:34Z
-rollback-demo-app   Progressing   10       2020-10-24T11:18:04Z
-rollback-demo-app   Progressing   20       2020-10-24T11:18:34Z
-rollback-demo-app   Progressing   30       2020-10-24T11:19:04Z
-rollback-demo-app   Progressing   40       2020-10-24T11:19:34Z
-rollback-demo-app   Progressing   50       2020-10-24T11:20:04Z
-rollback-demo-app   Promoting     0        2020-10-24T11:20:34Z
-rollback-demo-app   Promoting     100      2020-10-24T11:21:04Z
-rollback-demo-app   Finalising    0        2020-10-24T11:21:34Z
-rollback-demo-app   Succeeded     0        2020-10-24T11:22:04Z
-```
-
-## Verify that the instances of the v1 workload is the same as the canary maxReplica
-```shell script
-kubectl get deploy
-NAME                  READY   UP-TO-DATE   AVAILABLE   AGE
-rollout-demo-app-v1   7/7     7            7           24m
-rollout-demo-app-v2   0/0     0            0           24m
-```
-
-## Clean up
-```shell script
-kubectl delete -f e2e/raw-objects/samples/rollout-demo/ 
-```
-
-## Improvements
-1. The current component garbage collector uses a very unreliable way to figour out if a workload is a revisioned one that needs to keep or GCed. (basically to see if its name starts with componentName-)
-2. The workload name will not be component-v when the user actually put a name in the component. This will lead to problems in the above case
-3. Modify the primary/canary service so that they point to the primary/canary resources individually

e2e/raw-objects/samples/rollout-demo/RolloutTraitDesign.md

@@ -1,72 +0,0 @@
-# Rollout Trait Design  
-
-## Flagger rollout flow
-Here is the 10,000 ft overview of the flagger rollout flow
-
-The overall controller Run function starts the processNextItem every second in the background. The processNextItme basically calls SyncHandler on each item in the queue.
-It calls the scheduleCanary() function in a for loop. 
-
-SyncHandler
-1. Set the canary status as **Initializing** if canary is not deleted
-2. Finalize (revert) the canary process if the canary has "revertOnDelete" flag. This means reverting the canary process when the canary object is deleted. OAM should NEVER set this to true.  
-3. Each canary will be mapped to a job which runs the "AdvanceCanary" logic below forever until stopped
-
-AdvanceCanary
-1. Create Canary controller/Service router/Mesh router/ through a factory
-2. CanaryController initialize the primary resource by copying from the target
-3. ServiceRouter initialize creates the serivce for the canary/primary resources
-4. Check if the canary has changed if the primary is initialized successfully. Just return if not.
-5. Check if the rollout webhook confirms to start
-6. Check if the Primary is ready, return if not
-7. MeshRouter starts to calculate the traffic weight between primary/canary
-8. Set the canary status as **Initialized** if it's initializing and return. Otherwise, set it to **Progressing** if it determined to advance
-9. Check if the canary revision (spec) changes or dependency changes during rollout, if so, reset to **Progressing**
-10. Check if no need to do analysis, go straight to finish the rollout if not. The default is to route 100% to primary which is not what we want. OAM should NEVER set this to true.
-11. Check with rollback webhooks, rollback if something is wrong
-12. Check if the status is promoting, call controller promote which just copy canary spec to primary. This will set the status to **Finalizing** if there is no error.
-13. Check if the status is finalizing. Finalize delete the canary and set the canary status as **Succeeded**
-14. Roll back if the number of failed cases cross certain threshold.
-15. Pick a strategy based on the spec.Analysis (A/B testing, Blue/Green or Canary). The canary status is set as **Promoting** at the end of those phase.
-
-
-## Problems with the flagger design in OAM
-The problem with the current flagger design is that it wants to be strictly GitOps compatible. Thus, it 
-cannot touch the image related fields in the "target" object. That's why it has to create a "primary" deployment
-and treat the "target" as the "canary" while doing the rollout. It finally "promotes" the primary 
-by copying everything from the "canary" to the "primary" after it 's done.
-
-We don't need to stick to that scheme, but we face a similar problem as our component/workload controller
-will constantly reconcile the target component too. 
-1. One way is to pin the component to a specific revision in the application configuration. The user then can modify 
-the component and that can be automatically picked up by the rollout trait. The draw-back of this approach is that
-the upgrade will end up with the workload with the latest version not the workload in the applcation configuration. 
-2. Another way is to not allow the component to specify the "replicas" by the user. In this way, a user can modify
-the container related fields which leads to a new workload of size 0 created. The rollout trait 
-can pick up the "last" revision of the component and its corresponding workload as the source. The nice part of this 
-approach is the new component will be the canary, thus keeping it under the application controller's control
-and ready to be upgraded again.
-
-We decide to take the second approach as it matches with the flow better.
-
-## Proposed OAM Design
-- Add a new "meshProvider" type "OAM", the scheduler will automatically set the meshProvider as the "routeTrait" implementation
-which is SMI for now.
-- OAM can fill the workloadRef to the `targetRef` automatically. This will point the trait to the workload 
-which has its "componentRevisionName" in its label.
-- Write an OAM flagger resource controller that works with the podSpecWorkload/containerizedWorkload/Deployment
-    - Find the last live component revision as the canary if the user didn't explicitly spell out the revisionName
-    - We need to use the workload itself as the canary, and the "source" as the primary   
-    - The Initialize function will be no-op
-    - The controller will adjust the replica size between the canary and the primary if there is HPA associated with the workload
-    - The Promote function will simply reduce the primary (source) replicas zero and bump the canary (target)  
-- It seems that we don't need an OAM specific router (even if the service/routing name is a bit mis-matched) 
-- Remove all the hard coded string literal "primary" from the scheduler.go file
-
-## What is not covered
-- This design does not cover the case that HPA is involved. This requires some changes at the OAM 
-runtime to keep the HPA trait on the old workload.
-- We need a way to translate the status of the flagger trait status back to the rollout output if we 
-don't plan to introduce a rollout CRD.
-- The rollout experience needs to be combined with the metris/route/autoscaler traits together to have
-a merely complete CD experience. The very basic case is for the canary to emit Prometheus metrics. The rollout
-trait needs to setup metrics checkers and threatholds to move to the next stages. 

e2e/raw-objects/samples/rollout-demo/appConfig-rollback-v1.yaml

@@ -1,40 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: ApplicationConfiguration
-metadata:
-  name: sample-application-rollout
-spec:
-  components:
-    - revisionName: rollout-demo-app-v1
-      traits:
-        - trait:
-            apiVersion: flagger.app/v1beta1
-            kind: Canary
-            metadata:
-              name: rollback-demo-app
-            spec:
-              sourceRef:
-                apiVersion: apps/v1
-                kind: Deployment
-                name: rollout-demo-app-v2
-                namespace: default
-              provider: smi
-              progressDeadlineSeconds: 60
-              service:
-                name: rollout-demo-app
-                # ClusterIP port number
-                port: 80
-                # container port number or name
-                targetPort: 8080
-              analysis:
-                # schedule interval (default 60s)
-                interval: 15s
-                # max number of failed metric checks before rollback
-                threshold: 10
-                # max traffic percentage routed to canary
-                # percentage (0-100)
-                maxWeight: 50
-                # canary increment step
-                # percentage (0-100)
-                stepWeight: 10
-                # max replicas scale up to canary
-                maxReplicas: 7

e2e/raw-objects/samples/rollout-demo/appConfig-rollout-v1.yaml

@@ -1,34 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: ApplicationConfiguration
-metadata:
-  name: sample-application-rollout
-spec:
-  components:
-    - revisionName: rollout-demo-app-v1
-      traits:
-        - trait:
-            apiVersion: flagger.app/v1beta1
-            kind: Canary
-            metadata:
-              name: rollout-demo-app
-            spec:
-              provider: smi
-              progressDeadlineSeconds: 60
-              service:
-                # ClusterIP port number
-                port: 80
-                # container port number or name
-                targetPort: 8080
-              analysis:
-                # schedule interval (default 60s)
-                interval: 0s
-                # max number of failed metric checks before rollback
-                threshold: 10
-                # max traffic percentage routed to canary
-                # percentage (0-100)
-                maxWeight: 50
-                # canary increment step
-                # percentage (0-100)
-                stepWeight: 10
-                # max replicas scale up to canary
-                maxReplicas: 7

e2e/raw-objects/samples/rollout-demo/appConfig-rollout-v2.yaml

@@ -1,35 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: ApplicationConfiguration
-metadata:
-  name: sample-application-rollout
-spec:
-  components:
-    - revisionName: rollout-demo-app-v2
-      traits:
-        - trait:
-            apiVersion: flagger.app/v1beta1
-            kind: Canary
-            metadata:
-              name: rollout-demo-app
-            spec:
-              provider: smi
-              progressDeadlineSeconds: 60
-              service:
-                name: rollout-demo-app
-                # ClusterIP port number
-                port: 80
-                # container port number or name
-                targetPort: 8080
-              analysis:
-                # schedule interval (default 60s)
-                interval: 15s
-                # max number of failed metric checks before rollback
-                threshold: 10
-                # max traffic percentage routed to canary
-                # percentage (0-100)
-                maxWeight: 50
-                # canary increment step
-                # percentage (0-100)
-                stepWeight: 10
-                # max replicas scale up to canary
-                maxReplicas: 7

e2e/raw-objects/samples/rollout-demo/definitions.yaml

@@ -1,20 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: canaries.flagger.app
-spec:
-  appliesToWorkloads:
-    - podspecworkload.standard.oam.dev
-    - deployments.apps
-  definitionRef:
-    name: canaries.flagger.app
-  workloadRefPath: spec.targetRef
-  revisionEnabled: true
----
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: deployments.apps
-spec:
-  definitionRef:
-    name: deployments.apps

e2e/raw-objects/samples/rollout-demo/deploy-component-v1.yaml

@@ -1,26 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: Component
-metadata:
-  name: rollout-demo-app
-spec:
-  workload:
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      labels:
-        app: rollout-demo-app
-    spec:
-      selector:
-        matchLabels:
-          app: rollout-demo-app
-      template:
-        metadata:
-          labels:
-            app: rollout-demo-app
-        spec:
-          containers:
-            - image: stefanprodan/podinfo:4.0.6
-              name: metrics-provider
-              ports:
-                - name: http
-                  containerPort: 8080

e2e/raw-objects/samples/rollout-demo/deploy-component-v2.yaml

@@ -1,26 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: Component
-metadata:
-  name: rollout-demo-app
-spec:
-  workload:
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      labels:
-        app: rollout-demo-app
-    spec:
-      selector:
-        matchLabels:
-          app: rollout-demo-app
-      template:
-        metadata:
-          labels:
-            app: rollout-demo-app
-        spec:
-          containers:
-            - image: stefanprodan/podinfo:5.0.2
-              name: metrics-provider
-              ports:
-                - name: http
-                  containerPort: 8080

e2e/raw-objects/samples/rollout-demo/podSpec-component-v1.yaml

@@ -1,19 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: Component
-metadata:
-  name: rollout-demo-app
-spec:
-  workload:
-    apiVersion: standard.oam.dev/v1alpha1
-    kind: PodSpecWorkload
-    metadata:
-      labels:
-        app: rollout-demo-app
-    spec:
-      podSpec:
-        containers:
-          - image: stefanprodan/podinfo:4.0.6
-            name: metrics-provider
-            ports:
-              - name: http
-                containerPort: 8080