Merge pull request #1251 from wonderflow/fix2

remove dashboard and migrate to velacp（fix release pipeline）

.github/workflows/dashboard.yml

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

.github/workflows/go.yml

@@ -7,19 +7,38 @@ on:
       - release-*
   workflow_dispatch: {}
   pull_request:
-    branches: [master]
+    branches:
+      - master
+      - release-*
 
 env:
   # Common versions
   GO_VERSION: '1.14'
-  GOLANGCI_VERSION: 'v1.31'
+  GOLANGCI_VERSION: 'v1.38'
   DOCKER_BUILDX_VERSION: 'v0.4.2'
   KIND_VERSION: 'v0.7.0'
 
 jobs:
 
+  detect-noop:
+    runs-on: ubuntu-20.04
+    outputs:
+      noop: ${{ steps.noop.outputs.should_skip }}
+    steps:
+      - name: Detect No-op Changes
+        id: noop
+        uses: fkirc/skip-duplicate-actions@v3.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          paths_ignore: '["**.md", "**.png", "**.jpg"]'
+          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
+          concurrent_skipping: false
+
   unit-tests:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
     steps:
       - name: Set up Go 1.14
         uses: actions/setup-go@v1
@@ -62,8 +81,107 @@ jobs:
           flags: unittests
           name: codecov-umbrella
 
+  compatibility-test:
+    runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Install ginkgo
+        run: |
+          sudo apt-get install -y golang-ginkgo-dev
+
+      - name: Setup Kind Cluster
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+
+      - name: install Kubebuilder
+        uses: wonderflow/kubebuilder-action@v1.1
+
+      - name: Run Make compatibility-test
+        run: make compatibility-test
+
+      - name: Clean up testdata
+        run: make compatibility-testdata-cleanup
+
+  e2e-rollout-tests:
+    runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+
+      - name: Setup Kind
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: ${{ env.KIND_VERSION }}
+          skipClusterCreation: true
+
+      - name: Setup Kind Cluster
+        run: |
+          kind delete cluster
+          kind create cluster
+
+      - name: Load Image to kind cluster
+        run: make kind-load
+
+      - name: Run Make
+        run: make
+
+      - name: Run Make Manager
+        run: make manager
+
+      - name: Prepare for e2e tests
+        run: |
+          make e2e-cleanup
+          make e2e-setup
+
+      - name: Wait for e2e preparation ready
+        run: |
+          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/workloads)" != "200" ]]; do sleep 5; done' || false
+
+      - name: Run e2e rollout tests
+        run: make e2e-rollout-test
+
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup
+
   e2e-tests:
     runs-on: aliyun
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -114,8 +232,14 @@ jobs:
       - name: Run e2e tests
         run: make e2e-test
 
+      - name: Cleanup image
+        if: ${{ always() }}
+        run: make image-cleanup
+
   staticcheck:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -135,6 +259,8 @@ jobs:
 
   lint:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -160,6 +286,8 @@ jobs:
 
   check-diff:
     runs-on: ubuntu-20.04
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
       - name: Checkout
@@ -184,3 +312,18 @@ jobs:
 
       - name: Check Diff
         run: make check-diff
+
+  build-cli:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14
+        id: go
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+      - name: Run cross-build
+        run: make cross-build
+      - name: Run compress binary
+        run: make compress

.github/workflows/license.yml

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

.github/workflows/registry.yml

@@ -72,14 +72,6 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@master
-      - name: Get the version
-        id: get_version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
-            VERSION=latest
-          fi
-          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
@@ -93,14 +85,30 @@ jobs:
         run: |
           rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
           rsync -r $HELM_CHART/* $LEGACY_HELM_CHART --exclude=Chart.yaml --exclude=crds
+      - uses: oprypin/find-latest-tag@v1
+        with:
+          repository: oam-dev/kubevela
+          releases-only: true
+        id: latest_tag
       - name: Tag helm chart image
         run:  |
-          version=${{ steps.get_version.outputs.VERSION }}
-          sed -i "s/latest/$version/g" $HELM_CHART/values.yaml
-          sed -i "s/latest/$version/g" $LEGACY_HELM_CHART/values.yaml
-          number=${version#"v"}
-          sed -i "s/0.1.0/$number/g" $HELM_CHART/Chart.yaml
-          sed -i "s/0.1.0/$number/g" $LEGACY_HELM_CHART/Chart.yaml
+          latest_repo_tag=${{ steps.latest_tag.outputs.tag }}
+          sub="."
+          major="$(cut -d"$sub" -f1 <<<"$latest_repo_tag")"
+          minor="$(cut -d"$sub" -f2 <<<"$latest_repo_tag")"
+          patch="0"
+          next_repo_tag="$major.$(($minor + 1)).$patch"
+          image_tag=${GITHUB_REF#refs/tags/}
+          chart_version=$latest_repo_tag
+          if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
+            image_tag=latest
+            chart_version=${next_repo_tag}-rc-master
+          fi
+          sed -i "s/latest/${image_tag}/g" $HELM_CHART/values.yaml
+          sed -i "s/latest/image_tag/g" $LEGACY_HELM_CHART/values.yaml
+          chart_smever=${chart_version#"v"}
+          sed -i "s/0.1.0/$chart_smever/g" $HELM_CHART/Chart.yaml
+          sed -i "s/0.1.0/$chart_smever/g" $LEGACY_HELM_CHART/Chart.yaml
       - name: Install ossutil
         run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
       - name: Configure Alibaba Cloud OSSUTIL

.github/workflows/release.yml

@@ -23,20 +23,10 @@ jobs:
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-      - name: Use Node.js 10.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Run dashboard install
-        run: make dashboard-install
-      - name: Run dashboard build
-        run: make dashboard-build
       - name: Tag helm chart image
         run:  |
           sed -i 's/latest/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/values.yaml
           sed -i 's/0.1.0/${{ steps.get_version.outputs.VERSION }}/g' charts/vela-core/Chart.yaml
-      - name: Run generate-source
-        run: make generate-source
       - name: Run cross-build
         run: make cross-build
       - name: Run compress binary
@@ -58,20 +48,6 @@ jobs:
           asset_path: ./_bin/vela-linux-amd64.zip
           asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Linux arm64 tar.gz
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-arm64.tar.gz
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-arm64.tar.gz
-          asset_content_type: binary/octet-stream
-      - name: Upload Linux arm64 zip
-        uses: actions/upload-release-asset@v1.0.2
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-arm64.zip
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-arm64.zip
-          asset_content_type: binary/octet-stream
       - name: Upload MacOS tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:

.gitignore

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

.golangci.yml

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

.license/README.md

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

.license/dependency_decisions.yml

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

CONTRIBUTING.md

@@ -15,10 +15,10 @@ contributing to `kubevela` or build a PoC (Proof of Concept).
 
 1. Golang version 1.13+
 2. Kubernetes version v1.16+ with `~/.kube/config` configured.
-3. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test))
+3. ginkgo 1.14.0+ (just for [E2E test](./CONTRIBUTING.md#e2e-test))
 4. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.
 
-We also recommend you to learn about KubeVela's [design](docs/en/design.md) before dive into its code.
+We also recommend you to learn about KubeVela's [design](https://kubevela.io/#/en/concepts) before dive into its code.
 
 ### Build
 

Dockerfile

@@ -23,16 +23,20 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on \
     go build -a -ldflags "-X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
     -o manager-${TARGETARCH} main.go
 
-# Use distroless as minimal base image to package the manager binary
+# Use ubuntu as base image for convenience.
+# You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-# Could use `--build-arg=BASE_DISTROLESS=gcr.io/distroless/static:nonroot` to overwrite
-ARG BASE_DISTROLESS
-FROM ${BASE_DISTROLESS:-gcr.io/distroless/static:nonroot}
+# Could use `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot` to overwrite
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-ubuntu:latest}
+# This is required by daemon connnecting with cri
+RUN ln -s /usr/bin/* /usr/sbin/ && apt-get update -y \
+  && apt-get install --no-install-recommends -y ca-certificates \
+  && apt-get clean && rm -rf /var/log/*log /var/lib/apt/lists/* /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old
 
 WORKDIR /
 
 ARG TARGETARCH
 COPY --from=builder /workspace/manager-${TARGETARCH} /manager
-USER nonroot:nonroot
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -8,7 +8,7 @@ VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision
 LDFLAGS             ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
 
 GOX         = go run github.com/mitchellh/gox
-TARGETS     := darwin/amd64 linux/amd64 windows/amd64 linux/arm64
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
 DIST_DIRS   := find * -type d -exec
 
 TIME_LONG	= `date +%Y-%m-%d' '%H:%M:%S`
@@ -39,25 +39,23 @@ all: build
 # Run tests
 test: vet lint staticcheck
 	go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/...
+	go test -race -covermode=atomic ./references/apiserver/... ./references/cli/... ./references/common/...
 	@$(OK) unit-tests pass
 
 # Build manager binary
 build: fmt vet lint staticcheck
 	go run hack/chart/generate.go
-	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
-	git checkout cmd/vela/fake/chart_source.go
+	go build -o bin/vela -ldflags ${LDFLAGS} references/cmd/cli/main.go
+	git checkout references/cmd/cli/fake/chart_source.go
 	@$(OK) build succeed
 
 vela-cli:
 	go run hack/chart/generate.go
-	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
-	git checkout cmd/vela/fake/chart_source.go
+	go build -o bin/vela -ldflags ${LDFLAGS} references/cmd/cli/main.go
+	git checkout references/cmd/cli/fake/chart_source.go
 
 dashboard-build:
-	cd dashboard && yarn build && cd ./..
-
-dashboard-install:
-	cd dashboard && yarn && cd ./..
+	cd references/dashboard && npm install && cd ..
 
 doc-gen:
 	rm -r docs/en/cli/*
@@ -65,16 +63,16 @@ doc-gen:
 	go run hack/references/generate.go
 
 api-gen:
-	swag init -g pkg/server/route.go --output pkg/server/docs
-	swagger-codegen generate -l html2 -i pkg/server/docs/swagger.yaml -o pkg/server/docs
-	mv pkg/server/docs/index.html docs/en/developers/references/restful-api/
+	swag init -g references/apiserver/route.go --output references/apiserver/docs
+	swagger-codegen generate -l html2 -i references/apiserver/docs/swagger.yaml -o references/apiserver/docs
+	mv references/apiserver/docs/index.html docs/en/developers/references/restful-api/
 
 generate-source:
 	go run hack/frontend/source.go
 
 cross-build:
 	go run hack/chart/generate.go
-	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./cmd/vela/
+	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli/
 
 compress:
 	( \
@@ -125,10 +123,17 @@ docker-push:
 	docker push ${IMG}
 
 e2e-setup:
-	bin/vela install --set installCertManager=true --image-pull-policy IfNotPresent --image-repo vela-core-test --image-tag $(GIT_COMMIT)
+	helm install --create-namespace -n flux-system helm-flux http://oam.dev/catalog/helm-flux2-0.1.0.tgz
+	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.7.0/kruise-chart.tgz
+	helm repo add jetstack https://charts.jetstack.io
+	helm repo update
+	helm upgrade --install --create-namespace --namespace cert-manager cert-manager jetstack/cert-manager --version v1.2.0  --set installCRDs=true --wait
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set admissionWebhooks.certManager.enabled=true --set image.repository=vela-core-test --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
 	ginkgo version
 	ginkgo -v -r e2e/setup
 	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
 	bin/vela dashboard &
 
 e2e-api-test:
@@ -137,17 +142,36 @@ e2e-api-test:
 	ginkgo -v -r e2e/apiserver
 	ginkgo -v -r e2e/application
 
+e2e-rollout-test:
+	ginkgo -v --focus="Cloneset based rollout tests" ./test/e2e-test/
+
 e2e-test:
 	# Run e2e test
-	ginkgo -v ./test/e2e-test
-	# integration test will clean environment, please don't put test behind it.
-	CGO_ENABLED=0 go test -timeout 1h -count=1 -v -tags 'integration' ./test/integration
+	ginkgo -v --skip="Cloneset based rollout tests" ./test/e2e-test
 	@$(OK) tests pass
 
+compatibility-test: vet lint staticcheck generate-compatibility-testdata
+	# Run compatibility test with old crd
+	COMPATIBILITY_TEST=TRUE go test -race ./pkg/...
+	@$(OK) compatibility-test pass
+
+generate-compatibility-testdata:
+	mkdir -p  ./test/compatibility-test/testdata
+	go run ./test/compatibility-test/convert/main.go ./charts/vela-core/crds ./test/compatibility-test/testdata
+
+compatibility-testdata-cleanup:
+	rm -f ./test/compatibility-test/testdata/*
+
 e2e-cleanup:
 	# Clean up
 	rm -rf ~/.vela
 
+image-cleanup:
+# Delete Docker image
+ifneq ($(shell docker images -q vela-core-test:$(GIT_COMMIT)),)
+	docker image rm -f vela-core-test:$(GIT_COMMIT)
+endif
+
 # load docker image to the kind cluster
 kind-load:
 	docker build -t vela-core-test:$(GIT_COMMIT) .
@@ -168,20 +192,18 @@ manager: fmt vet lint manifests
 core-run: fmt vet manifests
 	go run ./cmd/core/main.go
 
+# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
+core-debug-run: fmt vet manifests
+	go run ./cmd/core/main.go --log-debug=true
+
 # Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
 core-install: manifests
 	kubectl apply -f hack/namespace.yaml
 	kubectl apply -f charts/vela-core/crds/
-	kubectl apply -f charts/vela-core/templates/defwithtemplate/
-	kubectl apply -f charts/vela-core/templates/definitions/
-	kubectl apply -f charts/vela-core/templates/velaConfig.yaml
-	bin/vela workloads
 	@$(OK) install succeed
 
 # Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
 core-uninstall: manifests
-	kubectl delete -f charts/vela-core/templates/definitions/
-	kubectl delete -f charts/vela-core/templates/defwithtemplate/
 	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
@@ -247,8 +269,8 @@ CUE=$(shell which cue)
 endif
 
 start-dashboard:
-	go run pkg/server/main/startAPIServer.go &
-	cd dashboard && npm install && npm start && cd ..
+	go run references/cmd/apiserver/main.go &
+	cd references/dashboard && npm install && npm start && cd ..
 
 swagger-gen:
-	$(GOBIN)/swag init -g server/route.go -d pkg/ -o pkg/server/docs/
+	$(GOBIN)/swag init -g apiserver/route.go -d pkg/ -o references/apiserver/docs/

PROJECT

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

README.md

@@ -14,35 +14,37 @@
 
 # KubeVela
 
-For developers, KubeVela is an easy-to-use yet extensible platform that enables them to design and ship applications with minimal effort.
-
-For platform builders, KubeVela is the core engine that empowers them to create above platform with ease.
+KubeVela is the platform engine to create *PaaS-like* experience on Kubernetes, in a scalable approach.
 
 ## Community
 
 - Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel
 - Gitter: [Discussion](https://gitter.im/oam-dev/community)
 
-> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
+> NOTE: KubeVela is still iterating quickly. It's currently under pre-beta release.
 
-## How It Works?
+## Installation
 
-![alt](docs/resources/how-it-works.png)
+Installation guide is available on [this section](https://kubevela.io/#/en/install).
 
 ## Quick Start
 
-Quick start guides for developers are available on [this section](https://kubevela.io/#/en/quick-start).
-
-## Platform Builder Guide
-
-Detailed guides for platform teams are available on [this section](https://kubevela.io/#/en/platform-engineers/overview).
+Quick start is available on [this section](https://kubevela.io/#/en/quick-start).
 
 ## Documentation
 
 For full documentation, please visit the KubeVela website: [https://kubevela.io](https://kubevela.io/).
 
+## Talks and Conferences
+
+| Engagement | Link        |
+|:-----------|:------------|
+| 🎤  Talks | - [KubeVela - The Modern App Delivery System in Alibaba](https://docs.google.com/presentation/d/1CWCLcsKpDQB3bBDTfdv2BZ8ilGGJv2E8L-iOA5HMrV0/edit?usp=sharing) |
+| 🌎 KubeCon | - [ [NA 2020] Standardizing Cloud Native Application Delivery Across Different Clouds](https://www.youtube.com/watch?v=0yhVuBIbHcI) <br> - [ [EU 2021] Zero Pain Microservice Development and Deployment with Dapr and KubeVela](https://sched.co/iE4S) |
+| 📺 Conferences | - [Dapr, Rudr, OAM: Mark Russinovich presents next gen app development & deployment](https://www.youtube.com/watch?v=eJCu6a-x9uo) <br> - [Mark Russinovich presents "The Future of Cloud Native Applications with OAM and Dapr"](https://myignite.techcommunity.microsoft.com/sessions/82059)|
+
 ## Contributing
 Check out [CONTRIBUTING](./CONTRIBUTING.md) to see how to develop with KubeVela.
 
 ## Code of Conduct
-This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.
+KubeVela adopts [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

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

@@ -21,6 +21,8 @@ import (
 
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -44,8 +46,7 @@ const (
 type AppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	v1alpha1.RolloutStatus `json:",inline"`
 
 	Phase ApplicationPhase `json:"status,omitempty"`
 
@@ -54,6 +55,10 @@ type AppStatus struct {
 
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`
+
+	// LatestRevision of the application configuration it generates
+	// +optional
+	LatestRevision *Revision `json:"latestRevision,omitempty"`
 }
 
 // ApplicationComponentStatus record the health status of App component
@@ -99,11 +104,16 @@ 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"`
 }
 
-// +kubebuilder:object:root=true
-
 // Application is the Schema for the applications API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`

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

@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestApplication_GetComponent(t *testing.T) {
+func TestApplicationGetComponent(t *testing.T) {
 	ac1 := ApplicationComponent{
 		Name:         "ac1",
 		WorkloadType: "type1",

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

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

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

@@ -0,0 +1,66 @@
+/*
+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"
+)
+
+// 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 []*Component `json:"components"`
+
+	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
+	// it will contains the whole K8s CR of trait and the reference component in it.
+	ApplicationConfiguration ApplicationConfiguration `json:"applicationConfiguration"`
+}
+
+// ApplicationRevision is the Schema for the ApplicationRevision API
+// +kubebuilder:object:root=true
+// +kubebuilder:shortName=apprev,resource:categories={oam}
+type ApplicationRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec ApplicationRevisionSpec `json:"spec,omitempty"`
+}
+
+// ApplicationRevisionList contains a list of ApplicationRevision
+// +kubebuilder:object:root=true
+type ApplicationRevisionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationRevision `json:"items"`
+}

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

@@ -22,15 +22,15 @@ import (
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
-// ApplicationDeploymentSpec defines how to describe an upgrade between different application
-type ApplicationDeploymentSpec struct {
-	// TargetApplicationName contains the name of the application that we need to upgrade to.
-	// We assume that an application is immutable, thus the name alone is suffice
-	TargetApplicationName string `json:"targetApplicationName"`
+// AppRolloutSpec defines how to describe an upgrade between different apps
+type AppRolloutSpec struct {
+	// TargetAppRevisionName contains the name of the applicationConfiguration that we need to upgrade to.
+	// Here we use an applicationConfiguration as a revision of an application, thus the name alone is suffice
+	TargetAppRevisionName string `json:"targetAppRevisionName"`
 
-	// SourceApplicationName contains the name of the application that we need to upgrade from.
+	// SourceAppRevisionName contains the name of the applicationConfiguration that we need to upgrade from.
 	// it can be empty only when it's the first time to deploy the application
-	SourceApplicationName string `json:"sourceApplicationName,omitempty"`
+	SourceAppRevisionName string `json:"sourceAppRevisionName,omitempty"`
 
 	// The list of component to upgrade in the application.
 	// We only support single component application so far
@@ -41,41 +41,41 @@ type ApplicationDeploymentSpec struct {
 	// RolloutPlan is the details on how to rollout the resources
 	RolloutPlan v1alpha1.RolloutPlan `json:"rolloutPlan"`
 
-	// RevertOnDelete revert the rollout when the rollout CR is deleted, default is false
-	// It will remove the target application from the kubernetes
+	// RevertOnDelete revert the rollout when the rollout CR is deleted
+	// It will remove the target app from the kubernetes if it's set to true
 	// +optional
 	RevertOnDelete *bool `json:"revertOnDelete,omitempty"`
 }
 
-// ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
-type ApplicationDeploymentStatus struct {
+// AppRolloutStatus defines the observed state of AppRollout
+type AppRolloutStatus struct {
 	v1alpha1.RolloutStatus `json:",inline"`
 
-	// LastTargetApplicationName contains the name of the application that we upgraded to
+	// 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
-	LastTargetApplicationName string `json:"lastTargetApplicationName"`
+	LastUpgradedTargetAppRevision string `json:"lastTargetAppRevision"`
 
-	// LastSourceApplicationName contains the name of the application that we need to upgrade from.
+	// 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
-	LastSourceApplicationName string `json:"lastSourceApplicationName,omitempty"`
+	LastSourceAppRevision string `json:"LastSourceAppRevision,omitempty"`
 }
 
-// ApplicationDeployment is the Schema for the ApplicationDeployment API
+// AppRollout is the Schema for the AppRollout API
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
-type ApplicationDeployment struct {
+type AppRollout struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ApplicationDeploymentSpec   `json:"spec,omitempty"`
-	Status ApplicationDeploymentStatus `json:"status,omitempty"`
+	Spec   AppRolloutSpec   `json:"spec,omitempty"`
+	Status AppRolloutStatus `json:"status,omitempty"`
 }
 
-// ApplicationDeploymentList contains a list of ApplicationDeployment
+// AppRolloutList contains a list of AppRollout
 // +kubebuilder:object:root=true
-type ApplicationDeploymentList struct {
+type AppRolloutList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApplicationDeployment `json:"items"`
+	Items           []AppRollout `json:"items"`
 }

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

@@ -0,0 +1,109 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha2
+
+import (
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// A WorkloadTypeDescriptor refer to a Workload Type
+type WorkloadTypeDescriptor struct {
+	// Type ref to a WorkloadDefinition via name
+	Type string `json:"type,omitempty"`
+	// Definition mutually exclusive to workload.type, a embedded WorkloadDefinition
+	Definition WorkloadGVK `json:"definition,omitempty"`
+}
+
+// WorkloadGVK refer to a Workload Type
+type WorkloadGVK struct {
+	APIVersion string `json:"apiVersion"`
+	Kind       string `json:"kind"`
+}
+
+// ComponentDefinitionSpec defines the desired state of ComponentDefinition
+type ComponentDefinitionSpec struct {
+	// Workload is a workload type descriptor
+	Workload WorkloadTypeDescriptor `json:"workload"`
+
+	// ChildResourceKinds are the list of GVK of the child resources this workload generates
+	ChildResourceKinds []ChildResourceKind `json:"childResourceKinds,omitempty"`
+
+	// RevisionLabel indicates which label for underlying resources(e.g. pods) of this workload
+	// can be used by trait to create resource selectors(e.g. label selector for pods).
+	// +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 *Status `json:"status,omitempty"`
+
+	// Schematic defines the data format and template of the encapsulation of the workload
+	// +optional
+	Schematic *Schematic `json:"schematic,omitempty"`
+
+	// Extension is used for extension needs by OAM platform builders
+	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Extension *runtime.RawExtension `json:"extension,omitempty"`
+}
+
+// ComponentDefinitionStatus is the status of ComponentDefinition
+type ComponentDefinitionStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+	ConfigMapRef string `json:"configMapRef,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ComponentDefinition is the Schema for the componentdefinitions API
+// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:subresource:status
+type ComponentDefinition struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ComponentDefinitionSpec   `json:"spec,omitempty"`
+	Status ComponentDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for WorkloadDefinition
+func (cd *ComponentDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
+	cd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkloadDefinition
+func (cd *ComponentDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+	return cd.Status.GetCondition(conditionType)
+}
+
+// +kubebuilder:object:root=true
+
+// ComponentDefinitionList contains a list of ComponentDefinition
+type ComponentDefinitionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ComponentDefinition `json:"items"`
+}

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

@@ -17,13 +17,29 @@ limitations under the License.
 package v1alpha2
 
 import (
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
-
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 )
 
+// CUE defines the encapsulation in CUE format
+type CUE struct {
+	// Template defines the abstraction template data of the capability, it will replace the old CUE template in extension field.
+	// Template is a required field if CUE is defined in Capability Definition.
+	Template string `json:"template"`
+}
+
+// Schematic defines the encapsulation of this capability(workload/trait/scope),
+// the encapsulation can be defined in different ways, e.g. CUE/HCL(terraform)/KUBE(K8s Object)/HELM, etc...
+type Schematic struct {
+	CUE *CUE `json:"cue,omitempty"`
+
+	HELM *Helm `json:"helm,omitempty"`
+
+	// TODO(wonderflow): support HCL(terraform)/KUBE(K8s Object) here.
+}
+
 // A DefinitionReference refers to a CustomResourceDefinition by name.
 type DefinitionReference struct {
 	// Name of the referenced CustomResourceDefinition.
@@ -68,15 +84,9 @@ type WorkloadDefinitionSpec struct {
 	// +optional
 	Status *Status `json:"status,omitempty"`
 
-	// Template defines the abstraction template data of the workload, it will replace the old template in extension field.
-	// the data format depends on templateType, by default it's CUE
+	// Schematic defines the data format and template of the encapsulation of the workload
 	// +optional
-	Template string `json:"template,omitempty"`
-
-	// TemplateType defines the data format of the template, by default it's CUE format
-	// Terraform HCL, Helm Chart will also be candidates in the near future.
-	// +optional
-	TemplateType string `json:"templateType,omitempty"`
+	Schematic *Schematic `json:"schematic,omitempty"`
 
 	// Extension is used for extension needs by OAM platform builders
 	// +optional
@@ -84,6 +94,11 @@ type WorkloadDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
+// WorkloadDefinitionStatus is the status of WorkloadDefinition
+type WorkloadDefinitionStatus struct {
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+}
+
 // Status defines the loop back status of the abstraction by using CUE template
 type Status struct {
 	// CustomStatus defines the custom status message that could display to user
@@ -101,12 +116,23 @@ type Status struct {
 // is used to validate the schema of the workload when it is embedded in an OAM
 // Component.
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Cluster,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec WorkloadDefinitionSpec `json:"spec,omitempty"`
+	Spec   WorkloadDefinitionSpec   `json:"spec,omitempty"`
+	Status WorkloadDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for WorkloadDefinition
+func (wd *WorkloadDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
+	wd.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from WorkloadDefinition
+func (wd *WorkloadDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+	return wd.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
@@ -150,15 +176,9 @@ type TraitDefinitionSpec struct {
 	// +optional
 	ConflictsWith []string `json:"conflictsWith,omitempty"`
 
-	// Template defines the abstraction template data of the workload, it will replace the old template in extension field.
-	// the data format depends on templateType, by default it's CUE
+	// Schematic defines the data format and template of the encapsulation of the trait
 	// +optional
-	Template string `json:"template,omitempty"`
-
-	// TemplateType defines the data format of the template, by default it's CUE format
-	// Terraform HCL, Helm Chart will also be candidates in the near future.
-	// +optional
-	TemplateType string `json:"templateType,omitempty"`
+	Schematic *Schematic `json:"schematic,omitempty"`
 
 	// Status defines the custom health policy and status message for trait
 	// +optional
@@ -170,6 +190,14 @@ type TraitDefinitionSpec struct {
 	Extension *runtime.RawExtension `json:"extension,omitempty"`
 }
 
+// TraitDefinitionStatus is the status of TraitDefinition
+type TraitDefinitionStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+	ConfigMapRef string `json:"configMapRef,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 
 // A TraitDefinition registers a kind of Kubernetes custom resource as a valid
@@ -177,12 +205,24 @@ type TraitDefinitionSpec struct {
 // to validate the schema of the trait when it is embedded in an OAM
 // ApplicationConfiguration.
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Cluster,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
+// +kubebuilder:subresource:status
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec TraitDefinitionSpec `json:"spec,omitempty"`
+	Spec   TraitDefinitionSpec   `json:"spec,omitempty"`
+	Status TraitDefinitionStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for TraitDefinition
+func (td *TraitDefinition) SetConditions(c ...runtimev1alpha1.Condition) {
+	td.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from TraitDefinition
+func (td *TraitDefinition) GetCondition(conditionType runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
+	return td.Status.GetCondition(conditionType)
 }
 
 // +kubebuilder:object:root=true
@@ -219,7 +259,7 @@ type ScopeDefinitionSpec struct {
 // to validate the schema of the scope when it is embedded in an OAM
 // ApplicationConfiguration.
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Cluster,categories={crossplane,oam}
+// +kubebuilder:resource:scope=Namespaced,categories={crossplane,oam}
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -270,6 +310,10 @@ type ComponentSpec struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Workload runtime.RawExtension `json:"workload"`
 
+	// HelmRelease records a Helm release used by a Helm module workload.
+	// +optional
+	Helm *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.
@@ -277,6 +321,17 @@ type ComponentSpec struct {
 	Parameters []ComponentParameter `json:"parameters,omitempty"`
 }
 
+// A Helm represents resources used by a Helm module
+type Helm struct {
+	// Release records a Helm release used by a Helm module workload.
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Release runtime.RawExtension `json:"release"`
+
+	// HelmRelease records a Helm repository used by a Helm module workload.
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Repository runtime.RawExtension `json:"repository"`
+}
+
 // A ComponentStatus represents the observed state of a Component.
 type ComponentStatus struct {
 	// The generation observed by the component controller.
@@ -296,6 +351,9 @@ type ComponentStatus struct {
 type Revision struct {
 	Name     string `json:"name"`
 	Revision int64  `json:"revision"`
+
+	// RevisionHash record the hash value of the spec of ApplicationRevision object.
+	RevisionHash string `json:"revisionHash,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -412,6 +470,16 @@ type WorkloadTrait struct {
 
 	// 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.
@@ -439,12 +507,11 @@ type WorkloadStatus struct {
 	// ComponentRevisionName of current component
 	ComponentRevisionName string `json:"componentRevisionName,omitempty"`
 
-	// ObservedGeneration indicates the generation observed by the appconfig controller.
-	// The same field is also recorded in the annotations of workloads.
-	// A workload is possible to be deleted from cluster after created.
-	// This field is useful to track the observed generation of workloads after they are
-	// deleted.
-	ObservedGeneration int64 `json:"observedGeneration,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 runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
@@ -468,6 +535,20 @@ type HistoryWorkload struct {
 // A ApplicationStatus represents the state of the entire application.
 type ApplicationStatus string
 
+// 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"
+)
+
 // An ApplicationConfigurationStatus represents the observed state of a
 // ApplicationConfiguration.
 type ApplicationConfigurationStatus struct {
@@ -479,6 +560,9 @@ type ApplicationConfigurationStatus struct {
 
 	Dependency DependencyStatus `json:"dependency,omitempty"`
 
+	// RollingStatus indicates what phase are we in the rollout phase
+	RollingStatus RollingStatus `json:"rollingStatus,omitempty"`
+
 	// Workloads created by this ApplicationConfiguration.
 	Workloads []WorkloadStatus `json:"workloads,omitempty"`
 
@@ -551,8 +635,50 @@ type DataOutput struct {
 	// If no conditions is specified, it is by default to check output value not empty.
 	// +optional
 	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+	// OutputStore specifies the object used to store intermediate data generated by Operations
+	OutputStore StoreReference `json:"outputStore,omitempty"`
 }
 
+// StoreReference specifies the referenced object in DataOutput or DataInput
+type StoreReference struct {
+	runtimev1alpha1.TypedReference `json:",inline"`
+	// Operations specify the data processing operations
+	Operations []DataOperation `json:"operations,omitempty"`
+}
+
+// DataOperation defines the specific operation for data
+type DataOperation struct {
+	// Type specifies the type of DataOperation
+	Type string `json:"type"`
+	// Operator specifies the operation under this DataOperation type
+	Operator DataOperator `json:"op"`
+	// ToFieldPath refers to the value of an object's field
+	ToFieldPath string `json:"toFieldPath"`
+	// ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+	ToDataPath string `json:"toDataPath,omitempty"`
+	// +optional
+	// Value specifies an expected value
+	// This is mutually exclusive with ValueFrom
+	Value string `json:"value,omitempty"`
+	// +optional
+	// ValueFrom specifies expected value from object such as workload and trait
+	// This is mutually exclusive with Value
+	ValueFrom  ValueFrom              `json:"valueFrom,omitempty"`
+	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+}
+
+// DataOperator defines the type of Operator in DataOperation
+type DataOperator string
+
+const (
+	// AddOperator specifies the add operation for data passing
+	AddOperator DataOperator = "add"
+	// DeleteOperator specifies the delete operation for data passing
+	DeleteOperator DataOperator = "delete"
+	// ReplaceOperator specifies the replace operation for data passing
+	ReplaceOperator DataOperator = "replace"
+)
+
 // DataInput specifies a data input sink to an object.
 // If input is array, it will be appended to the target field paths.
 type DataInput struct {
@@ -567,6 +693,12 @@ type DataInput struct {
 	// If StrategyMergeKeys specified, we will check the key in the target array.
 	// If any key exist, do update; if no key exist, append.
 	StrategyMergeKeys []string `json:"strategyMergeKeys,omitempty"`
+
+	// When the Conditions is satified, ToFieldPaths will be filled with passed value
+	Conditions []ConditionRequirement `json:"conditions,omitempty"`
+
+	// InputStore specifies the object used to read intermediate data genereted by DataOutput
+	InputStore StoreReference `json:"inputStore,omitempty"`
 }
 
 // DataInputValueFrom specifies the value source for a data input.

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

@@ -37,6 +37,14 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )
 
+// ComponentDefinition type metadata.
+var (
+	ComponentDefinitionKind             = reflect.TypeOf(ComponentDefinition{}).Name()
+	ComponentDefinitionGroupKind        = schema.GroupKind{Group: Group, Kind: ComponentDefinitionKind}.String()
+	ComponentDefinitionKindAPIVersion   = ComponentDefinitionKind + "." + SchemeGroupVersion.String()
+	ComponentDefinitionGroupVersionKind = SchemeGroupVersion.WithKind(ComponentDefinitionKind)
+)
+
 // WorkloadDefinition type metadata.
 var (
 	WorkloadDefinitionKind             = reflect.TypeOf(WorkloadDefinition{}).Name()
@@ -77,6 +85,14 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )
 
+// ApplicationContext type metadata.
+var (
+	ApplicationContextKind             = reflect.TypeOf(ApplicationContext{}).Name()
+	ApplicationContextGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationContextKind}.String()
+	ApplicationContextKindAPIVersion   = ApplicationContextKind + "." + SchemeGroupVersion.String()
+	ApplicationContextGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationContextKind)
+)
+
 // ContainerizedWorkload type metadata.
 var (
 	ContainerizedWorkloadKind             = reflect.TypeOf(ContainerizedWorkload{}).Name()
@@ -109,15 +125,24 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
-// Application type metadata.
+// AppRollout type metadata.
 var (
-	ApplicationDeploymentKind            = reflect.TypeOf(ApplicationDeployment{}).Name()
-	ApplicationDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: ApplicationDeploymentKind}.String()
-	ApplicationDeploymentKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ApplicationDeploymentKindVersionKind = SchemeGroupVersion.WithKind(ApplicationDeploymentKind)
+	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
+	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
+	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
+	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
+)
+
+// ApplicationRevision type metadata
+var (
+	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
+	ApplicationRevisionGroupKind        = schema.GroupKind{Group: Group, Kind: ApplicationRevisionKind}.String()
+	ApplicationRevisionKindAPIVersion   = ApplicationRevisionKind + "." + SchemeGroupVersion.String()
+	ApplicationRevisionGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationRevisionKind)
 )
 
 func init() {
+	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
 	SchemeBuilder.Register(&TraitDefinition{}, &TraitDefinitionList{})
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
@@ -127,5 +152,7 @@ func init() {
 	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&ApplicationDeployment{}, &ApplicationDeploymentList{})
+	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
+	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
+	SchemeBuilder.Register(&ApplicationContext{}, &ApplicationContextList{})
 }

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

@@ -22,13 +22,115 @@ package v1alpha2
 
 import (
 	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	standard_oam_devv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRollout) DeepCopyInto(out *AppRollout) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
+func (in *AppRollout) DeepCopy() *AppRollout {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRollout)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRollout) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]AppRollout, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
+func (in *AppRolloutList) DeepCopy() *AppRolloutList {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AppRolloutList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
+	*out = *in
+	if in.ComponentList != nil {
+		in, out := &in.ComponentList, &out.ComponentList
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
+	if in.RevertOnDelete != nil {
+		in, out := &in.RevertOnDelete, &out.RevertOnDelete
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
+func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
+	*out = *in
+	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
+func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(AppRolloutStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1alpha1.TypedReference, len(*in))
@@ -41,6 +143,11 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.LatestRevision != nil {
+		in, out := &in.LatestRevision, &out.LatestRevision
+		*out = new(Revision)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -287,26 +394,26 @@ func (in *ApplicationConfigurationStatus) DeepCopy() *ApplicationConfigurationSt
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeployment) DeepCopyInto(out *ApplicationDeployment) {
+func (in *ApplicationContext) DeepCopyInto(out *ApplicationContext) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
+	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeployment.
-func (in *ApplicationDeployment) DeepCopy() *ApplicationDeployment {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContext.
+func (in *ApplicationContext) DeepCopy() *ApplicationContext {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationDeployment)
+	out := new(ApplicationContext)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationDeployment) DeepCopyObject() runtime.Object {
+func (in *ApplicationContext) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -314,31 +421,31 @@ func (in *ApplicationDeployment) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeploymentList) DeepCopyInto(out *ApplicationDeploymentList) {
+func (in *ApplicationContextList) DeepCopyInto(out *ApplicationContextList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]ApplicationDeployment, len(*in))
+		*out = make([]ApplicationContext, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentList.
-func (in *ApplicationDeploymentList) DeepCopy() *ApplicationDeploymentList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContextList.
+func (in *ApplicationContextList) DeepCopy() *ApplicationContextList {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationDeploymentList)
+	out := new(ApplicationContextList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationDeploymentList) DeepCopyObject() runtime.Object {
+func (in *ApplicationContextList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -346,43 +453,16 @@ func (in *ApplicationDeploymentList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeploymentSpec) DeepCopyInto(out *ApplicationDeploymentSpec) {
+func (in *ApplicationContextSpec) DeepCopyInto(out *ApplicationContextSpec) {
 	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-	if in.RevertOnDelete != nil {
-		in, out := &in.RevertOnDelete, &out.RevertOnDelete
-		*out = new(bool)
-		**out = **in
-	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentSpec.
-func (in *ApplicationDeploymentSpec) DeepCopy() *ApplicationDeploymentSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationContextSpec.
+func (in *ApplicationContextSpec) DeepCopy() *ApplicationContextSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(ApplicationDeploymentSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationDeploymentStatus) DeepCopyInto(out *ApplicationDeploymentStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentStatus.
-func (in *ApplicationDeploymentStatus) DeepCopy() *ApplicationDeploymentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationDeploymentStatus)
+	out := new(ApplicationContextSpec)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -419,6 +499,120 @@ func (in *ApplicationList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationRevision) DeepCopyInto(out *ApplicationRevision) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevision.
+func (in *ApplicationRevision) DeepCopy() *ApplicationRevision {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevision)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationRevision) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationRevisionList) DeepCopyInto(out *ApplicationRevisionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ApplicationRevision, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionList.
+func (in *ApplicationRevisionList) DeepCopy() *ApplicationRevisionList {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationRevisionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
+	*out = *in
+	in.Application.DeepCopyInto(&out.Application)
+	if in.ComponentDefinitions != nil {
+		in, out := &in.ComponentDefinitions, &out.ComponentDefinitions
+		*out = make(map[string]ComponentDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.WorkloadDefinitions != nil {
+		in, out := &in.WorkloadDefinitions, &out.WorkloadDefinitions
+		*out = make(map[string]WorkloadDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.TraitDefinitions != nil {
+		in, out := &in.TraitDefinitions, &out.TraitDefinitions
+		*out = make(map[string]TraitDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.ScopeDefinitions != nil {
+		in, out := &in.ScopeDefinitions, &out.ScopeDefinitions
+		*out = make(map[string]ScopeDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]*Component, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(Component)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+	in.ApplicationConfiguration.DeepCopyInto(&out.ApplicationConfiguration)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
+func (in *ApplicationRevisionSpec) DeepCopy() *ApplicationRevisionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	*out = *in
@@ -429,6 +623,11 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.RolloutPlan != nil {
+		in, out := &in.RolloutPlan, &out.RolloutPlan
+		*out = new(standard_oam_devv1alpha1.RolloutPlan)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.
@@ -488,6 +687,21 @@ func (in *CPUResources) DeepCopy() *CPUResources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CUE) DeepCopyInto(out *CUE) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CUE.
+func (in *CUE) DeepCopy() *CUE {
+	if in == nil {
+		return nil
+	}
+	out := new(CUE)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ChildResourceKind) DeepCopyInto(out *ChildResourceKind) {
 	*out = *in
@@ -537,6 +751,119 @@ func (in *Component) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ComponentDefinition) DeepCopyInto(out *ComponentDefinition) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinition.
+func (in *ComponentDefinition) DeepCopy() *ComponentDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ComponentDefinition) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ComponentDefinitionList) DeepCopyInto(out *ComponentDefinitionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ComponentDefinition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionList.
+func (in *ComponentDefinitionList) DeepCopy() *ComponentDefinitionList {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ComponentDefinitionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ComponentDefinitionSpec) DeepCopyInto(out *ComponentDefinitionSpec) {
+	*out = *in
+	out.Workload = in.Workload
+	if in.ChildResourceKinds != nil {
+		in, out := &in.ChildResourceKinds, &out.ChildResourceKinds
+		*out = make([]ChildResourceKind, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Status != nil {
+		in, out := &in.Status, &out.Status
+		*out = new(Status)
+		**out = **in
+	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(Schematic)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Extension != nil {
+		in, out := &in.Extension, &out.Extension
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionSpec.
+func (in *ComponentDefinitionSpec) DeepCopy() *ComponentDefinitionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ComponentDefinitionStatus) DeepCopyInto(out *ComponentDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentDefinitionStatus.
+func (in *ComponentDefinitionStatus) DeepCopy() *ComponentDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ComponentDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentList) DeepCopyInto(out *ComponentList) {
 	*out = *in
@@ -635,6 +962,11 @@ func (in *ComponentScope) DeepCopy() *ComponentScope {
 func (in *ComponentSpec) DeepCopyInto(out *ComponentSpec) {
 	*out = *in
 	in.Workload.DeepCopyInto(&out.Workload)
+	if in.Helm != nil {
+		in, out := &in.Helm, &out.Helm
+		*out = new(Helm)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Parameters != nil {
 		in, out := &in.Parameters, &out.Parameters
 		*out = make([]ComponentParameter, len(*in))
@@ -1072,6 +1404,12 @@ func (in *DataInput) DeepCopyInto(out *DataInput) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]ConditionRequirement, len(*in))
+		copy(*out, *in)
+	}
+	in.InputStore.DeepCopyInto(&out.InputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataInput.
@@ -1099,6 +1437,27 @@ func (in *DataInputValueFrom) DeepCopy() *DataInputValueFrom {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataOperation) DeepCopyInto(out *DataOperation) {
+	*out = *in
+	out.ValueFrom = in.ValueFrom
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]ConditionRequirement, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOperation.
+func (in *DataOperation) DeepCopy() *DataOperation {
+	if in == nil {
+		return nil
+	}
+	out := new(DataOperation)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 	*out = *in
@@ -1107,6 +1466,7 @@ func (in *DataOutput) DeepCopyInto(out *DataOutput) {
 		*out = make([]ConditionRequirement, len(*in))
 		copy(*out, *in)
 	}
+	in.OutputStore.DeepCopyInto(&out.OutputStore)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataOutput.
@@ -1418,6 +1778,23 @@ func (in *HealthScopeStatus) DeepCopy() *HealthScopeStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Helm) DeepCopyInto(out *Helm) {
+	*out = *in
+	in.Release.DeepCopyInto(&out.Release)
+	in.Repository.DeepCopyInto(&out.Repository)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Helm.
+func (in *Helm) DeepCopy() *Helm {
+	if in == nil {
+		return nil
+	}
+	out := new(Helm)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HistoryWorkload) DeepCopyInto(out *HistoryWorkload) {
 	*out = *in
@@ -1556,6 +1933,31 @@ func (in *Revision) DeepCopy() *Revision {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Schematic) DeepCopyInto(out *Schematic) {
+	*out = *in
+	if in.CUE != nil {
+		in, out := &in.CUE, &out.CUE
+		*out = new(CUE)
+		**out = **in
+	}
+	if in.HELM != nil {
+		in, out := &in.HELM, &out.HELM
+		*out = new(Helm)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schematic.
+func (in *Schematic) DeepCopy() *Schematic {
+	if in == nil {
+		return nil
+	}
+	out := new(Schematic)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ScopeDefinition) DeepCopyInto(out *ScopeDefinition) {
 	*out = *in
@@ -1680,6 +2082,29 @@ func (in *Status) DeepCopy() *Status {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *StoreReference) DeepCopyInto(out *StoreReference) {
+	*out = *in
+	out.TypedReference = in.TypedReference
+	if in.Operations != nil {
+		in, out := &in.Operations, &out.Operations
+		*out = make([]DataOperation, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StoreReference.
+func (in *StoreReference) DeepCopy() *StoreReference {
+	if in == nil {
+		return nil
+	}
+	out := new(StoreReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TCPSocketProbe) DeepCopyInto(out *TCPSocketProbe) {
 	*out = *in
@@ -1701,6 +2126,7 @@ func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitDefinition.
@@ -1767,6 +2193,11 @@ func (in *TraitDefinitionSpec) DeepCopyInto(out *TraitDefinitionSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(Schematic)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(Status)
@@ -1789,6 +2220,22 @@ func (in *TraitDefinitionSpec) DeepCopy() *TraitDefinitionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TraitDefinitionStatus) DeepCopyInto(out *TraitDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitDefinitionStatus.
+func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(TraitDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *UnstaifiedDependency) DeepCopyInto(out *UnstaifiedDependency) {
 	*out = *in
@@ -1857,6 +2304,7 @@ func (in *WorkloadDefinition) DeepCopyInto(out *WorkloadDefinition) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadDefinition.
@@ -1925,6 +2373,11 @@ func (in *WorkloadDefinitionSpec) DeepCopyInto(out *WorkloadDefinitionSpec) {
 		*out = new(Status)
 		**out = **in
 	}
+	if in.Schematic != nil {
+		in, out := &in.Schematic, &out.Schematic
+		*out = new(Schematic)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Extension != nil {
 		in, out := &in.Extension, &out.Extension
 		*out = new(runtime.RawExtension)
@@ -1942,6 +2395,37 @@ func (in *WorkloadDefinitionSpec) DeepCopy() *WorkloadDefinitionSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadDefinitionStatus) DeepCopyInto(out *WorkloadDefinitionStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadDefinitionStatus.
+func (in *WorkloadDefinitionStatus) DeepCopy() *WorkloadDefinitionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadDefinitionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadGVK.
+func (in *WorkloadGVK) DeepCopy() *WorkloadGVK {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadGVK)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadHealthCondition) DeepCopyInto(out *WorkloadHealthCondition) {
 	*out = *in
@@ -2015,3 +2499,19 @@ func (in *WorkloadTrait) DeepCopy() *WorkloadTrait {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkloadTypeDescriptor) DeepCopyInto(out *WorkloadTypeDescriptor) {
+	*out = *in
+	out.Definition = in.Definition
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadTypeDescriptor.
+func (in *WorkloadTypeDescriptor) DeepCopy() *WorkloadTypeDescriptor {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkloadTypeDescriptor)
+	in.DeepCopyInto(out)
+	return out
+}

apis/generate.go

@@ -12,7 +12,7 @@
 //go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:trivialVersions=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
 //go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
 
-//go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml ../legacy/charts/vela-core-legacy/crds/standard.oam.dev_routes.yaml
+//go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml
 
 package apis
 

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

@@ -1,121 +0,0 @@
-/*
-
-
-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 (
-	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// Protocol defines network protocols supported for things like container ports.
-type Protocol string
-
-// TriggerType defines the type of trigger
-type TriggerType string
-
-// Autoscaler is the Schema for the autoscalers API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
-type Autoscaler struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   AutoscalerSpec   `json:"spec"`
-	Status AutoscalerStatus `json:"status,omitempty"`
-}
-
-// SetConditions set condition for CR status
-func (as *Autoscaler) SetConditions(c ...v1alpha1.Condition) {
-	as.Status.SetConditions(c...)
-}
-
-// GetCondition get condition from CR status
-func (as *Autoscaler) GetCondition(conditionType v1alpha1.ConditionType) v1alpha1.Condition {
-	return as.Status.GetCondition(conditionType)
-}
-
-// GetWorkloadReference get workload reference
-func (as *Autoscaler) GetWorkloadReference() v1alpha1.TypedReference {
-	return as.Spec.WorkloadReference
-}
-
-// SetWorkloadReference set workload reference
-func (as *Autoscaler) SetWorkloadReference(reference v1alpha1.TypedReference) {
-	as.Spec.WorkloadReference = reference
-}
-
-// Trigger defines the trigger of Autoscaler
-type Trigger struct {
-	// Name is the trigger name, if not set, it will be automatically generated and make it globally unique
-	Name string `json:"name,omitempty"`
-
-	// Type allows value in [cpu/memory/storage/ephemeral-storage、cron、pps、qps/rps、custom]
-	Type TriggerType `json:"type"`
-
-	// Condition set the condition when to trigger scaling
-	Condition map[string]string `json:"condition"`
-}
-
-// AutoscalerSpec defines the desired state of Autoscaler
-type AutoscalerSpec struct {
-	// MinReplicas is the minimal replicas
-	// +optional
-	MinReplicas *int32 `json:"minReplicas,omitempty"`
-
-	// MinReplicas is the maximal replicas
-	// +optional
-	MaxReplicas *int32 `json:"maxReplicas,omitempty"`
-
-	// Triggers lists all triggers
-	Triggers []Trigger `json:"triggers"`
-
-	// TargetWorkload specify the workload which is going to be scaled,
-	// it could be WorkloadReference or the child resource of it
-	TargetWorkload TargetWorkload `json:"targetWorkload,omitempty"`
-
-	// WorkloadReference marks the owner of the workload
-	WorkloadReference v1alpha1.TypedReference `json:"workloadRef,omitempty"`
-}
-
-// TargetWorkload holds the a reference to the scale target Object
-type TargetWorkload struct {
-	Name string `json:"name"`
-	// +optional
-	APIVersion string `json:"apiVersion,omitempty"`
-	// +optional
-	Kind string `json:"kind,omitempty"`
-}
-
-// AutoscalerStatus defines the observed state of Autoscaler
-type AutoscalerStatus struct {
-	v1alpha1.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// AutoscalerList contains a list of Autoscaler
-type AutoscalerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Autoscaler `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&Autoscaler{}, &AutoscalerList{})
-}

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

@@ -1,121 +0,0 @@
-/*
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// MetricsTraitSpec defines the desired state of MetricsTrait
-type MetricsTraitSpec struct {
-	// An endpoint to be monitored by a ServiceMonitor.
-	ScrapeService ScapeServiceEndPoint `json:"scrapeService"`
-	// WorkloadReference to the workload whose metrics needs to be exposed
-	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
-}
-
-// ScapeServiceEndPoint defines a scrapeable endpoint serving Prometheus metrics.
-type ScapeServiceEndPoint struct {
-	// The format of the metrics data,
-	// The default and only supported format is "prometheus" for now
-	Format string `json:"format,omitempty"`
-	// Number or name of the port to access on the pods targeted by the service.
-	// The default is discovered automatically from podTemplate, metricTrait will create a service for the workload
-	TargetPort intstr.IntOrString `json:"port,omitempty"`
-	// Route service traffic to pods with label keys and values matching this
-	// The default is discovered automatically from podTemplate.
-	// If no podTemplate, use the labels specified here, or use the labels of the workload
-	TargetSelector map[string]string `json:"selector,omitempty"`
-	// HTTP path to scrape for metrics.
-	// default is /metrics
-	// +optional
-	Path string `json:"path,omitempty"`
-	// Scheme at which metrics should be scraped
-	// The default and only supported scheme is "http"
-	// +optional
-	Scheme string `json:"scheme,omitempty"`
-	// The default is true
-	// +optional
-	Enabled *bool `json:"enabled,omitempty"`
-}
-
-// MetricsTraitStatus defines the observed state of MetricsTrait
-type MetricsTraitStatus struct {
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-
-	// ServiceMonitorName managed by this trait
-	ServiceMonitorName string `json:"serviceMonitorName,omitempty"`
-
-	// Port is the real port monitoring
-	Port intstr.IntOrString `json:"port,omitempty"`
-	// SelectorLabels is the real labels selected
-	SelectorLabels map[string]string `json:"selectorLabels,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// MetricsTrait is the Schema for the metricstraits API
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type MetricsTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   MetricsTraitSpec   `json:"spec"`
-	Status MetricsTraitStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// MetricsTraitList contains a list of MetricsTrait
-type MetricsTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []MetricsTrait `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&MetricsTrait{}, &MetricsTraitList{})
-}
-
-var _ oam.Trait = &MetricsTrait{}
-
-// SetConditions for set CR condition
-func (tr *MetricsTrait) SetConditions(c ...runtimev1alpha1.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetCondition for get CR condition
-func (tr *MetricsTrait) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return tr.Status.GetCondition(c)
-}
-
-// GetWorkloadReference of this MetricsTrait.
-func (tr *MetricsTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
-	return tr.Spec.WorkloadReference
-}
-
-// SetWorkloadReference of this MetricsTrait.
-func (tr *MetricsTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
-	tr.Spec.WorkloadReference = r
-}

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

@@ -34,9 +34,9 @@ const (
 type RollingState string
 
 const (
-	// VerifyingState verify that the rollout setting is valid and the controller can locate both the
+	// VerifyingSpecState verify that the rollout setting is valid and the controller can locate both the
 	// target and the source
-	VerifyingState RollingState = "verifying"
+	VerifyingSpecState RollingState = "verifyingSpec"
 	// InitializingState rollout is initializing all the new resources
 	InitializingState RollingState = "initializing"
 	// RollingInBatchesState rolling out
@@ -45,6 +45,8 @@ const (
 	FinalisingState RollingState = "finalising"
 	// RolloutSucceedState rollout successfully completed to match the desired target state
 	RolloutSucceedState RollingState = "rolloutSucceed"
+	// RolloutFailingState finalize the rollout before giving up, possibly clean up the old resources, adjust traffic
+	RolloutFailingState RollingState = "rolloutFailing"
 	// RolloutFailedState rollout is failed, the target replica is not reached
 	// we can not move forward anymore
 	// we will let the client to decide when or whether to revert
@@ -73,8 +75,9 @@ const (
 type RolloutPlan struct {
 
 	// RolloutStrategy defines strategies for the rollout plan
+	// The default is IncreaseFirstRolloutStrategyType
 	// +optional
-	RolloutStrategy *RolloutStrategyType `json:"rolloutStrategy,omitempty"`
+	RolloutStrategy RolloutStrategyType `json:"rolloutStrategy,omitempty"`
 
 	// The size of the target resource. The default is the same
 	// as the size of the source resource.
@@ -82,12 +85,11 @@ type RolloutPlan struct {
 	TargetSize *int32 `json:"targetSize,omitempty"`
 
 	// The number of batches, default = 1
-	// mutually exclusive to RolloutBatches
 	// +optional
 	NumBatches *int32 `json:"numBatches,omitempty"`
 
 	// The exact distribution among batches.
-	// mutually exclusive to NumBatches.
+	// 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
@@ -99,7 +101,7 @@ type RolloutPlan struct {
 	// This is designed for the operators to manually rollout
 	// Default is the the number of batches which will rollout all the batches
 	// +optional
-	BatchPartition *int32 `json:"lastBatchToRollout,omitempty"`
+	BatchPartition *int32 `json:"batchPartition,omitempty"`
 
 	// Paused the rollout, default is false
 	// +optional
@@ -161,8 +163,11 @@ type RolloutWebhook struct {
 	// URL address of this webhook
 	URL string `json:"url"`
 
-	// Request timeout for this webhook
-	Timeout string `json:"timeout,omitempty"`
+	// 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
@@ -171,11 +176,14 @@ type RolloutWebhook struct {
 
 // RolloutWebhookPayload holds the info and metadata sent to webhooks
 type RolloutWebhookPayload struct {
-	// ResourceRef refers to the resource we are operating on
-	ResourceRef *runtimev1alpha1.TypedReference `json:"resourceRef"`
+	// Name of the upgrading resource
+	Name string `json:"name"`
 
-	// RolloutRef refers to the rollout that is controlling the rollout
-	RolloutRef *runtimev1alpha1.TypedReference `json:"rolloutRef"`
+	// 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"`
@@ -214,6 +222,10 @@ type RolloutStatus struct {
 	// Conditions represents the latest available observations of a CloneSet's current state.
 	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
+	// RolloutTargetTotalSize is the size of the target resources. This is determined once the initial spec verification
+	// and does not change until the rollout is restarted
+	RolloutTargetTotalSize 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"`
@@ -237,6 +249,6 @@ type RolloutStatus struct {
 	// UpgradedReplicas is the number of Pods upgraded by the rollout controller
 	UpgradedReplicas int32 `json:"upgradedReplicas"`
 
-	// UpgradedReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+	// 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

@@ -39,11 +39,8 @@ const (
 	// FinishedOneBatchEvent indicates that we have successfully rolled out one batch
 	FinishedOneBatchEvent RolloutEvent = "FinishedOneBatchEvent"
 
-	// BatchRolloutContinueEvent indicates that we need to continue to upgrade the pods in the batch
-	BatchRolloutContinueEvent RolloutEvent = "BatchRolloutContinueEvent"
-
-	// BatchRolloutVerifyingEvent indicates that we are waiting for the approval of resume one batch
-	BatchRolloutVerifyingEvent RolloutEvent = "BatchRolloutVerifyingEvent"
+	// 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
@@ -54,31 +51,34 @@ const (
 
 	// BatchRolloutFailedEvent indicates that we are waiting for the approval of the
 	BatchRolloutFailedEvent RolloutEvent = "BatchRolloutFailedEvent"
-
-	// WorkloadModifiedEvent indicates that the res
-	WorkloadModifiedEvent RolloutEvent = "WorkloadModifiedEvent"
 )
 
 // These are valid conditions of the rollout.
 const (
-	// RolloutSpecVerified indicates that the rollout spec matches the resource we have in the cluster
-	RolloutSpecVerified runtimev1alpha1.ConditionType = "RolloutSpecVerified"
-	// RolloutInitialized means all the needed initialization work is done
-	RolloutInitialized runtimev1alpha1.ConditionType = "Initialized"
+	// RolloutSpecVerifying indicates that the rollout just started with verification
+	RolloutSpecVerifying runtimev1alpha1.ConditionType = "RolloutSpecVerifying"
+	// RolloutInitializing means we start to initialize the cluster
+	RolloutInitializing runtimev1alpha1.ConditionType = "RolloutInitializing"
 	// RolloutInProgress means we are upgrading resources.
-	RolloutInProgress runtimev1alpha1.ConditionType = "Ready"
+	RolloutInProgress runtimev1alpha1.ConditionType = "RolloutInProgress"
+	// RolloutFinalizing means the rollout is finalizing
+	RolloutFinalizing runtimev1alpha1.ConditionType = "RolloutFinalizing"
+	// RolloutFailing means the rollout is failing
+	RolloutFailing runtimev1alpha1.ConditionType = "RolloutFailing"
+	// RolloutFailed means that the rollout failed.
+	RolloutFailed runtimev1alpha1.ConditionType = "RolloutFailed"
 	// RolloutSucceed means that the rollout is done.
-	RolloutSucceed runtimev1alpha1.ConditionType = "Succeed"
-	// BatchInitialized
-	BatchInitialized runtimev1alpha1.ConditionType = "BatchInitialized"
-	// BatchInRolled
-	BatchInRolled runtimev1alpha1.ConditionType = "BatchInRolled"
-	// BatchVerified
-	BatchVerified runtimev1alpha1.ConditionType = "BatchVerified"
+	RolloutSucceed runtimev1alpha1.ConditionType = "RolloutSucceed"
+	// BatchInitializing
+	BatchInitializing runtimev1alpha1.ConditionType = "BatchInitializing"
+	// BatchPaused
+	BatchPaused runtimev1alpha1.ConditionType = "BatchPaused"
+	// BatchVerifying
+	BatchVerifying runtimev1alpha1.ConditionType = "BatchVerifying"
 	// BatchRolloutFailed
 	BatchRolloutFailed runtimev1alpha1.ConditionType = "BatchRolloutFailed"
-	// BatchFinalized
-	BatchFinalized runtimev1alpha1.ConditionType = "BatchFinalized"
+	// BatchFinalizing
+	BatchFinalizing runtimev1alpha1.ConditionType = "BatchFinalizing"
 	// BatchReady
 	BatchReady runtimev1alpha1.ConditionType = "BatchReady"
 )
@@ -109,22 +109,25 @@ const invalidBatchRollingStateTransition = "the batch rolling state transition f
 func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType {
 	// figure out which condition type should we put in the condition depends on its state
 	switch r.RollingState {
-	case VerifyingState:
-		return RolloutSpecVerified
+	case VerifyingSpecState:
+		return RolloutSpecVerifying
 
 	case InitializingState:
-		return RolloutInitialized
+		return RolloutInitializing
 
 	case RollingInBatchesState:
 		switch r.BatchRollingState {
 		case BatchInitializingState:
-			return BatchInitialized
+			return BatchInitializing
 
 		case BatchVerifyingState:
-			return BatchVerified
+			return BatchVerifying
 
 		case BatchFinalizingState:
-			return BatchFinalized
+			return BatchFinalizing
+
+		case BatchRolloutFailedState:
+			return BatchRolloutFailed
 
 		case BatchReadyState:
 			return BatchReady
@@ -134,10 +137,19 @@ func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType
 		}
 
 	case FinalisingState:
+		return RolloutFinalizing
+
+	case RolloutFailingState:
+		return RolloutFailing
+
+	case RolloutFailedState:
+		return RolloutFailed
+
+	case RolloutSucceedState:
 		return RolloutSucceed
 
 	default:
-		return RolloutSucceed
+		return RolloutFailed
 	}
 }
 
@@ -147,6 +159,12 @@ func (r *RolloutStatus) RolloutRetry(reason string) {
 	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
 }
 
+// RolloutModified is special state transition as we allow it to happen at any time
+func (r *RolloutStatus) RolloutModified() {
+	r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
+	r.ResetStatus()
+}
+
 // 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
@@ -154,17 +172,66 @@ func (r *RolloutStatus) RolloutFailed(reason string) {
 	r.RollingState = RolloutFailedState
 }
 
+// RolloutFailing is a special state transition that always moves the rollout state to the failing state
+func (r *RolloutStatus) RolloutFailing(reason string) {
+	// set the condition first which depends on the state
+	r.SetConditions(NewNegativeCondition(r.getRolloutConditionType(), reason))
+	r.RollingState = RolloutFailingState
+	r.BatchRollingState = BatchInitializingState
+}
+
+// ResetStatus resets the status of the rollout to start from beginning
+func (r *RolloutStatus) ResetStatus() {
+	r.NewPodTemplateIdentifier = ""
+	r.RolloutTargetTotalSize = -1
+	r.LastAppliedPodTemplateIdentifier = ""
+	r.RollingState = VerifyingSpecState
+	r.BatchRollingState = BatchInitializingState
+	r.CurrentBatch = 0
+	r.UpgradedReplicas = 0
+	r.UpgradedReadyReplicas = 0
+}
+
+// SetRolloutCondition sets the supplied condition, replacing any existing condition
+// of the same type unless they are identical.
+func (r *RolloutStatus) SetRolloutCondition(new runtimev1alpha1.Condition) {
+	exists := false
+	for i, existing := range r.Conditions {
+		if existing.Type != new.Type {
+			continue
+		}
+		// we want to update the condition when the LTT changes
+		if existing.Type == new.Type &&
+			existing.Status == new.Status &&
+			existing.Reason == new.Reason &&
+			existing.Message == new.Message &&
+			existing.LastTransitionTime == new.LastTransitionTime {
+			exists = true
+			continue
+		}
+
+		r.Conditions[i] = new
+		exists = true
+	}
+	if !exists {
+		r.Conditions = append(r.Conditions, new)
+	}
+
+}
+
 // 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 klog.InfoS("try to execute a rollout state transition",
-		"pre rolling state", rollingState,
-		"pre batch rolling state", batchRollingState,
-		"post rolling state", r.RollingState,
-		"post batch rolling state", r.BatchRollingState)
+	defer 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 two types of event
 	if event == RollingFailedEvent || event == RollingRetriableFailureEvent {
@@ -172,18 +239,19 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 	}
 
 	switch rollingState {
-	case VerifyingState:
+	case VerifyingSpecState:
 		if event == RollingSpecVerifiedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = InitializingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case InitializingState:
 		if event == RollingInitializedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RollingInBatchesState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			r.BatchRollingState = BatchInitializingState
 			return
 		}
 		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
@@ -194,34 +262,24 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 
 	case FinalisingState:
 		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.RollingState = RolloutSucceedState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			return
+		}
+		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+
+	case RolloutFailingState:
+		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
+			r.RollingState = RolloutFailedState
 			return
 		}
 		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RolloutSucceedState:
-		if event == WorkloadModifiedEvent {
-			r.RollingState = VerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
-			return
-		}
-		if event == RollingFinalizedEvent {
-			// no op
-			return
-		}
 		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	case RolloutFailedState:
-		if event == WorkloadModifiedEvent {
-			r.RollingState = VerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
-			return
-		}
-		if event == RollingFailedEvent {
-			// no op
-			return
-		}
 		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
 
 	default:
@@ -247,47 +305,41 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchInRollingState:
-		if event == BatchRolloutContinueEvent {
-			// no op
-			return
-		}
-		if event == BatchRolloutVerifyingEvent {
+		if event == RolloutOneBatchEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchVerifyingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchVerifyingState:
 		if event == OneBatchAvailableEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchFinalizingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
-			return
-		}
-		if event == BatchRolloutVerifyingEvent {
-			// no op
 			return
 		}
 		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchFinalizingState:
 		if event == FinishedOneBatchEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchReadyState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		if event == AllBatchFinishedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			// transition out of the batch loop
+			r.BatchRollingState = BatchReadyState
 			r.RollingState = FinalisingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
 			return
 		}
 		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
 
 	case BatchReadyState:
 		if event == BatchRolloutApprovedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
 			r.BatchRollingState = BatchInitializingState
-			r.SetConditions(NewPositiveCondition(r.getRolloutConditionType()))
+			r.CurrentBatch++
 			return
 		}
 		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

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

@@ -1,165 +0,0 @@
-/*
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-// RouteSpec defines the desired state of Route
-type RouteSpec struct {
-	// WorkloadReference to the workload whose metrics needs to be exposed
-	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
-
-	// Host is the host of the route
-	Host string `json:"host"`
-
-	// TLS indicate route trait will create SSL secret using cert-manager with specified issuer
-	// If this is nil, route trait will use a selfsigned issuer
-	TLS *TLS `json:"tls,omitempty"`
-
-	// Rules contain multiple rules of route
-	Rules []Rule `json:"rules,omitempty"`
-
-	// Provider indicate which ingress controller implementation the route trait will use, by default it's nginx-ingress
-	Provider string `json:"provider,omitempty"`
-
-	// IngressClass indicate which ingress class the route trait will use, by default it's nginx
-	IngressClass string `json:"ingressClass,omitempty"`
-}
-
-// Rule defines to route rule
-type Rule struct {
-	// Name will become the suffix of underlying ingress created by this rule, if not, will use index as suffix.
-	Name string `json:"name,omitempty"`
-
-	// Path is location Path, default for "/"
-	Path string `json:"path,omitempty"`
-
-	// RewriteTarget will rewrite request from Path to RewriteTarget path.
-	RewriteTarget string `json:"rewriteTarget,omitempty"`
-
-	// CustomHeaders pass a custom list of headers to the backend service.
-	CustomHeaders map[string]string `json:"customHeaders,omitempty"`
-
-	// DefaultBackend will become the ingress default backend if the backend is not available
-	DefaultBackend *runtimev1alpha1.TypedReference `json:"defaultBackend,omitempty"`
-
-	// Backend indicate how to connect backend service
-	// If it's nil, will auto discovery
-	Backend *Backend `json:"backend,omitempty"`
-}
-
-// TLS defines certificate issuer and type for mTLS configuration
-type TLS struct {
-	IssuerName string `json:"issuerName,omitempty"`
-
-	// Type indicate the issuer is ClusterIssuer or Issuer(namespace issuer), by default, it's Issuer
-	// +kubebuilder:default:=Issuer
-	Type IssuerType `json:"type,omitempty"`
-}
-
-// IssuerType defines the type of issuer
-type IssuerType string
-
-const (
-	// ClusterIssuer is a cluster level type of issuer
-	ClusterIssuer IssuerType = "ClusterIssuer"
-	// NamespaceIssuer is the default one
-	NamespaceIssuer IssuerType = "Issuer"
-)
-
-// Backend defines backend configure for route trait.
-// Route will automatically discover podSpec and label for BackendService.
-// If BackendService is already set, discovery won't work.
-// If BackendService is not set, the discovery mechanism will work.
-type Backend struct {
-	// ReadTimeout used for setting read timeout duration for backend service, the unit is second.
-	ReadTimeout int `json:"readTimeout,omitempty"`
-	// SendTimeout used for setting send timeout duration for backend service, the unit is second.
-	SendTimeout int `json:"sendTimeout,omitempty"`
-	// BackendService specifies the backend K8s service and port, it's optional
-	BackendService *BackendServiceRef `json:"backendService,omitempty"`
-}
-
-// BackendServiceRef specifies the backend K8s service and port, if specified, the two fields are all required
-type BackendServiceRef struct {
-	// Port allow you direct specify backend service port.
-	Port intstr.IntOrString `json:"port"`
-	// ServiceName allow you direct specify K8s service for backend service.
-	ServiceName string `json:"serviceName"`
-}
-
-// RouteStatus defines the observed state of Route
-type RouteStatus struct {
-	Ingresses                         []runtimev1alpha1.TypedReference `json:"ingresses,omitempty"`
-	Service                           *runtimev1alpha1.TypedReference  `json:"service,omitempty"`
-	Status                            string                           `json:"status,omitempty"`
-	runtimev1alpha1.ConditionedStatus `json:",inline"`
-}
-
-// Route is the Schema for the routes API
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type Route struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   RouteSpec   `json:"spec,omitempty"`
-	Status RouteStatus `json:"status,omitempty"`
-}
-
-// RouteList contains a list of Route
-// +kubebuilder:object:root=true
-type RouteList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Route `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&Route{}, &RouteList{})
-}
-
-var _ oam.Trait = &Route{}
-
-// SetConditions set condition for CR status
-func (r *Route) SetConditions(c ...runtimev1alpha1.Condition) {
-	r.Status.SetConditions(c...)
-}
-
-// GetCondition get condition from CR status
-func (r *Route) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
-	return r.Status.GetCondition(c)
-}
-
-// GetWorkloadReference of this Route Trait.
-func (r *Route) GetWorkloadReference() runtimev1alpha1.TypedReference {
-	return r.Spec.WorkloadReference
-}
-
-// SetWorkloadReference of this Route Trait.
-func (r *Route) SetWorkloadReference(rt runtimev1alpha1.TypedReference) {
-	r.Spec.WorkloadReference = rt
-}

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

@@ -26,151 +26,6 @@ import (
 	"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 *Autoscaler) DeepCopyInto(out *Autoscaler) {
-	*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 Autoscaler.
-func (in *Autoscaler) DeepCopy() *Autoscaler {
-	if in == nil {
-		return nil
-	}
-	out := new(Autoscaler)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Autoscaler) 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 *AutoscalerList) DeepCopyInto(out *AutoscalerList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Autoscaler, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerList.
-func (in *AutoscalerList) DeepCopy() *AutoscalerList {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalerList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AutoscalerList) 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 *AutoscalerSpec) DeepCopyInto(out *AutoscalerSpec) {
-	*out = *in
-	if in.MinReplicas != nil {
-		in, out := &in.MinReplicas, &out.MinReplicas
-		*out = new(int32)
-		**out = **in
-	}
-	if in.MaxReplicas != nil {
-		in, out := &in.MaxReplicas, &out.MaxReplicas
-		*out = new(int32)
-		**out = **in
-	}
-	if in.Triggers != nil {
-		in, out := &in.Triggers, &out.Triggers
-		*out = make([]Trigger, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	out.TargetWorkload = in.TargetWorkload
-	out.WorkloadReference = in.WorkloadReference
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerSpec.
-func (in *AutoscalerSpec) DeepCopy() *AutoscalerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalerStatus) DeepCopyInto(out *AutoscalerStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerStatus.
-func (in *AutoscalerStatus) DeepCopy() *AutoscalerStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalerStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Backend) DeepCopyInto(out *Backend) {
-	*out = *in
-	if in.BackendService != nil {
-		in, out := &in.BackendService, &out.BackendService
-		*out = new(BackendServiceRef)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Backend.
-func (in *Backend) DeepCopy() *Backend {
-	if in == nil {
-		return nil
-	}
-	out := new(Backend)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *BackendServiceRef) DeepCopyInto(out *BackendServiceRef) {
-	*out = *in
-	out.Port = in.Port
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendServiceRef.
-func (in *BackendServiceRef) DeepCopy() *BackendServiceRef {
-	if in == nil {
-		return nil
-	}
-	out := new(BackendServiceRef)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // 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
@@ -221,106 +76,6 @@ func (in *MetricsExpectedRange) DeepCopy() *MetricsExpectedRange {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsTrait) DeepCopyInto(out *MetricsTrait) {
-	*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 MetricsTrait.
-func (in *MetricsTrait) DeepCopy() *MetricsTrait {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsTrait)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *MetricsTrait) 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 *MetricsTraitList) DeepCopyInto(out *MetricsTraitList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]MetricsTrait, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsTraitList.
-func (in *MetricsTraitList) DeepCopy() *MetricsTraitList {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsTraitList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *MetricsTraitList) 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 *MetricsTraitSpec) DeepCopyInto(out *MetricsTraitSpec) {
-	*out = *in
-	in.ScrapeService.DeepCopyInto(&out.ScrapeService)
-	out.WorkloadReference = in.WorkloadReference
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsTraitSpec.
-func (in *MetricsTraitSpec) DeepCopy() *MetricsTraitSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsTraitSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsTraitStatus) DeepCopyInto(out *MetricsTraitStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	out.Port = in.Port
-	if in.SelectorLabels != nil {
-		in, out := &in.SelectorLabels, &out.SelectorLabels
-		*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 MetricsTraitStatus.
-func (in *MetricsTraitStatus) DeepCopy() *MetricsTraitStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsTraitStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PodSpecWorkload) DeepCopyInto(out *PodSpecWorkload) {
 	*out = *in
@@ -470,11 +225,6 @@ func (in *RolloutBatch) DeepCopy() *RolloutBatch {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutPlan) DeepCopyInto(out *RolloutPlan) {
 	*out = *in
-	if in.RolloutStrategy != nil {
-		in, out := &in.RolloutStrategy, &out.RolloutStrategy
-		*out = new(RolloutStrategyType)
-		**out = **in
-	}
 	if in.TargetSize != nil {
 		in, out := &in.TargetSize, &out.TargetSize
 		*out = new(int32)
@@ -623,6 +373,11 @@ func (in *RolloutTraitSpec) DeepCopy() *RolloutTraitSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutWebhook) DeepCopyInto(out *RolloutWebhook) {
 	*out = *in
+	if in.ExpectedStatus != nil {
+		in, out := &in.ExpectedStatus, &out.ExpectedStatus
+		*out = make([]int, len(*in))
+		copy(*out, *in)
+	}
 	if in.Metadata != nil {
 		in, out := &in.Metadata, &out.Metadata
 		*out = new(map[string]string)
@@ -649,16 +404,6 @@ func (in *RolloutWebhook) DeepCopy() *RolloutWebhook {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutWebhookPayload) DeepCopyInto(out *RolloutWebhookPayload) {
 	*out = *in
-	if in.ResourceRef != nil {
-		in, out := &in.ResourceRef, &out.ResourceRef
-		*out = new(corev1alpha1.TypedReference)
-		**out = **in
-	}
-	if in.RolloutRef != nil {
-		in, out := &in.RolloutRef, &out.RolloutRef
-		*out = new(corev1alpha1.TypedReference)
-		**out = **in
-	}
 	if in.Metadata != nil {
 		in, out := &in.Metadata, &out.Metadata
 		*out = make(map[string]string, len(*in))
@@ -677,228 +422,3 @@ func (in *RolloutWebhookPayload) DeepCopy() *RolloutWebhookPayload {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Route) DeepCopyInto(out *Route) {
-	*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 Route.
-func (in *Route) DeepCopy() *Route {
-	if in == nil {
-		return nil
-	}
-	out := new(Route)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Route) 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 *RouteList) DeepCopyInto(out *RouteList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Route, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteList.
-func (in *RouteList) DeepCopy() *RouteList {
-	if in == nil {
-		return nil
-	}
-	out := new(RouteList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RouteList) 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 *RouteSpec) DeepCopyInto(out *RouteSpec) {
-	*out = *in
-	out.WorkloadReference = in.WorkloadReference
-	if in.TLS != nil {
-		in, out := &in.TLS, &out.TLS
-		*out = new(TLS)
-		**out = **in
-	}
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]Rule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteSpec.
-func (in *RouteSpec) DeepCopy() *RouteSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RouteSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RouteStatus) DeepCopyInto(out *RouteStatus) {
-	*out = *in
-	if in.Ingresses != nil {
-		in, out := &in.Ingresses, &out.Ingresses
-		*out = make([]corev1alpha1.TypedReference, len(*in))
-		copy(*out, *in)
-	}
-	if in.Service != nil {
-		in, out := &in.Service, &out.Service
-		*out = new(corev1alpha1.TypedReference)
-		**out = **in
-	}
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteStatus.
-func (in *RouteStatus) DeepCopy() *RouteStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(RouteStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Rule) DeepCopyInto(out *Rule) {
-	*out = *in
-	if in.CustomHeaders != nil {
-		in, out := &in.CustomHeaders, &out.CustomHeaders
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.DefaultBackend != nil {
-		in, out := &in.DefaultBackend, &out.DefaultBackend
-		*out = new(corev1alpha1.TypedReference)
-		**out = **in
-	}
-	if in.Backend != nil {
-		in, out := &in.Backend, &out.Backend
-		*out = new(Backend)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Rule.
-func (in *Rule) DeepCopy() *Rule {
-	if in == nil {
-		return nil
-	}
-	out := new(Rule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScapeServiceEndPoint) DeepCopyInto(out *ScapeServiceEndPoint) {
-	*out = *in
-	out.TargetPort = in.TargetPort
-	if in.TargetSelector != nil {
-		in, out := &in.TargetSelector, &out.TargetSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.Enabled != nil {
-		in, out := &in.Enabled, &out.Enabled
-		*out = new(bool)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScapeServiceEndPoint.
-func (in *ScapeServiceEndPoint) DeepCopy() *ScapeServiceEndPoint {
-	if in == nil {
-		return nil
-	}
-	out := new(ScapeServiceEndPoint)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TLS) DeepCopyInto(out *TLS) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
-func (in *TLS) DeepCopy() *TLS {
-	if in == nil {
-		return nil
-	}
-	out := new(TLS)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TargetWorkload) DeepCopyInto(out *TargetWorkload) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TargetWorkload.
-func (in *TargetWorkload) DeepCopy() *TargetWorkload {
-	if in == nil {
-		return nil
-	}
-	out := new(TargetWorkload)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Trigger) DeepCopyInto(out *Trigger) {
-	*out = *in
-	if in.Condition != nil {
-		in, out := &in.Condition, &out.Condition
-		*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 Trigger.
-func (in *Trigger) DeepCopy() *Trigger {
-	if in == nil {
-		return nil
-	}
-	out := new(Trigger)
-	in.DeepCopyInto(out)
-	return out
-}

apis/types/args.go

@@ -3,6 +3,7 @@ package types
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
@@ -10,6 +11,7 @@ import (
 type Args struct {
 	Config *rest.Config
 	Schema *runtime.Scheme
+	Client client.Client
 }
 
 // SetConfig insert kubeconfig into Args
@@ -21,3 +23,21 @@ func (a *Args) SetConfig() error {
 	a.Config = restConf
 	return nil
 }
+
+// GetClient get client if exist
+func (a *Args) GetClient() (client.Client, error) {
+	if a.Config == nil {
+		if err := a.SetConfig(); err != nil {
+			return nil, err
+		}
+	}
+	if a.Client != nil {
+		return a.Client, nil
+	}
+	newClient, err := client.New(a.Config, client.Options{Scheme: a.Schema})
+	if err != nil {
+		return nil, err
+	}
+	a.Client = newClient
+	return a.Client, nil
+}

apis/types/capability.go

@@ -43,7 +43,6 @@ type Capability struct {
 	CueTemplate    string      `json:"template,omitempty"`
 	CueTemplateURI string      `json:"templateURI,omitempty"`
 	Parameters     []Parameter `json:"parameters,omitempty"`
-	DefinitionPath string      `json:"definition"`
 	CrdName        string      `json:"crdName,omitempty"`
 	Center         string      `json:"center,omitempty"`
 	Status         string      `json:"status,omitempty"`
@@ -52,6 +51,9 @@ type Capability struct {
 	// trait only
 	AppliesTo []string `json:"appliesTo,omitempty"`
 
+	// Namespace represents it's a system-level or user-level capability.
+	Namespace string `json:"namespace,omitempty"`
+
 	// Plugin Source
 	Source  *Source       `json:"source,omitempty"`
 	Install *Installation `json:"install,omitempty"`
@@ -78,6 +80,8 @@ type Installation struct {
 type CapType string
 
 const (
+	// TypeComponentDefinition represents OAM ComponentDefinition
+	TypeComponentDefinition CapType = "componentDefinition"
 	// TypeWorkload represents OAM Workload
 	TypeWorkload CapType = "workload"
 	// TypeTrait represents OAM Trait
@@ -86,12 +90,22 @@ const (
 	TypeScope CapType = "scope"
 )
 
+// CapabilityConfigMapNamePrefix is the prefix for capability ConfigMap name
+const CapabilityConfigMapNamePrefix = "schema-"
+
+const (
+	// OpenapiV3JSONSchema is the key to store OpenAPI v3 JSON schema in ConfigMap
+	OpenapiV3JSONSchema string = "openapi-v3-json-schema"
+)
+
 // CapabilityCategory defines the category of a capability
 type CapabilityCategory string
 
 const (
 	// TerraformCategory means the capability is in Terraform format
 	TerraformCategory CapabilityCategory = "terraform"
+	// HelmCategory means the capability is a helm capability
+	HelmCategory CapabilityCategory = "helm"
 )
 
 // Parameter defines a parameter for cli from capability template

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

@@ -50,6 +50,111 @@ spec:
                       items:
                         description: DataInput specifies a data input sink to an object. If input is array, it will be appended to the target field paths.
                         properties:
+                          conditions:
+                            description: When the Conditions is satified, ToFieldPaths will be filled with passed value
+                            items:
+                              description: ConditionRequirement specifies the requirement to match a value.
+                              properties:
+                                fieldPath:
+                                  description: FieldPath specifies got value from workload/trait object
+                                  type: string
+                                op:
+                                  description: ConditionOperator specifies the operator to match a value.
+                                  type: string
+                                value:
+                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                  type: string
+                                valueFrom:
+                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                  properties:
+                                    fieldPath:
+                                      type: string
+                                  required:
+                                  - fieldPath
+                                  type: object
+                              required:
+                              - op
+                              type: object
+                            type: array
+                          inputStore:
+                            description: InputStore specifies the object used to read intermediate data genereted by DataOutput
+                            properties:
+                              apiVersion:
+                                description: APIVersion of the referenced object.
+                                type: string
+                              kind:
+                                description: Kind of the referenced object.
+                                type: string
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              operations:
+                                description: Operations specify the data processing operations
+                                items:
+                                  description: DataOperation defines the specific operation for data
+                                  properties:
+                                    conditions:
+                                      items:
+                                        description: ConditionRequirement specifies the requirement to match a value.
+                                        properties:
+                                          fieldPath:
+                                            description: FieldPath specifies got value from workload/trait object
+                                            type: string
+                                          op:
+                                            description: ConditionOperator specifies the operator to match a value.
+                                            type: string
+                                          value:
+                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                            type: string
+                                          valueFrom:
+                                            description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                            properties:
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                        required:
+                                        - op
+                                        type: object
+                                      type: array
+                                    op:
+                                      description: Operator specifies the operation under this DataOperation type
+                                      type: string
+                                    toDataPath:
+                                      description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+                                      type: string
+                                    toFieldPath:
+                                      description: ToFieldPath refers to the value of an object's field
+                                      type: string
+                                    type:
+                                      description: Type specifies the type of DataOperation
+                                      type: string
+                                    value:
+                                      description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                      type: string
+                                    valueFrom:
+                                      description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
+                                      properties:
+                                        fieldPath:
+                                          type: string
+                                      required:
+                                      - fieldPath
+                                      type: object
+                                  required:
+                                  - op
+                                  - toFieldPath
+                                  - type
+                                  type: object
+                                type: array
+                              uid:
+                                description: UID of the referenced object.
+                                type: string
+                            required:
+                            - apiVersion
+                            - kind
+                            - name
+                            type: object
                           strategyMergeKeys:
                             description: StrategyMergeKeys specifies the merge key if the toFieldPaths target is an array. The StrategyMergeKeys is optional, by default, if the toFieldPaths target is an array, we will append. If StrategyMergeKeys specified, we will check the key in the target array. If any key exist, do update; if no key exist, append.
                             items:
@@ -108,6 +213,85 @@ spec:
                           name:
                             description: Name is the unique name of a DataOutput in an ApplicationConfiguration.
                             type: string
+                          outputStore:
+                            description: OutputStore specifies the object used to store intermediate data generated by Operations
+                            properties:
+                              apiVersion:
+                                description: APIVersion of the referenced object.
+                                type: string
+                              kind:
+                                description: Kind of the referenced object.
+                                type: string
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              operations:
+                                description: Operations specify the data processing operations
+                                items:
+                                  description: DataOperation defines the specific operation for data
+                                  properties:
+                                    conditions:
+                                      items:
+                                        description: ConditionRequirement specifies the requirement to match a value.
+                                        properties:
+                                          fieldPath:
+                                            description: FieldPath specifies got value from workload/trait object
+                                            type: string
+                                          op:
+                                            description: ConditionOperator specifies the operator to match a value.
+                                            type: string
+                                          value:
+                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                            type: string
+                                          valueFrom:
+                                            description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                            properties:
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                        required:
+                                        - op
+                                        type: object
+                                      type: array
+                                    op:
+                                      description: Operator specifies the operation under this DataOperation type
+                                      type: string
+                                    toDataPath:
+                                      description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+                                      type: string
+                                    toFieldPath:
+                                      description: ToFieldPath refers to the value of an object's field
+                                      type: string
+                                    type:
+                                      description: Type specifies the type of DataOperation
+                                      type: string
+                                    value:
+                                      description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                      type: string
+                                    valueFrom:
+                                      description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
+                                      properties:
+                                        fieldPath:
+                                          type: string
+                                      required:
+                                      - fieldPath
+                                      type: object
+                                  required:
+                                  - op
+                                  - toFieldPath
+                                  - type
+                                  type: object
+                                type: array
+                              uid:
+                                description: UID of the referenced object.
+                                type: string
+                            required:
+                            - apiVersion
+                            - kind
+                            - name
+                            type: object
                         type: object
                       type: array
                     parameterValues:
@@ -171,6 +355,111 @@ spec:
                             items:
                               description: DataInput specifies a data input sink to an object. If input is array, it will be appended to the target field paths.
                               properties:
+                                conditions:
+                                  description: When the Conditions is satified, ToFieldPaths will be filled with passed value
+                                  items:
+                                    description: ConditionRequirement specifies the requirement to match a value.
+                                    properties:
+                                      fieldPath:
+                                        description: FieldPath specifies got value from workload/trait object
+                                        type: string
+                                      op:
+                                        description: ConditionOperator specifies the operator to match a value.
+                                        type: string
+                                      value:
+                                        description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                        type: string
+                                      valueFrom:
+                                        description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                        properties:
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                    required:
+                                    - op
+                                    type: object
+                                  type: array
+                                inputStore:
+                                  description: InputStore specifies the object used to read intermediate data genereted by DataOutput
+                                  properties:
+                                    apiVersion:
+                                      description: APIVersion of the referenced object.
+                                      type: string
+                                    kind:
+                                      description: Kind of the referenced object.
+                                      type: string
+                                    name:
+                                      description: Name of the referenced object.
+                                      type: string
+                                    operations:
+                                      description: Operations specify the data processing operations
+                                      items:
+                                        description: DataOperation defines the specific operation for data
+                                        properties:
+                                          conditions:
+                                            items:
+                                              description: ConditionRequirement specifies the requirement to match a value.
+                                              properties:
+                                                fieldPath:
+                                                  description: FieldPath specifies got value from workload/trait object
+                                                  type: string
+                                                op:
+                                                  description: ConditionOperator specifies the operator to match a value.
+                                                  type: string
+                                                value:
+                                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                                  type: string
+                                                valueFrom:
+                                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                                  properties:
+                                                    fieldPath:
+                                                      type: string
+                                                  required:
+                                                  - fieldPath
+                                                  type: object
+                                              required:
+                                              - op
+                                              type: object
+                                            type: array
+                                          op:
+                                            description: Operator specifies the operation under this DataOperation type
+                                            type: string
+                                          toDataPath:
+                                            description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+                                            type: string
+                                          toFieldPath:
+                                            description: ToFieldPath refers to the value of an object's field
+                                            type: string
+                                          type:
+                                            description: Type specifies the type of DataOperation
+                                            type: string
+                                          value:
+                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                            type: string
+                                          valueFrom:
+                                            description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
+                                            properties:
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                        required:
+                                        - op
+                                        - toFieldPath
+                                        - type
+                                        type: object
+                                      type: array
+                                    uid:
+                                      description: UID of the referenced object.
+                                      type: string
+                                  required:
+                                  - apiVersion
+                                  - kind
+                                  - name
+                                  type: object
                                 strategyMergeKeys:
                                   description: StrategyMergeKeys specifies the merge key if the toFieldPaths target is an array. The StrategyMergeKeys is optional, by default, if the toFieldPaths target is an array, we will append. If StrategyMergeKeys specified, we will check the key in the target array. If any key exist, do update; if no key exist, append.
                                   items:
@@ -229,6 +518,85 @@ spec:
                                 name:
                                   description: Name is the unique name of a DataOutput in an ApplicationConfiguration.
                                   type: string
+                                outputStore:
+                                  description: OutputStore specifies the object used to store intermediate data generated by Operations
+                                  properties:
+                                    apiVersion:
+                                      description: APIVersion of the referenced object.
+                                      type: string
+                                    kind:
+                                      description: Kind of the referenced object.
+                                      type: string
+                                    name:
+                                      description: Name of the referenced object.
+                                      type: string
+                                    operations:
+                                      description: Operations specify the data processing operations
+                                      items:
+                                        description: DataOperation defines the specific operation for data
+                                        properties:
+                                          conditions:
+                                            items:
+                                              description: ConditionRequirement specifies the requirement to match a value.
+                                              properties:
+                                                fieldPath:
+                                                  description: FieldPath specifies got value from workload/trait object
+                                                  type: string
+                                                op:
+                                                  description: ConditionOperator specifies the operator to match a value.
+                                                  type: string
+                                                value:
+                                                  description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                                  type: string
+                                                valueFrom:
+                                                  description: ValueFrom specifies expected value from AppConfig This is mutually exclusive with Value
+                                                  properties:
+                                                    fieldPath:
+                                                      type: string
+                                                  required:
+                                                  - fieldPath
+                                                  type: object
+                                              required:
+                                              - op
+                                              type: object
+                                            type: array
+                                          op:
+                                            description: Operator specifies the operation under this DataOperation type
+                                            type: string
+                                          toDataPath:
+                                            description: ToDataPath refers to the value of an object's specfied by ToDataPath. For example the ToDataPath "redis" specifies "redis info" in '{"redis":"redis info"}'
+                                            type: string
+                                          toFieldPath:
+                                            description: ToFieldPath refers to the value of an object's field
+                                            type: string
+                                          type:
+                                            description: Type specifies the type of DataOperation
+                                            type: string
+                                          value:
+                                            description: Value specifies an expected value This is mutually exclusive with ValueFrom
+                                            type: string
+                                          valueFrom:
+                                            description: ValueFrom specifies expected value from object such as workload and trait This is mutually exclusive with Value
+                                            properties:
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                        required:
+                                        - op
+                                        - toFieldPath
+                                        - type
+                                        type: object
+                                      type: array
+                                    uid:
+                                      description: UID of the referenced object.
+                                      type: string
+                                  required:
+                                  - apiVersion
+                                  - kind
+                                  - name
+                                  type: object
                               type: object
                             type: array
                           trait:
@@ -372,6 +740,9 @@ spec:
                 description: The generation observed by the appConfig controller.
                 format: int64
                 type: integer
+              rollingStatus:
+                description: RollingStatus indicates what phase are we in the rollout phase
+                type: string
               status:
                 description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the entire application
                 type: string
@@ -380,16 +751,18 @@ spec:
                 items:
                   description: A WorkloadStatus represents the status of a workload.
                   properties:
+                    appliedComponentRevision:
+                      description: AppliedComponentRevision indicates the applied component revision name of this workload
+                      type: string
                     componentName:
                       description: ComponentName that produced this workload.
                       type: string
                     componentRevisionName:
                       description: ComponentRevisionName of current component
                       type: string
-                    observedGeneration:
-                      description: ObservedGeneration indicates the generation observed by the appconfig controller. The same field is also recorded in the annotations of workloads. A workload is possible to be deleted from cluster after created. This field is useful to track the observed generation of workloads after they are deleted.
-                      format: int64
-                      type: integer
+                    dependencyUnsatisfied:
+                      description: DependencyUnsatisfied notify does the workload has dependency unsatisfied
+                      type: boolean
                     scopes:
                       description: Scopes associated with this workload.
                       items:
@@ -430,6 +803,13 @@ spec:
                       items:
                         description: A WorkloadTrait represents a trait associated with a workload and its status
                         properties:
+                          appliedGeneration:
+                            description: AppliedGeneration indicates the generation observed by the appConfig controller. The same field is also recorded in the annotations of traits. A trait is possible to be deleted from cluster after created. This field is useful to track the observed generation of traits after they are deleted.
+                            format: int64
+                            type: integer
+                          dependencyUnsatisfied:
+                            description: DependencyUnsatisfied notify does the trait has dependency unsatisfied
+                            type: boolean
                           message:
                             description: Message will allow controller to leave some additional information for this trait
                             type: string

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

@@ -0,0 +1,305 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
+  name: applicationcontexts.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ApplicationContext
+    listKind: ApplicationContextList
+    plural: applicationcontexts
+    shortNames:
+    - appcontext
+    singular: applicationcontext
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: ApplicationContext is the Schema for the ApplicationContext API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ApplicationContextSpec is the spec of ApplicationContext
+            properties:
+              applicationRevisionName:
+                description: ApplicationRevisionName points to the snapshot of an Application with all its closure
+                type: string
+            required:
+            - applicationRevisionName
+            type: object
+          status:
+            description: we need to reuse the AC status
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True, False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              dependency:
+                description: DependencyStatus represents the observed state of the dependency of an ApplicationConfiguration.
+                properties:
+                  unsatisfied:
+                    items:
+                      description: UnstaifiedDependency describes unsatisfied dependency flow between one pair of objects.
+                      properties:
+                        from:
+                          description: DependencyFromObject represents the object that dependency data comes from.
+                          properties:
+                            apiVersion:
+                              description: APIVersion of the referenced object.
+                              type: string
+                            fieldPath:
+                              type: string
+                            kind:
+                              description: Kind of the referenced object.
+                              type: string
+                            name:
+                              description: Name of the referenced object.
+                              type: string
+                            uid:
+                              description: UID of the referenced object.
+                              type: string
+                          required:
+                          - apiVersion
+                          - kind
+                          - name
+                          type: object
+                        reason:
+                          type: string
+                        to:
+                          description: DependencyToObject represents the object that dependency data goes to.
+                          properties:
+                            apiVersion:
+                              description: APIVersion of the referenced object.
+                              type: string
+                            fieldPaths:
+                              items:
+                                type: string
+                              type: array
+                            kind:
+                              description: Kind of the referenced object.
+                              type: string
+                            name:
+                              description: Name of the referenced object.
+                              type: string
+                            uid:
+                              description: UID of the referenced object.
+                              type: string
+                          required:
+                          - apiVersion
+                          - kind
+                          - name
+                          type: object
+                      required:
+                      - from
+                      - reason
+                      - to
+                      type: object
+                    type: array
+                type: object
+              historyWorkloads:
+                description: HistoryWorkloads will record history but still working revision workloads.
+                items:
+                  description: HistoryWorkload contain the old component revision that are still running
+                  properties:
+                    revision:
+                      description: Revision of this workload
+                      type: string
+                    workloadRef:
+                      description: Reference to running workload.
+                      properties:
+                        apiVersion:
+                          description: APIVersion of the referenced object.
+                          type: string
+                        kind:
+                          description: Kind of the referenced object.
+                          type: string
+                        name:
+                          description: Name of the referenced object.
+                          type: string
+                        uid:
+                          description: UID of the referenced object.
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      - name
+                      type: object
+                  type: object
+                type: array
+              observedGeneration:
+                description: The generation observed by the appConfig controller.
+                format: int64
+                type: integer
+              rollingStatus:
+                description: RollingStatus indicates what phase are we in the rollout phase
+                type: string
+              status:
+                description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the entire application
+                type: string
+              workloads:
+                description: Workloads created by this ApplicationConfiguration.
+                items:
+                  description: A WorkloadStatus represents the status of a workload.
+                  properties:
+                    appliedComponentRevision:
+                      description: AppliedComponentRevision indicates the applied component revision name of this workload
+                      type: string
+                    componentName:
+                      description: ComponentName that produced this workload.
+                      type: string
+                    componentRevisionName:
+                      description: ComponentRevisionName of current component
+                      type: string
+                    dependencyUnsatisfied:
+                      description: DependencyUnsatisfied notify does the workload has dependency unsatisfied
+                      type: boolean
+                    scopes:
+                      description: Scopes associated with this workload.
+                      items:
+                        description: A WorkloadScope represents a scope associated with a workload and its status
+                        properties:
+                          scopeRef:
+                            description: Reference to a scope created by an ApplicationConfiguration.
+                            properties:
+                              apiVersion:
+                                description: APIVersion of the referenced object.
+                                type: string
+                              kind:
+                                description: Kind of the referenced object.
+                                type: string
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              uid:
+                                description: UID of the referenced object.
+                                type: string
+                            required:
+                            - apiVersion
+                            - kind
+                            - name
+                            type: object
+                          status:
+                            description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the scope
+                            type: string
+                        required:
+                        - scopeRef
+                        type: object
+                      type: array
+                    status:
+                      description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the entire status of the workload
+                      type: string
+                    traits:
+                      description: Traits associated with this workload.
+                      items:
+                        description: A WorkloadTrait represents a trait associated with a workload and its status
+                        properties:
+                          appliedGeneration:
+                            description: AppliedGeneration indicates the generation observed by the appConfig controller. The same field is also recorded in the annotations of traits. A trait is possible to be deleted from cluster after created. This field is useful to track the observed generation of traits after they are deleted.
+                            format: int64
+                            type: integer
+                          dependencyUnsatisfied:
+                            description: DependencyUnsatisfied notify does the trait has dependency unsatisfied
+                            type: boolean
+                          message:
+                            description: Message will allow controller to leave some additional information for this trait
+                            type: string
+                          status:
+                            description: Status is a place holder for a customized controller to fill if it needs a single place to summarize the status of the trait
+                            type: string
+                          traitRef:
+                            description: Reference to a trait created by an ApplicationConfiguration.
+                            properties:
+                              apiVersion:
+                                description: APIVersion of the referenced object.
+                                type: string
+                              kind:
+                                description: Kind of the referenced object.
+                                type: string
+                              name:
+                                description: Name of the referenced object.
+                                type: string
+                              uid:
+                                description: UID of the referenced object.
+                                type: string
+                            required:
+                            - apiVersion
+                            - kind
+                            - name
+                            type: object
+                        required:
+                        - traitRef
+                        type: object
+                      type: array
+                    workloadRef:
+                      description: Reference to a workload created by an ApplicationConfiguration.
+                      properties:
+                        apiVersion:
+                          description: APIVersion of the referenced object.
+                          type: string
+                        kind:
+                          description: Kind of the referenced object.
+                          type: string
+                        name:
+                          description: Name of the referenced object.
+                          type: string
+                        uid:
+                          description: UID of the referenced object.
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      - name
+                      type: object
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -10,6 +10,8 @@ metadata:
 spec:
   group: core.oam.dev
   names:
+    categories:
+    - oam
     kind: Application
     listKind: ApplicationList
     plural: applications
@@ -70,12 +72,233 @@ spec:
                   - 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: APIVersion of the referenced object.
+                              type: string
+                            kind:
+                              description: Kind of the referenced object.
+                              type: string
+                            name:
+                              description: Name of the referenced object.
+                              type: string
+                            uid:
+                              description: UID of the referenced object.
+                              type: string
+                          required:
+                          - apiVersion
+                          - kind
+                          - name
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  numBatches:
+                    description: The number of batches, default = 1
+                    format: int32
+                    type: integer
+                  paused:
+                    description: Paused the rollout, default is false
+                    type: boolean
+                  rolloutBatches:
+                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
+                    items:
+                      description: RolloutBatch is used to describe how the each batch rollout should be
+                      properties:
+                        batchRolloutWebhooks:
+                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
+                          items:
+                            description: RolloutWebhook holds the reference to external checks used for canary analysis
+                            properties:
+                              expectedStatus:
+                                description: ExpectedStatus contains all the expected http status code that we will accept as success
+                                items:
+                                  type: integer
+                                type: array
+                              metadata:
+                                additionalProperties:
+                                  type: string
+                                description: Metadata (key-value pairs) for this webhook
+                                type: object
+                              method:
+                                description: Method the HTTP call method, default is POST
+                                type: string
+                              name:
+                                description: Name of this webhook
+                                type: string
+                              type:
+                                description: Type of this webhook
+                                type: string
+                              url:
+                                description: URL address of this webhook
+                                type: string
+                            required:
+                            - name
+                            - type
+                            - url
+                            type: object
+                          type: array
+                        canaryMetric:
+                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
+                          items:
+                            description: CanaryMetric holds the reference to metrics used for canary analysis
+                            properties:
+                              interval:
+                                description: Interval represents the windows size
+                                type: string
+                              metricsRange:
+                                description: Range value accepted for this metric
+                                properties:
+                                  max:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Maximum value
+                                    x-kubernetes-int-or-string: true
+                                  min:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Minimum value
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              name:
+                                description: Name of the metric
+                                type: string
+                              templateRef:
+                                description: TemplateRef references a metric template object
+                                properties:
+                                  apiVersion:
+                                    description: APIVersion of the referenced object.
+                                    type: string
+                                  kind:
+                                    description: Kind of the referenced object.
+                                    type: string
+                                  name:
+                                    description: Name of the referenced object.
+                                    type: string
+                                  uid:
+                                    description: UID of the referenced object.
+                                    type: string
+                                required:
+                                - apiVersion
+                                - kind
+                                - name
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        instanceInterval:
+                          description: The wait time, in seconds, between instances upgrades, default = 0
+                          format: int32
+                          type: integer
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
+                          x-kubernetes-int-or-string: true
+                        podList:
+                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
+                          items:
+                            type: string
+                          type: array
+                        replicas:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    type: array
+                  rolloutStrategy:
+                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
+                    type: string
+                  rolloutWebhooks:
+                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
+                    items:
+                      description: RolloutWebhook holds the reference to external checks used for canary analysis
+                      properties:
+                        expectedStatus:
+                          description: ExpectedStatus contains all the expected http status code that we will accept as success
+                          items:
+                            type: integer
+                          type: array
+                        metadata:
+                          additionalProperties:
+                            type: string
+                          description: Metadata (key-value pairs) for this webhook
+                          type: object
+                        method:
+                          description: Method the HTTP call method, default is POST
+                          type: string
+                        name:
+                          description: Name of this webhook
+                          type: string
+                        type:
+                          description: Type of this webhook
+                          type: string
+                        url:
+                          description: URL address of this webhook
+                          type: string
+                      required:
+                      - name
+                      - type
+                      - url
+                      type: object
+                    type: array
+                  targetSize:
+                    description: The size of the target resource. The default is the same as the size of the source resource.
+                    format: int32
+                    type: integer
+                type: object
             required:
             - components
             type: object
           status:
             description: AppStatus defines the observed state of Application
             properties:
+              batchRollingState:
+                description: BatchRollingState only meaningful when the Status is rolling
+                type: string
               components:
                 description: Components record the related Components created by Application Controller
                 items:
@@ -127,6 +350,35 @@ spec:
                   - type
                   type: object
                 type: array
+              currentBatch:
+                description: The current batch the rollout is working on/blocked it starts from 0
+                format: int32
+                type: integer
+              lastAppliedPodTemplateIdentifier:
+                description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
+                type: string
+              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
+              rollingState:
+                description: RollingState is the Rollout State
+                type: string
+              rolloutTargetSize:
+                description: RolloutTargetTotalSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
               services:
                 description: Services record the status of the application services
                 items:
@@ -161,6 +413,22 @@ spec:
               status:
                 description: ApplicationPhase is a label for the condition of a application at the current time
                 type: string
+              targetGeneration:
+                description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
+                type: string
+              upgradedReadyReplicas:
+                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                format: int32
+                type: integer
+              upgradedReplicas:
+                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
+                format: int32
+                type: integer
+            required:
+            - currentBatch
+            - rollingState
+            - upgradedReadyReplicas
+            - upgradedReplicas
             type: object
         type: object
     served: true

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

@@ -6,22 +6,22 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
   creationTimestamp: null
-  name: applicationdeployments.core.oam.dev
+  name: approllouts.core.oam.dev
 spec:
   group: core.oam.dev
   names:
     categories:
     - oam
-    kind: ApplicationDeployment
-    listKind: ApplicationDeploymentList
-    plural: applicationdeployments
-    singular: applicationdeployment
+    kind: AppRollout
+    listKind: AppRolloutList
+    plural: approllouts
+    singular: approllout
   scope: Namespaced
   versions:
   - name: v1alpha2
     schema:
       openAPIV3Schema:
-        description: ApplicationDeployment is the Schema for the ApplicationDeployment API
+        description: AppRollout is the Schema for the AppRollout API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -32,7 +32,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ApplicationDeploymentSpec defines how to describe an upgrade between different application
+            description: AppRolloutSpec defines how to describe an upgrade between different apps
             properties:
               componentList:
                 description: 'The list of component to upgrade in the application. We only support single component application so far TODO: (RZ) Support multiple components in an application'
@@ -40,11 +40,15 @@ spec:
                   type: string
                 type: array
               revertOnDelete:
-                description: RevertOnDelete revert the rollout when the rollout CR is deleted, default is false It will remove the target application from the kubernetes
+                description: RevertOnDelete revert the rollout when the rollout CR is deleted It will remove the target app from the kubernetes if it's set to true
                 type: boolean
               rolloutPlan:
                 description: RolloutPlan is the details on how to rollout the resources
                 properties:
+                  batchPartition:
+                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
+                    format: int32
+                    type: integer
                   canaryMetric:
                     description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
                     items:
@@ -96,19 +100,15 @@ spec:
                       - name
                       type: object
                     type: array
-                  lastBatchToRollout:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
                   numBatches:
-                    description: The number of batches, default = 1 mutually exclusive to RolloutBatches
+                    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. mutually exclusive to NumBatches. The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
+                    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:
@@ -117,17 +117,22 @@ spec:
                           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
-                              timeout:
-                                description: Request timeout for this webhook
-                                type: string
                               type:
                                 description: Type of this webhook
                                 type: string
@@ -215,24 +220,29 @@ spec:
                       type: object
                     type: array
                   rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan
+                    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
-                        timeout:
-                          description: Request timeout for this webhook
-                          type: string
                         type:
                           description: Type of this webhook
                           type: string
@@ -250,19 +260,22 @@ spec:
                     format: int32
                     type: integer
                 type: object
-              sourceApplicationName:
-                description: SourceApplicationName contains the name of the application that we need to upgrade from. it can be empty only when it's the first time to deploy the application
+              sourceAppRevisionName:
+                description: SourceAppRevisionName contains the name of the applicationConfiguration that we need to upgrade from. it can be empty only when it's the first time to deploy the application
                 type: string
-              targetApplicationName:
-                description: TargetApplicationName contains the name of the application that we need to upgrade to. We assume that an application is immutable, thus the name alone is suffice
+              targetAppRevisionName:
+                description: TargetAppRevisionName contains the name of the applicationConfiguration that we need to upgrade to. Here we use an applicationConfiguration as a revision of an application, thus the name alone is suffice
                 type: string
             required:
             - rolloutPlan
-            - targetApplicationName
+            - targetAppRevisionName
             type: object
           status:
-            description: ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
+            description: AppRolloutStatus defines the observed state of AppRollout
             properties:
+              LastSourceAppRevision:
+                description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
+                type: string
               batchRollingState:
                 description: BatchRollingState only meaningful when the Status is rolling
                 type: string
@@ -301,20 +314,21 @@ spec:
               lastAppliedPodTemplateIdentifier:
                 description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
                 type: string
-              lastSourceApplicationName:
-                description: LastSourceApplicationName contains the name of the application that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                type: string
-              lastTargetApplicationName:
-                description: LastTargetApplicationName contains the name of the application that we upgraded to We will restart the rollout if this is not the same as the spec
+              lastTargetAppRevision:
+                description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
                 type: string
               rollingState:
                 description: RollingState is the Rollout State
                 type: string
+              rolloutTargetSize:
+                description: RolloutTargetTotalSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
               targetGeneration:
                 description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
                 type: string
               upgradedReadyReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
                 format: int32
                 type: integer
               upgradedReplicas:
@@ -323,7 +337,7 @@ spec:
                 type: integer
             required:
             - currentBatch
-            - lastTargetApplicationName
+            - lastTargetAppRevision
             - rollingState
             - upgradedReadyReplicas
             - upgradedReplicas

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

@@ -0,0 +1,172 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.4
+  creationTimestamp: null
+  name: componentdefinitions.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ComponentDefinition
+    listKind: ComponentDefinitionList
+    plural: componentdefinitions
+    singular: componentdefinition
+  scope: Namespaced
+  versions:
+  - 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
+                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
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -42,6 +42,21 @@ spec:
           spec:
             description: A ComponentSpec defines the desired state of a Component.
             properties:
+              helm:
+                description: HelmRelease records a Helm release used by a Helm module workload.
+                properties:
+                  release:
+                    description: Release records a Helm release used by a Helm module workload.
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  repository:
+                    description: HelmRelease records a Helm repository used by a Helm module workload.
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                required:
+                - release
+                - repository
+                type: object
               parameters:
                 description: Parameters exposed by this component. ApplicationConfigurations that reference this component may specify values for these parameters, which will in turn be injected into the embedded workload.
                 items:
@@ -114,6 +129,9 @@ spec:
                   revision:
                     format: int64
                     type: integer
+                  revisionHash:
+                    description: RevisionHash record the hash value of the spec of ApplicationRevision object.
+                    type: string
                 required:
                 - name
                 - revision

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

@@ -17,7 +17,7 @@ spec:
     listKind: ScopeDefinitionList
     plural: scopedefinitions
     singular: scopedefinition
-  scope: Cluster
+  scope: Namespaced
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.definitionRef.name

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

@@ -17,7 +17,7 @@ spec:
     listKind: TraitDefinitionList
     plural: traitdefinitions
     singular: traitdefinition
-  scope: Cluster
+  scope: Namespaced
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.definitionRef.name
@@ -68,6 +68,34 @@ spec:
               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
+                type: object
               status:
                 description: Status defines the custom health policy and status message for trait
                 properties:
@@ -78,20 +106,50 @@ spec:
                     description: HealthPolicy defines the health check policy for the abstraction
                     type: string
                 type: object
-              template:
-                description: Template defines the abstraction template data of the workload, it will replace the old template in extension field. the data format depends on templateType, by default it's CUE
-                type: string
-              templateType:
-                description: TemplateType defines the data format of the template, by default it's CUE format Terraform HCL, Helm Chart will also be candidates in the near future.
-                type: string
               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
+            type: object
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

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

@@ -17,7 +17,7 @@ spec:
     listKind: WorkloadDefinitionList
     plural: workloaddefinitions
     singular: workloaddefinition
-  scope: Cluster
+  scope: Namespaced
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.definitionRef.name
@@ -82,6 +82,34 @@ spec:
               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
+                type: object
               status:
                 description: Status defines the custom health policy and status message for workload
                 properties:
@@ -92,15 +120,41 @@ spec:
                     description: HealthPolicy defines the health check policy for the abstraction
                     type: string
                 type: object
-              template:
-                description: Template defines the abstraction template data of the workload, it will replace the old template in extension field. the data format depends on templateType, by default it's CUE
-                type: string
-              templateType:
-                description: TemplateType defines the data format of the template, by default it's CUE format Terraform HCL, Helm Chart will also be candidates in the near future.
-                type: string
             required:
             - definitionRef
             type: object
+          status:
+            description: WorkloadDefinitionStatus is the status of WorkloadDefinition
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True, False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
         type: object
     served: true
     storage: true

charts/vela-core/crds/prometheus-operator.yaml

@@ -1,465 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: servicemonitors.monitoring.coreos.com
-spec:
-  group: monitoring.coreos.com
-  names:
-    kind: ServiceMonitor
-    listKind: ServiceMonitorList
-    plural: servicemonitors
-    singular: servicemonitor
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: ServiceMonitor defines monitoring for a set of services.
-        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: Specification of desired Service selection for target discovery
-              by Prometheus.
-            properties:
-              endpoints:
-                description: A list of endpoints allowed as part of this ServiceMonitor.
-                items:
-                  description: Endpoint defines a scrapeable endpoint serving Prometheus
-                    metrics.
-                  properties:
-                    basicAuth:
-                      description: 'BasicAuth allow an endpoint to authenticate over
-                        basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
-                      properties:
-                        password:
-                          description: The secret in the service monitor namespace
-                            that contains the password for authentication.
-                          properties:
-                            key:
-                              description: The key of the secret to select from.  Must
-                                be a valid secret key.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the Secret or its key must
-                                be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                        username:
-                          description: The secret in the service monitor namespace
-                            that contains the username for authentication.
-                          properties:
-                            key:
-                              description: The key of the secret to select from.  Must
-                                be a valid secret key.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the Secret or its key must
-                                be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                      type: object
-                    bearerTokenFile:
-                      description: File to read bearer token for scraping targets.
-                      type: string
-                    bearerTokenSecret:
-                      description: Secret to mount to read bearer token for scraping
-                        targets. The secret needs to be in the same namespace as the
-                        service monitor and accessible by the Prometheus Operator.
-                      properties:
-                        key:
-                          description: The key of the secret to select from.  Must
-                            be a valid secret key.
-                          type: string
-                        name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?'
-                          type: string
-                        optional:
-                          description: Specify whether the Secret or its key must
-                            be defined
-                          type: boolean
-                      required:
-                      - key
-                      type: object
-                    honorLabels:
-                      description: HonorLabels chooses the metric's labels on collisions
-                        with target labels.
-                      type: boolean
-                    honorTimestamps:
-                      description: HonorTimestamps controls whether Prometheus respects
-                        the timestamps present in scraped data.
-                      type: boolean
-                    interval:
-                      description: Interval at which metrics should be scraped
-                      type: string
-                    metricRelabelings:
-                      description: MetricRelabelConfigs to apply to samples before
-                        ingestion.
-                      items:
-                        description: 'RelabelConfig allows dynamic rewriting of the
-                          label set, being applied to samples before ingestion. It
-                          defines `<metric_relabel_configs>`-section of Prometheus
-                          configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                        properties:
-                          action:
-                            description: Action to perform based on regex matching.
-                              Default is 'replace'
-                            type: string
-                          modulus:
-                            description: Modulus to take of the hash of the source
-                              label values.
-                            format: int64
-                            type: integer
-                          regex:
-                            description: Regular expression against which the extracted
-                              value is matched. Default is '(.*)'
-                            type: string
-                          replacement:
-                            description: Replacement value against which a regex replace
-                              is performed if the regular expression matches. Regex
-                              capture groups are available. Default is '$1'
-                            type: string
-                          separator:
-                            description: Separator placed between concatenated source
-                              label values. default is ';'.
-                            type: string
-                          sourceLabels:
-                            description: The source labels select values from existing
-                              labels. Their content is concatenated using the configured
-                              separator and matched against the configured regular
-                              expression for the replace, keep, and drop actions.
-                            items:
-                              type: string
-                            type: array
-                          targetLabel:
-                            description: Label to which the resulting value is written
-                              in a replace action. It is mandatory for replace actions.
-                              Regex capture groups are available.
-                            type: string
-                        type: object
-                      type: array
-                    params:
-                      additionalProperties:
-                        items:
-                          type: string
-                        type: array
-                      description: Optional HTTP URL parameters
-                      type: object
-                    path:
-                      description: HTTP path to scrape for metrics.
-                      type: string
-                    port:
-                      description: Name of the service port this endpoint refers to.
-                        Mutually exclusive with targetPort.
-                      type: string
-                    proxyUrl:
-                      description: ProxyURL eg http://proxyserver:2195 Directs scrapes
-                        to proxy through this endpoint.
-                      type: string
-                    relabelings:
-                      description: 'RelabelConfigs to apply to samples before scraping.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
-                      items:
-                        description: 'RelabelConfig allows dynamic rewriting of the
-                          label set, being applied to samples before ingestion. It
-                          defines `<metric_relabel_configs>`-section of Prometheus
-                          configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                        properties:
-                          action:
-                            description: Action to perform based on regex matching.
-                              Default is 'replace'
-                            type: string
-                          modulus:
-                            description: Modulus to take of the hash of the source
-                              label values.
-                            format: int64
-                            type: integer
-                          regex:
-                            description: Regular expression against which the extracted
-                              value is matched. Default is '(.*)'
-                            type: string
-                          replacement:
-                            description: Replacement value against which a regex replace
-                              is performed if the regular expression matches. Regex
-                              capture groups are available. Default is '$1'
-                            type: string
-                          separator:
-                            description: Separator placed between concatenated source
-                              label values. default is ';'.
-                            type: string
-                          sourceLabels:
-                            description: The source labels select values from existing
-                              labels. Their content is concatenated using the configured
-                              separator and matched against the configured regular
-                              expression for the replace, keep, and drop actions.
-                            items:
-                              type: string
-                            type: array
-                          targetLabel:
-                            description: Label to which the resulting value is written
-                              in a replace action. It is mandatory for replace actions.
-                              Regex capture groups are available.
-                            type: string
-                        type: object
-                      type: array
-                    scheme:
-                      description: HTTP scheme to use for scraping.
-                      type: string
-                    scrapeTimeout:
-                      description: Timeout after which the scrape is ended
-                      type: string
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      description: Name or number of the pod port this endpoint refers
-                        to. Mutually exclusive with port.
-                      x-kubernetes-int-or-string: true
-                    tlsConfig:
-                      description: TLS configuration to use when scraping the endpoint
-                      properties:
-                        ca:
-                          description: Stuct containing the CA cert to use for the
-                            targets.
-                          properties:
-                            configMap:
-                              description: ConfigMap containing data to use for the
-                                targets.
-                              properties:
-                                key:
-                                  description: The key to select.
-                                  type: string
-                                name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
-                                  type: string
-                                optional:
-                                  description: Specify whether the ConfigMap or its
-                                    key must be defined
-                                  type: boolean
-                              required:
-                              - key
-                              type: object
-                            secret:
-                              description: Secret containing data to use for the targets.
-                              properties:
-                                key:
-                                  description: The key of the secret to select from.  Must
-                                    be a valid secret key.
-                                  type: string
-                                name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
-                                  type: string
-                                optional:
-                                  description: Specify whether the Secret or its key
-                                    must be defined
-                                  type: boolean
-                              required:
-                              - key
-                              type: object
-                          type: object
-                        caFile:
-                          description: Path to the CA cert in the Prometheus container
-                            to use for the targets.
-                          type: string
-                        cert:
-                          description: Struct containing the client cert file for
-                            the targets.
-                          properties:
-                            configMap:
-                              description: ConfigMap containing data to use for the
-                                targets.
-                              properties:
-                                key:
-                                  description: The key to select.
-                                  type: string
-                                name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
-                                  type: string
-                                optional:
-                                  description: Specify whether the ConfigMap or its
-                                    key must be defined
-                                  type: boolean
-                              required:
-                              - key
-                              type: object
-                            secret:
-                              description: Secret containing data to use for the targets.
-                              properties:
-                                key:
-                                  description: The key of the secret to select from.  Must
-                                    be a valid secret key.
-                                  type: string
-                                name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
-                                  type: string
-                                optional:
-                                  description: Specify whether the Secret or its key
-                                    must be defined
-                                  type: boolean
-                              required:
-                              - key
-                              type: object
-                          type: object
-                        certFile:
-                          description: Path to the client cert file in the Prometheus
-                            container for the targets.
-                          type: string
-                        insecureSkipVerify:
-                          description: Disable target certificate validation.
-                          type: boolean
-                        keyFile:
-                          description: Path to the client key file in the Prometheus
-                            container for the targets.
-                          type: string
-                        keySecret:
-                          description: Secret containing the client key file for the
-                            targets.
-                          properties:
-                            key:
-                              description: The key of the secret to select from.  Must
-                                be a valid secret key.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the Secret or its key must
-                                be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                        serverName:
-                          description: Used to verify the hostname for the targets.
-                          type: string
-                      type: object
-                  type: object
-                type: array
-              jobLabel:
-                description: The label to use to retrieve the job name from.
-                type: string
-              namespaceSelector:
-                description: Selector to select which namespaces the Endpoints objects
-                  are discovered from.
-                properties:
-                  any:
-                    description: Boolean describing whether all namespaces are selected
-                      in contrast to a list restricting them.
-                    type: boolean
-                  matchNames:
-                    description: List of namespace names.
-                    items:
-                      type: string
-                    type: array
-                type: object
-              podTargetLabels:
-                description: PodTargetLabels transfers labels on the Kubernetes Pod
-                  onto the target.
-                items:
-                  type: string
-                type: array
-              sampleLimit:
-                description: SampleLimit defines per-scrape limit on number of scraped
-                  samples that will be accepted.
-                format: int64
-                type: integer
-              selector:
-                description: Selector to select Endpoints objects.
-                properties:
-                  matchExpressions:
-                    description: matchExpressions is a list of label selector requirements.
-                      The requirements are ANDed.
-                    items:
-                      description: A label selector requirement is a selector that
-                        contains values, a key, and an operator that relates the key
-                        and values.
-                      properties:
-                        key:
-                          description: key is the label key that the selector applies
-                            to.
-                          type: string
-                        operator:
-                          description: operator represents a key's relationship to
-                            a set of values. Valid operators are In, NotIn, Exists
-                            and DoesNotExist.
-                          type: string
-                        values:
-                          description: values is an array of string values. If the
-                            operator is In or NotIn, the values array must be non-empty.
-                            If the operator is Exists or DoesNotExist, the values
-                            array must be empty. This array is replaced during a strategic
-                            merge patch.
-                          items:
-                            type: string
-                          type: array
-                      required:
-                      - key
-                      - operator
-                      type: object
-                    type: array
-                  matchLabels:
-                    additionalProperties:
-                      type: string
-                    description: matchLabels is a map of {key,value} pairs. A single
-                      {key,value} in the matchLabels map is equivalent to an element
-                      of matchExpressions, whose key field is "key", the operator
-                      is "In", and the values array contains only "value". The requirements
-                      are ANDed.
-                    type: object
-                type: object
-              targetLabels:
-                description: TargetLabels transfers labels on the Kubernetes Service
-                  onto the target.
-                items:
-                  type: string
-                type: array
-            required:
-            - endpoints
-            - selector
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/vela-core/crds/standard.oam.dev_autoscalers.yaml

@@ -1,143 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: autoscalers.standard.oam.dev
-spec:
-  group: standard.oam.dev
-  names:
-    categories:
-    - oam
-    kind: Autoscaler
-    listKind: AutoscalerList
-    plural: autoscalers
-    singular: autoscaler
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: Autoscaler is the Schema for the autoscalers 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: AutoscalerSpec defines the desired state of Autoscaler
-            properties:
-              maxReplicas:
-                description: MinReplicas is the maximal replicas
-                format: int32
-                type: integer
-              minReplicas:
-                description: MinReplicas is the minimal replicas
-                format: int32
-                type: integer
-              targetWorkload:
-                description: TargetWorkload specify the workload which is going to be scaled, it could be WorkloadReference or the child resource of it
-                properties:
-                  apiVersion:
-                    type: string
-                  kind:
-                    type: string
-                  name:
-                    type: string
-                required:
-                - name
-                type: object
-              triggers:
-                description: Triggers lists all triggers
-                items:
-                  description: Trigger defines the trigger of Autoscaler
-                  properties:
-                    condition:
-                      additionalProperties:
-                        type: string
-                      description: Condition set the condition when to trigger scaling
-                      type: object
-                    name:
-                      description: Name is the trigger name, if not set, it will be automatically generated and make it globally unique
-                      type: string
-                    type:
-                      description: Type allows value in [cpu/memory/storage/ephemeral-storage、cron、pps、qps/rps、custom]
-                      type: string
-                  required:
-                  - condition
-                  - type
-                  type: object
-                type: array
-              workloadRef:
-                description: WorkloadReference marks the owner of the workload
-                properties:
-                  apiVersion:
-                    description: APIVersion of the referenced object.
-                    type: string
-                  kind:
-                    description: Kind of the referenced object.
-                    type: string
-                  name:
-                    description: Name of the referenced object.
-                    type: string
-                  uid:
-                    description: UID of the referenced object.
-                    type: string
-                required:
-                - apiVersion
-                - kind
-                - name
-                type: object
-            required:
-            - triggers
-            type: object
-          status:
-            description: AutoscalerStatus defines the observed state of Autoscaler
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True, False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/vela-core/crds/standard.oam.dev_metricstraits.yaml

@@ -1,145 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: metricstraits.standard.oam.dev
-spec:
-  group: standard.oam.dev
-  names:
-    categories:
-    - oam
-    kind: MetricsTrait
-    listKind: MetricsTraitList
-    plural: metricstraits
-    singular: metricstrait
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: MetricsTrait is the Schema for the metricstraits 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: MetricsTraitSpec defines the desired state of MetricsTrait
-            properties:
-              scrapeService:
-                description: An endpoint to be monitored by a ServiceMonitor.
-                properties:
-                  enabled:
-                    description: The default is true
-                    type: boolean
-                  format:
-                    description: The format of the metrics data, The default and only supported format is "prometheus" for now
-                    type: string
-                  path:
-                    description: HTTP path to scrape for metrics. default is /metrics
-                    type: string
-                  port:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    description: Number or name of the port to access on the pods targeted by the service. The default is discovered automatically from podTemplate, metricTrait will create a service for the workload
-                    x-kubernetes-int-or-string: true
-                  scheme:
-                    description: Scheme at which metrics should be scraped The default and only supported scheme is "http"
-                    type: string
-                  selector:
-                    additionalProperties:
-                      type: string
-                    description: Route service traffic to pods with label keys and values matching this The default is discovered automatically from podTemplate. If no podTemplate, use the labels specified here, or use the labels of the workload
-                    type: object
-                type: object
-              workloadRef:
-                description: WorkloadReference to the workload whose metrics needs to be exposed
-                properties:
-                  apiVersion:
-                    description: APIVersion of the referenced object.
-                    type: string
-                  kind:
-                    description: Kind of the referenced object.
-                    type: string
-                  name:
-                    description: Name of the referenced object.
-                    type: string
-                  uid:
-                    description: UID of the referenced object.
-                    type: string
-                required:
-                - apiVersion
-                - kind
-                - name
-                type: object
-            required:
-            - scrapeService
-            type: object
-          status:
-            description: MetricsTraitStatus defines the observed state of MetricsTrait
-            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
-              port:
-                anyOf:
-                - type: integer
-                - type: string
-                description: Port is the real port monitoring
-                x-kubernetes-int-or-string: true
-              selectorLabels:
-                additionalProperties:
-                  type: string
-                description: SelectorLabels is the real labels selected
-                type: object
-              serviceMonitorName:
-                description: ServiceMonitorName managed by this trait
-                type: string
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/vela-core/crds/standard.oam.dev_rollouttraits.yaml

@@ -35,6 +35,10 @@ spec:
               rolloutPlan:
                 description: RolloutPlan is the details on how to rollout the resources
                 properties:
+                  batchPartition:
+                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
+                    format: int32
+                    type: integer
                   canaryMetric:
                     description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
                     items:
@@ -86,19 +90,15 @@ spec:
                       - name
                       type: object
                     type: array
-                  lastBatchToRollout:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
                   numBatches:
-                    description: The number of batches, default = 1 mutually exclusive to RolloutBatches
+                    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. mutually exclusive to NumBatches. The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
+                    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:
@@ -107,17 +107,22 @@ spec:
                           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
-                              timeout:
-                                description: Request timeout for this webhook
-                                type: string
                               type:
                                 description: Type of this webhook
                                 type: string
@@ -205,24 +210,29 @@ spec:
                       type: object
                     type: array
                   rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan
+                    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
-                        timeout:
-                          description: Request timeout for this webhook
-                          type: string
                         type:
                           description: Type of this webhook
                           type: string
@@ -331,11 +341,15 @@ spec:
               rollingState:
                 description: RollingState is the Rollout State
                 type: string
+              rolloutTargetSize:
+                description: RolloutTargetTotalSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
               targetGeneration:
                 description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
                 type: string
               upgradedReadyReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
+                description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
                 format: int32
                 type: integer
               upgradedReplicas:

charts/vela-core/crds/standard.oam.dev_routes.yaml

@@ -1,232 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: routes.standard.oam.dev
-spec:
-  group: standard.oam.dev
-  names:
-    categories:
-    - oam
-    kind: Route
-    listKind: RouteList
-    plural: routes
-    singular: route
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: Route is the Schema for the routes 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: RouteSpec defines the desired state of Route
-            properties:
-              host:
-                description: Host is the host of the route
-                type: string
-              ingressClass:
-                description: IngressClass indicate which ingress class the route trait will use, by default it's nginx
-                type: string
-              provider:
-                description: Provider indicate which ingress controller implementation the route trait will use, by default it's nginx-ingress
-                type: string
-              rules:
-                description: Rules contain multiple rules of route
-                items:
-                  description: Rule defines to route rule
-                  properties:
-                    backend:
-                      description: Backend indicate how to connect backend service If it's nil, will auto discovery
-                      properties:
-                        backendService:
-                          description: BackendService specifies the backend K8s service and port, it's optional
-                          properties:
-                            port:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Port allow you direct specify backend service port.
-                              x-kubernetes-int-or-string: true
-                            serviceName:
-                              description: ServiceName allow you direct specify K8s service for backend service.
-                              type: string
-                          required:
-                          - port
-                          - serviceName
-                          type: object
-                        readTimeout:
-                          description: ReadTimeout used for setting read timeout duration for backend service, the unit is second.
-                          type: integer
-                        sendTimeout:
-                          description: SendTimeout used for setting send timeout duration for backend service, the unit is second.
-                          type: integer
-                      type: object
-                    customHeaders:
-                      additionalProperties:
-                        type: string
-                      description: CustomHeaders pass a custom list of headers to the backend service.
-                      type: object
-                    defaultBackend:
-                      description: DefaultBackend will become the ingress default backend if the backend is not available
-                      properties:
-                        apiVersion:
-                          description: APIVersion of the referenced object.
-                          type: string
-                        kind:
-                          description: Kind of the referenced object.
-                          type: string
-                        name:
-                          description: Name of the referenced object.
-                          type: string
-                        uid:
-                          description: UID of the referenced object.
-                          type: string
-                      required:
-                      - apiVersion
-                      - kind
-                      - name
-                      type: object
-                    name:
-                      description: Name will become the suffix of underlying ingress created by this rule, if not, will use index as suffix.
-                      type: string
-                    path:
-                      description: Path is location Path, default for "/"
-                      type: string
-                    rewriteTarget:
-                      description: RewriteTarget will rewrite request from Path to RewriteTarget path.
-                      type: string
-                  type: object
-                type: array
-              tls:
-                description: TLS indicate route trait will create SSL secret using cert-manager with specified issuer If this is nil, route trait will use a selfsigned issuer
-                properties:
-                  issuerName:
-                    type: string
-                  type:
-                    default: Issuer
-                    description: Type indicate the issuer is ClusterIssuer or Issuer(namespace issuer), by default, it's Issuer
-                    type: string
-                type: object
-              workloadRef:
-                description: WorkloadReference to the workload whose metrics needs to be exposed
-                properties:
-                  apiVersion:
-                    description: APIVersion of the referenced object.
-                    type: string
-                  kind:
-                    description: Kind of the referenced object.
-                    type: string
-                  name:
-                    description: Name of the referenced object.
-                    type: string
-                  uid:
-                    description: UID of the referenced object.
-                    type: string
-                required:
-                - apiVersion
-                - kind
-                - name
-                type: object
-            required:
-            - host
-            type: object
-          status:
-            description: RouteStatus defines the observed state of Route
-            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
-              ingresses:
-                items:
-                  description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
-                  properties:
-                    apiVersion:
-                      description: APIVersion of the referenced object.
-                      type: string
-                    kind:
-                      description: Kind of the referenced object.
-                      type: string
-                    name:
-                      description: Name of the referenced object.
-                      type: string
-                    uid:
-                      description: UID of the referenced object.
-                      type: string
-                  required:
-                  - apiVersion
-                  - kind
-                  - name
-                  type: object
-                type: array
-              service:
-                description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference cluster-scoped objects or objects where the namespace is already known.
-                properties:
-                  apiVersion:
-                    description: APIVersion of the referenced object.
-                    type: string
-                  kind:
-                    description: Kind of the referenced object.
-                    type: string
-                  name:
-                    description: Name of the referenced object.
-                    type: string
-                  uid:
-                    description: UID of the referenced object.
-                    type: string
-                required:
-                - apiVersion
-                - kind
-                - name
-                type: object
-              status:
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -0,0 +1,21 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled .Values.rbac.create (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission
+    {{- include "kubevela.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - admissionregistration.k8s.io
+    resources:
+      - validatingwebhookconfigurations
+      - mutatingwebhookconfigurations
+    verbs:
+      - get
+      - update
+{{- end }}

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

@@ -0,0 +1,20 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled .Values.rbac.create (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission
+    {{- include "kubevela.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "kubevela.fullname" . }}-admission
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kubevela.fullname" . }}-admission
+    namespace: {{ .Release.Namespace }}
+{{- end }}

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

@@ -0,0 +1,50 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission-create
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission-create
+    {{- include "kubevela.labels" . | nindent 4 }}
+spec:
+  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
+  # Alpha feature since k8s 1.12
+  ttlSecondsAfterFinished: 0
+  {{- end }}
+  template:
+    metadata:
+      name:  {{ template "kubevela.fullname" . }}-admission-create
+      labels:
+        app: {{ template "kubevela.name" . }}-admission-create
+        {{- include "kubevela.labels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: create
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
+          args:
+            - create
+            - --host={{ template "kubevela.name" . }}-webhook,{{ template "kubevela.name" . }}-webhook.{{ .Release.Namespace }}.svc
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ template "kubevela.fullname" . }}-admission
+            - --key-name=tls.key
+            - --cert-name=tls.crt
+      restartPolicy: OnFailure
+      serviceAccountName: {{ template "kubevela.fullname" . }}-admission
+      {{- with .Values.admissionWebhooks.patch.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.admissionWebhooks.patch.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+{{- end }}

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

@@ -0,0 +1,49 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission-patch
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission-patch
+    {{- include "kubevela.labels" . | nindent 4 }}
+spec:
+  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
+  # Alpha feature since k8s 1.12
+  ttlSecondsAfterFinished: 0
+  {{- end }}
+  template:
+    metadata:
+      name:  {{ template "kubevela.fullname" . }}-admission-patch
+      labels:
+        app: {{ template "kubevela.name" . }}-admission-patch
+        {{- include "kubevela.labels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: patch
+          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
+          args:
+            - patch
+            - --webhook-name={{ template "kubevela.fullname" . }}-admission
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ template "kubevela.fullname" . }}-admission
+            - --patch-failure-policy={{ .Values.admissionWebhooks.failurePolicy }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ template "kubevela.fullname" . }}-admission
+      {{- with .Values.admissionWebhooks.patch.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.admissionWebhooks.patch.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+{{- end }}

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

@@ -0,0 +1,21 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled .Values.rbac.create (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission
+    {{- include "kubevela.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - create
+{{- end }}

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

@@ -0,0 +1,21 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled .Values.rbac.create (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission
+    {{- include "kubevela.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ template "kubevela.fullname" . }}-admission
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kubevela.fullname" . }}-admission
+    namespace: {{ .Release.Namespace }}
+{{- end }}

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

@@ -0,0 +1,13 @@
+{{- if and .Values.admissionWebhooks.enabled .Values.admissionWebhooks.patch.enabled .Values.rbac.create (not .Values.admissionWebhooks.certManager.enabled) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name:  {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ template "kubevela.name" . }}-admission
+    {{- include "kubevela.labels" . | nindent 4 }}
+{{- end }}

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

@@ -0,0 +1,135 @@
+{{- if .Values.admissionWebhooks.enabled -}}
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.admissionWebhooks.certManager.enabled }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "kubevela.fullname" .) | quote }}
+  {{- end }}
+webhooks:
+  - 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
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - applicationconfigurations
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    timeoutSeconds: 5
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /mutating-core-oam-dev-v1alpha2-approllout
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: Fail
+    {{- end }}
+    name: mutating.core.oam.dev.v1alpha2.approllouts
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - approllouts
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    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: Fails
+    {{- end }}
+    name: mutating.core.oam-dev.v1alpha2.components
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - components
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    timeoutSeconds: 5
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /mutate-standard-oam-dev-v1alpha1-metricstrait
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: Fails
+    {{- end }}
+    name: mmetricstrait.kb.io
+    rules:
+      - apiGroups:
+          - standard.oam.dev
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - metricstraits
+  - 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: Fails
+    {{- end }}
+    name: mcontainerized.kb.io
+    rules:
+      - apiGroups:
+          - standard.oam.dev
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - podspecworkloads
+
+{{- end -}}

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

@@ -0,0 +1,158 @@
+{{- if .Values.admissionWebhooks.enabled -}}
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.admissionWebhooks.certManager.enabled }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "kubevela.fullname" .) | quote }}
+  {{- end }}
+webhooks:
+  - 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
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - applicationconfigurations
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    timeoutSeconds: 5
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validating-core-oam-dev-v1alpha2-approllout
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
+    {{- end }}
+    name: validating.core.oam.dev.v1alpha2.approllouts
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - approllouts
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    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
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - components
+        scope: Namespaced
+    admissionReviewVersions:
+      - v1beta1
+    timeoutSeconds: 5
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validating-core-oam-dev-v1alpha2-traitdefinitions
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
+    {{- end }}
+    name: validating.core.oam.dev.v1alpha2.traitdefinitions
+    rules:
+      - apiGroups:
+          - core.oam.dev
+        apiVersions:
+          - v1alpha2
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - traitdefinitions
+        scope: Cluster
+    admissionReviewVersions:
+      - v1beta1
+    timeoutSeconds: 5
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: {{ template "kubevela.name" . }}-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validate-standard-oam-dev-v1alpha1-metricstrait
+    {{- if .Values.admissionWebhooks.patch.enabled  }}
+    failurePolicy: Ignore
+    {{- else }}
+    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
+    {{- end }}
+    name: vmetricstrait.kb.io
+    rules:
+      - apiGroups:
+          - standard.oam.dev
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - metricstraits
+  - 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
+    rules:
+      - apiGroups:
+          - standard.oam.dev
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - podspecworkloads
+
+{{- end -}}

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

@@ -0,0 +1,19 @@
+{{- if .Values.admissionWebhooks.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "kubevela.name" . }}-webhook
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubevela.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.webhookService.type }}
+  ports:
+    - port: 443
+      targetPort: {{ .Values.webhookService.port }}
+      protocol: TCP
+      name: https
+  selector:
+    {{ include "kubevela.selectorLabels" . | nindent 6 }}
+
+{{- end -}}

charts/vela-core/templates/certmanager.yaml

@@ -0,0 +1,53 @@
+{{- if and .Values.admissionWebhooks.certManager.enabled -}}
+
+# The following manifests contain a self-signed issuer CR and a certificate CR.
+# More document can be found at https://docs.cert-manager.io
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ template "kubevela.fullname" . }}-self-signed-issuer
+spec:
+  selfSigned: {}
+
+---
+# Generate a CA Certificate used to sign certificates for the webhook
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ template "kubevela.fullname" . }}-root-cert
+spec:
+  secretName: {{ template "kubevela.fullname" . }}-root-cert
+  duration: 43800h # 5y
+  issuerRef:
+    name: {{ template "kubevela.fullname" . }}-self-signed-issuer
+  commonName: "ca.webhook.kubevela"
+  isCA: true
+  
+---
+# Create an Issuer that uses the above generated CA certificate to issue certs
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ template "kubevela.fullname" . }}-root-issuer
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: {{ template "kubevela.fullname" . }}-root-cert
+
+---
+# generate a serving certificate for the apiservices to use
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ template "kubevela.fullname" . }}-admission
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: {{ template "kubevela.fullname" . }}-admission
+  duration: 8760h # 1y
+  issuerRef:
+    name: {{ template "kubevela.fullname" . }}-root-issuer
+  dnsNames:
+    - {{ template "kubevela.name" . }}-webhook.{{ .Release.Namespace }}.svc
+    - {{ template "kubevela.name" . }}-webhook.{{ .Release.Namespace }}.svc.cluster.local
+
+{{- end }}

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

@@ -2,6 +2,7 @@ apiVersion: core.oam.dev/v1alpha2
 kind: WorkloadDefinition
 metadata:
   name: containerizedworkloads.core.oam.dev
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   definitionRef:
     name: containerizedworkloads.core.oam.dev

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

@@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1alpha2
 kind: ScopeDefinition
 metadata:
   name: healthscopes.core.oam.dev
-  namespace: default
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   workloadRefsPath: spec.workloadRefs
   allowComponentOverlap: true

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

@@ -6,6 +6,7 @@ metadata:
     definition.oam.dev/description: "Configures K8s ingress and service to enable web traffic for your service.
     Please use route trait in cap center for advanced usage."
   name: ingress
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   status:
     customStatus: |-
@@ -20,50 +21,52 @@ spec:
   appliesToWorkloads:
     - webservice
     - worker
-  template: |
-    parameter: {
-    	domain: string
-    	http: [string]: int
-    }
-    
-    // trait template can have multiple outputs in one trait
-    outputs: service: {
-    	apiVersion: "v1"
-    	kind:       "Service"
-    	metadata:
-    		name: context.name
-    	spec: {
-    		selector:
-    			"app.oam.dev/component": context.name
-    		ports: [
-    			for k, v in parameter.http {
-    				port:       v
-    				targetPort: v
-    			},
-    		]
-    	}
-    }
-    
-    outputs: ingress: {
-    	apiVersion: "networking.k8s.io/v1beta1"
-    	kind:       "Ingress"
-    	metadata:
-    		name: context.name
-    	spec: {
-    		rules: [{
-    			host: parameter.domain
-    			http: {
-    				paths: [
-    					for k, v in parameter.http {
-    						path: k
-    						backend: {
-    							serviceName: context.name
-    							servicePort: v
-    						}
-    					},
-    				]
-    			}
-    		}]
-    	}
-    }
-    
+  schematic:
+    cue:
+      template: |
+        parameter: {
+        	domain: string
+        	http: [string]: int
+        }
+        
+        // trait template can have multiple outputs in one trait
+        outputs: service: {
+        	apiVersion: "v1"
+        	kind:       "Service"
+        	metadata:
+        		name: context.name
+        	spec: {
+        		selector:
+        			"app.oam.dev/component": context.name
+        		ports: [
+        			for k, v in parameter.http {
+        				port:       v
+        				targetPort: v
+        			},
+        		]
+        	}
+        }
+        
+        outputs: ingress: {
+        	apiVersion: "networking.k8s.io/v1beta1"
+        	kind:       "Ingress"
+        	metadata:
+        		name: context.name
+        	spec: {
+        		rules: [{
+        			host: parameter.domain
+        			http: {
+        				paths: [
+        					for k, v in parameter.http {
+        						path: k
+        						backend: {
+        							serviceName: context.name
+        							servicePort: v
+        						}
+        					},
+        				]
+        			}
+        		}]
+        	}
+        }
+        

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

@@ -5,6 +5,7 @@ metadata:
   annotations:
     definition.oam.dev/description: "Configures replicas for your service."
   name: scaler
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
     - webservice
@@ -12,17 +13,19 @@ spec:
   definitionRef:
     name: manualscalertraits.core.oam.dev
   workloadRefPath: spec.workloadRef
-  template: |
-    output: {
-    	apiVersion: "core.oam.dev/v1alpha2"
-    	kind:       "ManualScalerTrait"
-    	spec: {
-    		replicaCount: parameter.replicas
-    	}
-    }
-    parameter: {
-    	//+short=r
-    	//+usage=Replicas of the workload
-    	replicas: *1 | int
-    }
-    
+  schematic:
+    cue:
+      template: |
+        outputs: scaler: {
+        	apiVersion: "core.oam.dev/v1alpha2"
+        	kind:       "ManualScalerTrait"
+        	spec: {
+        		replicaCount: parameter.replicas
+        	}
+        }
+        parameter: {
+        	//+short=r
+        	//+usage=Replicas of the workload
+        	replicas: *1 | int
+        }
+        

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

@@ -1,46 +1,51 @@
 # Code generated by KubeVela templates. DO NOT EDIT.
 apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
+kind: ComponentDefinition
 metadata:
   name: task
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     definition.oam.dev/description: "Describes jobs that run code or a script to completion."
 spec:
-  definitionRef:
-    name: jobs.batch
-  template: |
-    output: {
-    	apiVersion: "batch/v1"
-    	kind:       "Job"
-    	spec: {
-    		parallelism: parameter.count
-    		completions: parameter.count
-    		template: spec: {
-    			restartPolicy: parameter.restart
-    			containers: [{
-    				name:  context.name
-    				image: parameter.image
-    
-    				if parameter["cmd"] != _|_ {
-    					command: parameter.cmd
-    				}
-    			}]
-    		}
-    	}
-    }
-    parameter: {
-    	// +usage=specify number of tasks to run in parallel
-    	// +short=c
-    	count: *1 | int
-    
-    	// +usage=Which image would you like to use for your service
-    	// +short=i
-    	image: string
-    
-    	// +usage=Define the job restart policy, the value can only be Never or OnFailure. By default, it's Never.
-    	restart: *"Never" | string
-    
-    	// +usage=Commands to run in the container
-    	cmd?: [...string]
-    }
-    
+  workload:
+    definition:
+      apiVersion: batch/v1
+      kind: Job
+  schematic:
+    cue:
+      template: |
+        output: {
+        	apiVersion: "batch/v1"
+        	kind:       "Job"
+        	spec: {
+        		parallelism: parameter.count
+        		completions: parameter.count
+        		template: spec: {
+        			restartPolicy: parameter.restart
+        			containers: [{
+        				name:  context.name
+        				image: parameter.image
+        
+        				if parameter["cmd"] != _|_ {
+        					command: parameter.cmd
+        				}
+        			}]
+        		}
+        	}
+        }
+        parameter: {
+        	// +usage=specify number of tasks to run in parallel
+        	// +short=c
+        	count: *1 | int
+        
+        	// +usage=Which image would you like to use for your service
+        	// +short=i
+        	image: string
+        
+        	// +usage=Define the job restart policy, the value can only be Never or OnFailure. By default, it's Never.
+        	restart: *"Never" | string
+        
+        	// +usage=Commands to run in the container
+        	cmd?: [...string]
+        }
+        

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

@@ -1,91 +1,95 @@
 # Code generated by KubeVela templates. DO NOT EDIT.
 apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
+kind: ComponentDefinition
 metadata:
   name: webservice
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
-    definition.oam.dev/description: "Describes long-running, scalable, containerized services that have a stable network endpoint to receive external network traffic from customers.
-    If workload type is skipped for any service defined in Appfile, it will be defaulted to `webservice` type."
+    definition.oam.dev/description: "Describes long-running, scalable, containerized services that have a stable network endpoint to receive external network traffic from customers."
 spec:
-  definitionRef:
-    name: deployments.apps
-  template: |
-    output: {
-    	apiVersion: "apps/v1"
-    	kind:       "Deployment"
-    	spec: {
-    		selector: matchLabels: {
-    			"app.oam.dev/component": context.name
-    		}
-    
-    		template: {
-    			metadata: labels: {
-    				"app.oam.dev/component": context.name
-    			}
-    
-    			spec: {
-    				containers: [{
-    					name:  context.name
-    					image: parameter.image
-    
-    					if parameter["cmd"] != _|_ {
-    						command: parameter.cmd
-    					}
-    
-    					if parameter["env"] != _|_ {
-    						env: parameter.env
-    					}
-    
-    					if context["config"] != _|_ {
-    						env: context.config
-    					}
-    
-    					ports: [{
-    						containerPort: parameter.port
-    					}]
-    
-    					if parameter["cpu"] != _|_ {
-    						resources: {
-    							limits:
-    								cpu: parameter.cpu
-    							requests:
-    								cpu: parameter.cpu
-    						}
-    					}
-    				}]
-    		}
-    		}
-    	}
-    }
-    parameter: {
-    	// +usage=Which image would you like to use for your service
-    	// +short=i
-    	image: string
-    
-    	// +usage=Commands to run in the container
-    	cmd?: [...string]
-    
-    	// +usage=Which port do you want customer traffic sent to
-    	// +short=p
-    	port: *80 | int
-    	// +usage=Define arguments by using environment variables
-    	env?: [...{
-    		// +usage=Environment variable name
-    		name: string
-    		// +usage=The value of the environment variable
-    		value?: string
-    		// +usage=Specifies a source the value of this var should come from
-    		valueFrom?: {
-    			// +usage=Selects a key of a secret in the pod's namespace
-    			secretKeyRef: {
-    				// +usage=The name of the secret in the pod's namespace to select from
-    				name: string
-    				// +usage=The key of the secret to select from. Must be a valid secret key
-    				key: string
-    			}
-    		}
-    	}]
-    	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
-    	cpu?: string
-    }
-    
+  workload:
+    definition:
+      apiVersion: apps/v1
+      kind: Deployment
+  schematic:
+    cue:
+      template: |
+        output: {
+        	apiVersion: "apps/v1"
+        	kind:       "Deployment"
+        	spec: {
+        		selector: matchLabels: {
+        			"app.oam.dev/component": context.name
+        		}
+        
+        		template: {
+        			metadata: labels: {
+        				"app.oam.dev/component": context.name
+        			}
+        
+        			spec: {
+        				containers: [{
+        					name:  context.name
+        					image: parameter.image
+        
+        					if parameter["cmd"] != _|_ {
+        						command: parameter.cmd
+        					}
+        
+        					if parameter["env"] != _|_ {
+        						env: parameter.env
+        					}
+        
+        					if context["config"] != _|_ {
+        						env: context.config
+        					}
+        
+        					ports: [{
+        						containerPort: parameter.port
+        					}]
+        
+        					if parameter["cpu"] != _|_ {
+        						resources: {
+        							limits:
+        								cpu: parameter.cpu
+        							requests:
+        								cpu: parameter.cpu
+        						}
+        					}
+        				}]
+        		}
+        		}
+        	}
+        }
+        parameter: {
+        	// +usage=Which image would you like to use for your service
+        	// +short=i
+        	image: string
+        
+        	// +usage=Commands to run in the container
+        	cmd?: [...string]
+        
+        	// +usage=Which port do you want customer traffic sent to
+        	// +short=p
+        	port: *80 | int
+        	// +usage=Define arguments by using environment variables
+        	env?: [...{
+        		// +usage=Environment variable name
+        		name: string
+        		// +usage=The value of the environment variable
+        		value?: string
+        		// +usage=Specifies a source the value of this var should come from
+        		valueFrom?: {
+        			// +usage=Selects a key of a secret in the pod's namespace
+        			secretKeyRef: {
+        				// +usage=The name of the secret in the pod's namespace to select from
+        				name: string
+        				// +usage=The key of the secret to select from. Must be a valid secret key
+        				key: string
+        			}
+        		}
+        	}]
+        	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
+        	cpu?: string
+        }
+        

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

@@ -1,46 +1,51 @@
 # Code generated by KubeVela templates. DO NOT EDIT.
 apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
+kind: ComponentDefinition
 metadata:
   name: worker
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     definition.oam.dev/description: "Describes long-running, scalable, containerized services that running at backend. They do NOT have network endpoint to receive external network traffic."
 spec:
-  definitionRef:
-    name: deployments.apps
-  template: |
-    output: {
-    	apiVersion: "apps/v1"
-    	kind:       "Deployment"
-    	spec: {
-    		selector: matchLabels: {
-    			"app.oam.dev/component": context.name
-    		}
-    
-    		template: {
-    			metadata: labels: {
-    				"app.oam.dev/component": context.name
-    			}
-    
-    			spec: {
-    				containers: [{
-    					name:  context.name
-    					image: parameter.image
-    
-    					if parameter["cmd"] != _|_ {
-    						command: parameter.cmd
-    					}
-    				}]
-    			}
-    		}
-    	}
-    }
-    
-    parameter: {
-    	// +usage=Which image would you like to use for your service
-    	// +short=i
-    	image: string
-    	// +usage=Commands to run in the container
-    	cmd?: [...string]
-    }
-    
+  workload:
+    definition:
+      apiVersion: apps/v1
+      kind: Deployment
+  schematic:
+    cue:
+      template: |
+        output: {
+        	apiVersion: "apps/v1"
+        	kind:       "Deployment"
+        	spec: {
+        		selector: matchLabels: {
+        			"app.oam.dev/component": context.name
+        		}
+        
+        		template: {
+        			metadata: labels: {
+        				"app.oam.dev/component": context.name
+        			}
+        
+        			spec: {
+        				containers: [{
+        					name:  context.name
+        					image: parameter.image
+        
+        					if parameter["cmd"] != _|_ {
+        						command: parameter.cmd
+        					}
+        				}]
+        			}
+        		}
+        	}
+        }
+        
+        parameter: {
+        	// +usage=Which image would you like to use for your service
+        	// +short=i
+        	image: string
+        	// +usage=Commands to run in the container
+        	cmd?: [...string]
+        }
+        

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

@@ -107,10 +107,10 @@ spec:
           args:
             - "--metrics-addr=:8080"
             - "--enable-leader-election"
-            {{ if .Values.useWebhook }}
+            {{ if .Values.admissionWebhooks.enabled }}
             - "--use-webhook=true"
             - "--webhook-port={{ .Values.webhookService.port }}"
-            - "--webhook-cert-dir={{ .Values.certificate.mountPath }}"
+            - "--webhook-cert-dir={{ .Values.admissionWebhooks.certificate.mountPath }}"
             {{ end }}
             - "--health-addr=:{{ .Values.healthCheck.port }}"
             - "--apply-once-only={{ .Values.applyOnceOnly }}"
@@ -121,7 +121,7 @@ spec:
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}
-          {{ if .Values.useWebhook }}
+          {{ if .Values.admissionWebhooks.enabled }}
           ports:
             - containerPort: {{ .Values.webhookService.port }}
               name: webhook-server
@@ -142,16 +142,16 @@ spec:
             initialDelaySeconds: 90
             periodSeconds: 5
           volumeMounts:
-            - mountPath: {{ .Values.certificate.mountPath }}
+            - mountPath: {{ .Values.admissionWebhooks.certificate.mountPath }}
               name: tls-cert-vol
               readOnly: true
           {{ end }}
-      {{ if .Values.useWebhook }}
+      {{ if .Values.admissionWebhooks.enabled }}
       volumes:
         - name: tls-cert-vol
           secret:
             defaultMode: 420
-            secretName: {{ .Values.certificate.secretName | quote }}
+            secretName: {{ template "kubevela.fullname" . }}-admission
       {{ end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

charts/vela-core/templates/webhook.yaml

@@ -1,249 +0,0 @@
-{{- if .Values.useWebhook -}}
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: kubevela-mutating-webhook-configuration
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.certificate.certificateName }}
-webhooks:
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1alpha2-applicationconfigurations
-    failurePolicy: Fail
-    name: mutating.core.oam.dev.v1alpha2.applicationconfigurations
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applicationconfigurations
-        scope: Namespaced
-    admissionReviewVersions: 
-      - v1beta1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1alpha2-components
-    failurePolicy: Fail
-    name: mutating.core.oam-dev.v1alpha2.components
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - components
-        scope: Namespaced
-    admissionReviewVersions: 
-      - v1beta1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutate-standard-oam-dev-v1alpha1-metricstrait
-    failurePolicy: Fail
-    name: mmetricstrait.kb.io
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - metricstraits
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutate-standard-oam-dev-v1alpha1-podspecworkload
-    failurePolicy: Fail
-    name: mcontainerized.kb.io
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - podspecworkloads
-
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: ValidatingWebhookConfiguration
-metadata:
-  name: kubevela-validating-webhook-configuration
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.certificate.certificateName }}
-webhooks:
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1alpha2-applicationconfigurations
-    failurePolicy: Fail
-    name: validating.core.oam.dev.v1alpha2.applicationconfigurations
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applicationconfigurations
-        scope: Namespaced
-    admissionReviewVersions: 
-      - v1beta1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1alpha2-components
-    failurePolicy: Fail
-    name: validating.core.oam.dev.v1alpha2.components
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - components
-        scope: Namespaced
-    admissionReviewVersions: 
-      - v1beta1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validating-core-oam-dev-v1alpha2-traitdefinitions
-    failurePolicy: Fail
-    name: validating.core.oam.dev.v1alpha2.traitdefinitions
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - traitdefinitions
-        scope: Cluster
-    admissionReviewVersions: 
-      - v1beta1
-    timeoutSeconds: 5
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /validate-standard-oam-dev-v1alpha1-metricstrait
-    failurePolicy: Fail
-    name: vmetricstrait.kb.io
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-          - DELETE
-        resources:
-          - metricstraits
-  - 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
-    rules:
-      - apiGroups:
-          - standard.oam.dev
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - podspecworkloads
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "kubevela.name" . }}-webhook
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "kubevela.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.webhookService.type }}
-  ports:
-    - port: 443
-      targetPort: {{ .Values.webhookService.port }}
-      protocol: TCP
-      name: https
-  selector:
-    {{ include "kubevela.selectorLabels" . | nindent 6 }}
-
----
-# The following manifests contain a self-signed issuer CR and a certificate CR.
-# More document can be found at https://docs.cert-manager.io
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: {{ .Values.certificate.issuerName | quote  }}
-spec:
-  selfSigned: {}
-
-# The following Certificate will generate a secret for vela-core
-# This rely on the system has a installed cert-manager in it.
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ .Values.certificate.certificateName }}
-spec:
-  dnsNames:
-    - {{ template "kubevela.name" . }}-webhook.{{ .Release.Namespace }}.svc
-    - {{ template "kubevela.name" . }}-webhook.{{ .Release.Namespace }}.svc.cluster.local
-  issuerRef:
-    kind: Issuer
-    name: {{ .Values.certificate.issuerName  | default "selfsigned-issuer" | quote  }}
-  secretName: {{ .Values.certificate.secretName | quote }}
----
-{{- end -}}

charts/vela-core/values.yaml

@@ -3,16 +3,15 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
-installCertManager: false
 # Valid applyOnceOnly values: true/false/on/off/force
 applyOnceOnly: "off"
-useWebhook: true
-# By default, don't disable any builtin capabilities
-disableCaps: ""
+
+# By default, metrics are disabled due the prometheus dependency
+disableCaps: "metrics"
 image:
   repository: oamdev/vela-core
   tag: latest
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
 
 imagePullSecrets: []
 nameOverride: ""
@@ -77,10 +76,24 @@ tolerations: []
 
 affinity: {}
 
-# certificate related to the webhook
-certificate:
-  issuerName: selfsigned-issuer
-  certificateName: serving-cert
-  secretName: webhook-server-cert
-  mountPath: /etc/k8s-webhook-certs
-  caBundle: replace-me
+rbac:
+  create: true
+
+admissionWebhooks:
+  enabled: true
+  failurePolicy: Fail
+  certificate:
+    mountPath: /etc/k8s-webhook-certs
+  patch:
+    enabled: true
+    image:
+      repository: jettech/kube-webhook-certgen
+      tag: v1.5.0
+      pullPolicy: IfNotPresent
+    affinity: {}
+    tolerations: []
+  certManager:
+    enabled: false
+
+
+systemDefinitionNamespace: vela-system

cmd/core/main.go

@@ -13,7 +13,6 @@ import (
 	"syscall"
 	"time"
 
-	monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
 	injectorv1alpha1 "github.com/oam-dev/trait-injector/api/v1alpha1"
 	injectorcontroller "github.com/oam-dev/trait-injector/controllers"
@@ -21,7 +20,6 @@ import (
 	"github.com/oam-dev/trait-injector/pkg/plugin"
 	kruise "github.com/openkruise/kruise-api/apps/v1alpha1"
 	certmanager "github.com/wonderflow/cert-manager-api/pkg/apis/certmanager/v1"
-	kedav1alpha1 "github.com/wonderflow/keda-api/api/v1alpha1"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -33,11 +31,11 @@ import (
 
 	oamcore "github.com/oam-dev/kubevela/apis/core.oam.dev"
 	velacore "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/appfile/driver"
 	velacontroller "github.com/oam-dev/kubevela/pkg/controller"
 	oamcontroller "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev"
 	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
+	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/utils/system"
 	oamwebhook "github.com/oam-dev/kubevela/pkg/webhook/core.oam.dev"
 	velawebhook "github.com/oam-dev/kubevela/pkg/webhook/standard.oam.dev"
@@ -59,18 +57,16 @@ func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = crdv1.AddToScheme(scheme)
 	_ = oamcore.AddToScheme(scheme)
-	_ = monitoring.AddToScheme(scheme)
 	_ = velacore.AddToScheme(scheme)
 	_ = injectorv1alpha1.AddToScheme(scheme)
 	_ = certmanager.AddToScheme(scheme)
-	_ = kedav1alpha1.AddToScheme(scheme)
 	_ = kruise.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
 }
 
 func main() {
 	var metricsAddr, logFilePath, leaderElectionNamespace string
-	var enableLeaderElection, logCompress bool
+	var enableLeaderElection, logCompress, logDebug bool
 	var logRetainDate int
 	var certDir string
 	var webhookPort int
@@ -94,6 +90,7 @@ func main() {
 	flag.StringVar(&logFilePath, "log-file-path", "", "The file to write logs to.")
 	flag.IntVar(&logRetainDate, "log-retain-date", 7, "The number of days of logs history to retain.")
 	flag.BoolVar(&logCompress, "log-compress", true, "Enable compression on the rotated logs.")
+	flag.BoolVar(&logDebug, "log-debug", false, "Enable debug logs for development purpose")
 	flag.IntVar(&controllerArgs.RevisionLimit, "revision-limit", 50,
 		"RevisionLimit is the maximum number of revisions that will be maintained. The default value is 50.")
 	flag.StringVar(&healthAddr, "health-addr", ":9440", "The address the health endpoint binds to.")
@@ -102,9 +99,10 @@ func main() {
 	flag.StringVar(&controllerArgs.CustomRevisionHookURL, "custom-revision-hook-url", "",
 		"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")
 	flag.StringVar(&disableCaps, "disable-caps", "", "To be disabled builtin capability list.")
-	flag.StringVar(&storageDriver, "storage-driver", driver.LocalDriverName, "Application file save to the storage driver")
+	flag.StringVar(&storageDriver, "storage-driver", "Local", "Application file save to the storage driver")
 	flag.DurationVar(&syncPeriod, "informer-re-sync-interval", 5*time.Minute,
 		"controller shared informer lister full re-sync period")
+	flag.StringVar(&oam.SystemDefinitonNamespace, "system-definition-namespace", "vela-system", "define the namespace of the system-level definition")
 	flag.Parse()
 
 	// setup logging
@@ -119,15 +117,20 @@ func main() {
 		w = os.Stdout
 	}
 
-	ctrl.SetLogger(zap.New(func(o *zap.Options) {
-		o.Development = true
+	logger := zap.New(func(o *zap.Options) {
+		o.Development = logDebug
 		o.DestWritter = w
-	}))
+	})
+	ctrl.SetLogger(logger)
 
 	setupLog.Info(fmt.Sprintf("KubeVela Version: %s, GIT Revision: %s.", version.VelaVersion, version.GitRevision))
 	setupLog.Info(fmt.Sprintf("Disable Capabilities: %s.", disableCaps))
+	setupLog.Info(fmt.Sprintf("core init with definition namespace %s", oam.SystemDefinitonNamespace))
 
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	restConfig := ctrl.GetConfigOrDie()
+	restConfig.UserAgent = kubevelaName + "/" + version.GitRevision
+
+	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
 		Scheme:                  scheme,
 		MetricsBindAddress:      metricsAddr,
 		LeaderElection:          enableLeaderElection,
@@ -235,7 +238,7 @@ func registerHealthChecks(mgr ctrl.Manager) error {
 	if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
 		return err
 	}
-
+	// TODO: change the health check to be different from readiness check
 	if err := mgr.AddHealthzCheck("ping", healthz.Ping); err != nil {
 		return err
 	}

config/default/manager_auth_proxy_patch.yaml

@@ -1,25 +0,0 @@
-# This patch inject a sidecar container which is a HTTP proxy for the 
-# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: controller-manager
-  namespace: system
-spec:
-  template:
-    spec:
-      containers:
-      - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
-        args:
-        - "--secure-listen-address=0.0.0.0:8443"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        ports:
-        - containerPort: 8443
-          name: https
-      - name: manager
-        args:
-        - "--metrics-addr=127.0.0.1:8080"
-        - "--enable-leader-election"

config/default/manager_webhook_patch.yaml

@@ -1,23 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: controller-manager
-  namespace: system
-spec:
-  template:
-    spec:
-      containers:
-      - name: manager
-        ports:
-        - containerPort: 9443
-          name: webhook-server
-          protocol: TCP
-        volumeMounts:
-        - mountPath: /tmp/k8s-webhook-server/serving-certs
-          name: cert
-          readOnly: true
-      volumes:
-      - name: cert
-        secret:
-          defaultMode: 420
-          secretName: webhook-server-cert

config/rbac/role.yaml

@@ -1,76 +0,0 @@
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: manager-role
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - get
-  - list
-  - patch
-  - update
-- apiGroups:
-  - core.oam.dev
-  resources:
-  - '*'
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - core.oam.dev
-  resources:
-  - '*/status'
-  verbs:
-  - get
-- apiGroups:
-  - monitoring.coreos.com
-  resources:
-  - '*'
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - monitoring.coreos.com
-  resources:
-  - '*/status'
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - standard.oam.dev
-  resources:
-  - metricstraits
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - standard.oam.dev
-  resources:
-  - metricstraits/status
-  verbs:
-  - get
-  - patch
-  - update

config/samples/app-with-status/template.yaml

@@ -1,119 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: nworker
-  annotations:
-    definition.oam.dev/description: "Describes long-running, scalable, containerized services that running at backend. They do NOT have network endpoint to receive external network traffic."
-spec:
-  definitionRef:
-    name: deployments.apps
-  status:
-    healthPolicy: |
-      isHealth: (context.output.status.readyReplicas > 0) && (context.output.status.readyReplicas == context.output.status.replicas)
-    customStatus: |-
-      message: "type: " + context.output.spec.template.spec.containers[0].image + ",\t enemies:" + context.outputs.gameconfig.data.enemies
-  template: |
-    output: {
-    	apiVersion: "apps/v1"
-    	kind:       "Deployment"
-    	spec: {
-    		selector: matchLabels: {
-    			"app.oam.dev/component": context.name
-    		}
-
-    		template: {
-    			metadata: labels: {
-    				"app.oam.dev/component": context.name
-    			}
-
-    			spec: {
-    				containers: [{
-    					name:  context.name
-    					image: parameter.image
-    					envFrom: [{
-    						configMapRef: name: context.name + "game-config"
-    					}]
-    					if parameter["cmd"] != _|_ {
-    						command: parameter.cmd
-    					}
-    				}]
-    			}
-    		}
-    	}
-    }
-
-    outputs: gameconfig: {
-    	apiVersion: "v1"
-    	kind:       "ConfigMap"
-    	metadata: {
-    		name: context.name + "game-config"
-    	}
-    	data: {
-    		enemies: parameter.enemies
-    		lives:   parameter.lives
-    	}
-    }
-
-    parameter: {
-    	// +usage=Which image would you like to use for your service
-    	// +short=i
-    	image: string
-    	// +usage=Commands to run in the container
-    	cmd?: [...string]
-    	lives:   string
-    	enemies: string
-    }
-
----
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: ingress
-spec:
-  status:
-    customStatus: |-
-      message: "type: "+ context.outputs.service.spec.type +",\t clusterIP:"+ context.outputs.service.spec.clusterIP+",\t ports:"+ "\(context.outputs.service.spec.ports[0].port)"+",\t domain"+context.outputs.ingress.spec.rules[0].host
-    healthPolicy: |
-      isHealth: len(context.outputs.service.spec.clusterIP) > 0
-  template: |
-    parameter: {
-    	domain: string
-    	http: [string]: int
-    }
-    // trait template can have multiple outputs in one trait
-    outputs: service: {
-    	apiVersion: "v1"
-    	kind:       "Service"
-    	spec: {
-    		selector:
-    			app: context.name
-    		ports: [
-    			for k, v in parameter.http {
-    				port:       v
-    				targetPort: v
-    			},
-    		]
-    	}
-    }
-    outputs: ingress: {
-    	apiVersion: "networking.k8s.io/v1beta1"
-    	kind:       "Ingress"
-    	metadata:
-    		name: context.name
-    	spec: {
-    		rules: [{
-    			host: parameter.domain
-    			http: {
-    				paths: [
-    					for k, v in parameter.http {
-    						path: k
-    						backend: {
-    							serviceName: context.name
-    							servicePort: v
-    						}
-    					},
-    				]
-    			}
-    		}]
-    	}
-    }

config/webhook/manifests.yaml

@@ -1,90 +0,0 @@
-
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: MutatingWebhookConfiguration
-metadata:
-  creationTimestamp: null
-  name: mutating-webhook-configuration
-webhooks:
-- clientConfig:
-    caBundle: Cg==
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-standard-oam-dev-v1alpha1-metricstrait
-  failurePolicy: Fail
-  name: mmetricstrait.kb.io
-  rules:
-  - apiGroups:
-    - standard.oam.dev
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - metricstraits
-- clientConfig:
-    caBundle: Cg==
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-standard-oam-dev-v1alpha1-podspecworkload
-  failurePolicy: Fail
-  name: mpodspecworkload.kb.io
-  rules:
-  - apiGroups:
-    - standard.oam.dev
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - PodSpecWorkload
-
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: ValidatingWebhookConfiguration
-metadata:
-  creationTimestamp: null
-  name: validating-webhook-configuration
-webhooks:
-- clientConfig:
-    caBundle: Cg==
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-standard-oam-dev-v1alpha1-metricstrait
-  failurePolicy: Fail
-  name: vmetricstrait.kb.io
-  rules:
-  - apiGroups:
-    - standard.oam.dev
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    - DELETE
-    resources:
-    - metricstraits
-- clientConfig:
-    caBundle: Cg==
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-standard-oam-dev-v1alpha1-podspecworkload
-  failurePolicy: Fail
-  name: vpodspecworkload.kb.io
-  rules:
-  - apiGroups:
-    - standard.oam.dev
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    - DELETE
-    resources:
-    - PodSpecWorkload

dashboard/.editorconfig

@@ -1,16 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab

dashboard/.eslintignore

@@ -1,8 +0,0 @@
-/lambda/
-/scripts
-/config
-.history
-public
-dist
-.umi
-mock

dashboard/.eslintrc.js

@@ -1,12 +0,0 @@
-module.exports = {
-  extends: [require.resolve('@umijs/fabric/dist/eslint')],
-  globals: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
-    page: true,
-    REACT_APP_ENV: true,
-  },
-  rules: {
-    'react/jsx-uses-react': 'off',
-    'react/react-in-jsx-scope': 'off',
-  },
-};

dashboard/.gitignore

@@ -1,37 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-**/node_modules
-# roadhog-api-doc ignore
-/src/utils/request-temp.js
-_roadhog-api-doc
-
-# production
-/dist
-
-# misc
-.DS_Store
-npm-debug.log*
-yarn-error.log
-
-/coverage
-.idea
-*bak
-.vscode
-
-# visual studio code
-.history
-*.log
-functions/*
-.temp/**
-
-# umi
-.umi
-.umi-production
-
-# screenshot
-screenshot
-.firebase
-.eslintcache
-
-build

dashboard/.prettierignore

@@ -1,23 +0,0 @@
-**/*.svg
-package.json
-.umi
-.umi-production
-/dist
-.dockerignore
-.DS_Store
-.eslintignore
-*.png
-*.toml
-docker
-.editorconfig
-Dockerfile*
-.gitignore
-.prettierignore
-LICENSE
-.eslintcache
-*.lock
-yarn-error.log
-.history
-CNAME
-/build
-/public

dashboard/.prettierrc.js

@@ -1,5 +0,0 @@
-const fabric = require('@umijs/fabric');
-
-module.exports = {
-  ...fabric.prettier,
-};

dashboard/.stylelintrc.js

@@ -1,5 +0,0 @@
-const fabric = require('@umijs/fabric');
-
-module.exports = {
-  ...fabric.stylelint,
-};

dashboard/README.md

@@ -1,73 +0,0 @@
-# KubeVela Dashboard
-
-## Quick start
-
-In the root folder of this project, run `make start-dashboard` to start backend OpenAPI server and Dashboard at the same time.
-
-```shell
-➜  xxx/src/github.com/oam-dev/kubevela $ make start-dashboard
-go run pkg/server/main/startAPIServer.go &
-cd dashboard && npm install && npm start && cd ..
-I0205 11:25:55.742786    5535 request.go:621] Throttling request took 1.002149891s, request: GET:https://47.242.145.141:6443/apis/coordination.k8s.io/v1beta1?timeout=32s
-[GIN-debug] [WARNING] Running in "debug" mode. Switch to "release" mode in production.
- - using env:	export GIN_MODE=release
- - using code:	gin.SetMode(gin.ReleaseMode)
-
-[GIN-debug] POST   /api/envs/                --> github.com/oam-dev/kubevela/pkg/server.(*APIServer).CreateEnv-fm (6 handlers)
-[GIN-debug] PUT    /api/envs/:envName        --> github.com/oam-dev/kubevela/pkg/server.(*APIServer).UpdateEnv-fm (6 handlers)
-[GIN-debug] GET    /api/envs/:envName        --> github.com/oam-dev/kubevela/pkg/server.(*APIServer).GetEnv-fm (6 handlers)
-[GIN-debug] GET    /api/envs/                --> github.com/oam-dev/kubevela/pkg/server.(*APIServer).ListEnv-fm (6 handlers)
-
-> fsevents@1.2.13 install /Users/zhouzhengxi/Programming/golang/src/github.com/oam-dev/kubevela/dashboard/node_modules/watchpack-chokidar2/node_modules/fsevents
-> node install.js
-
-  SOLINK_MODULE(target) Release/.node
-  CXX(target) Release/obj.target/fse/fsevents.o
-  SOLINK_MODULE(target) Release/fse.node
-
-> ejs@2.7.4 postinstall /Users/zhouzhengxi/Programming/golang/src/github.com/oam-dev/kubevela/dashboard/node_modules/umi-webpack-bundle-analyzer/node_modules/ejs
-> node ./postinstall.js
-
-Thank you for installing EJS: built with the Jake JavaScript build tool (https://jakejs.com/)
-
-
-> kubevela@0.0.1 postinstall /Users/zhouzhengxi/Programming/golang/src/github.com/oam-dev/kubevela/dashboard
-> umi g tmp
-
-added 1234 packages from 743 contributors, removed 49 packages, updated 85 packages and audited 3208 packages in 41.551s
-
-235 packages are looking for funding
-  run `npm fund` for details
-
-found 19 vulnerabilities (18 low, 1 high)
-  run `npm audit fix` to fix them, or `npm audit` for details
-
-> kubevela@0.0.1 start /Users/zhouzhengxi/Programming/golang/src/github.com/oam-dev/kubevela/dashboard
-> umi dev
-
-Starting the development server...
-
-✔ Webpack
-  Compiled successfully in 34.81s
-
- DONE  Compiled successfully in 34815ms                                                                                                                                                                                                            11:27:12 AM
-
-
-  App running at:
-  - Local:   http://localhost:8002 (copied to clipboard)
-  - Network: http://30.240.99.101:8002
-```
-
-## Development
-
-### Install dependencies
-
-```bash
-npm install
-```
-
-### Start up
-
-```bash
-npm start
-```

dashboard/config/config.ts

@@ -1,68 +0,0 @@
-// https://umijs.org/config/
-import { defineConfig } from 'umi';
-
-import defaultSettings from './defaultSettings';
-import proxy from './proxy';
-import routes from './routes';
-import themeSettings from './themeSettings';
-
-const { REACT_APP_ENV } = process.env;
-
-export default defineConfig({
-  hash: true,
-  antd: {},
-  dva: {
-    hmr: true,
-  },
-  layout: {
-    name: 'KubeVela',
-    locale: true,
-    siderWidth: 208,
-    ...defaultSettings,
-  },
-  locale: {
-    // default en-US
-    default: 'en-US',
-    antd: true,
-    // default true, when it is true, will use `navigator.language` overwrite default
-    baseNavigator: true,
-  },
-  dynamicImport: {
-    loading: '@ant-design/pro-layout/es/PageLoading',
-  },
-  nodeModulesTransform: {
-    type: 'none',
-  },
-  targets: {
-    ie: 11,
-  },
-  // umi routes: https://umijs.org/docs/routing
-  routes,
-  // Theme for antd: https://ant.design/docs/react/customize-theme-cn
-  theme: {
-    'primary-color': defaultSettings.primaryColor,
-    'link-color': themeSettings.linkColor,
-    'link-hover-color': themeSettings.linkHoverColor,
-    'disabled-bg': themeSettings.disabledBg,
-    'disabled-color': themeSettings.disabledColor,
-    'btn-disable-color': themeSettings.btnDisableColor,
-  },
-  esbuild: {},
-  title: false,
-  ignoreMomentLocale: true,
-  proxy: proxy[REACT_APP_ENV || 'dev'],
-  manifest: {
-    basePath: '/',
-  },
-  // https://github.com/zthxxx/react-dev-inspector
-  plugins: ['react-dev-inspector/plugins/umi/react-inspector'],
-  inspectorConfig: {
-    // loader options type and docs see below
-    exclude: [],
-    babelPlugins: [],
-    babelOptions: {},
-  },
-  resolve: {
-    includes: ['src/components'],
-  },
-});

dashboard/config/defaultSettings.ts

@@ -1,22 +0,0 @@
-import { Settings as LayoutSettings } from '@ant-design/pro-layout';
-
-import themeSettings from './themeSettings';
-
-const Settings: LayoutSettings & {
-  pwa?: boolean;
-  logo?: string;
-} = {
-  navTheme: 'dark',
-  primaryColor: themeSettings.primaryColor, // 全局主色
-  layout: 'mix',
-  contentWidth: 'Fluid',
-  fixedHeader: false,
-  fixSiderbar: true,
-  colorWeak: false,
-  title: 'KubeVela',
-  pwa: false,
-  logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
-  iconfontUrl: '',
-};
-
-export default Settings;

dashboard/config/proxy.ts

@@ -1,20 +0,0 @@
-export default {
-  dev: {
-    '/api/': {
-      target: 'http://localhost:38081/',
-      changeOrigin: true,
-    },
-  },
-  test: {
-    '/api/': {
-      target: 'http://localhost:38081/',
-      changeOrigin: true,
-    },
-  },
-  pre: {
-    '/api/': {
-      target: 'http://localhost:38081/',
-      changeOrigin: true,
-    },
-  },
-};

dashboard/config/routes.ts

@@ -1,58 +0,0 @@
-export default [
-  {
-    path: '/',
-    redirect: `/System`,
-  },
-  {
-    name: 'applications',
-    icon: 'appstore',
-    path: `/applications`,
-    component: './Application',
-  },
-  /* Application Create should be moved to /Application */
-  {
-    name: 'create_application',
-    path: '/applications/create',
-    component: './CreateApplication'
-  },
-  {
-    name: 'capability',
-    icon: 'AppstoreAddOutlined',
-    path: '/capabilities',
-    routes: [
-      {
-        path: '/capabilities',
-        redirect: `/Capability/Workloads`,
-      },
-      {
-        name: 'workloads',
-        path: '/capabilities/workloads',
-        component: './Capability/Workloads'
-      },
-      {
-        name: 'traits',
-        path: '/capabilities/traits',
-        component: './Capability/Traits',
-      },
-    ],
-  },
-  {
-    name: 'system',
-    icon: 'setting',
-    path: '/System',
-    routes: [
-      {
-        path: '/System',
-        redirect: `/System/Environment`,
-      },
-      {
-        name: 'environment',
-        path: '/System/Environment',
-        component: './System/Environment',
-      },
-    ],
-  },
-  {
-    component: './404',
-  },
-];

dashboard/config/themeSettings.ts

@@ -1,9 +0,0 @@
-const themeSettings = {
-  primaryColor: '#1b58f4', // 全局主色
-  linkColor: '#1b58f4', // 链接色
-  linkHoverColor: '#1b58f4',
-  disabledBg: '#ebebeb', // 失效背景色,
-  disabledColor: '#bebebe', // 失效文本色,
-  btnDisableColor: '#a4a4a4', // 禁用btn文字颜色
-};
-export default themeSettings;

dashboard/jest.config.js

@@ -1,10 +0,0 @@
-module.exports = {
-  testURL: 'http://localhost:8000',
-  testEnvironment: './tests/PuppeteerEnvironment',
-  verbose: false,
-  extraSetupFiles: ['./tests/setupTests.js'],
-  globals: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: false,
-    localStorage: null,
-  },
-};

dashboard/jsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  }
-}

dashboard/package.json

@@ -1,111 +0,0 @@
-{
-  "name": "kubevela",
-  "version": "0.0.1",
-  "private": true,
-  "description": "An out-of-box UI solution for enterprise applications",
-  "scripts": {
-    "analyze": "cross-env ANALYZE=1 umi build",
-    "build": "umi build",
-    "deploy": "npm run site && npm run gh-pages",
-    "dev": "npm run start:dev",
-    "gh-pages": "gh-pages -d dist",
-    "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
-    "postinstall": "umi g tmp",
-    "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier",
-    "lint-staged": "lint-staged",
-    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ",
-    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style",
-    "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
-    "lint:prettier": "prettier --check \"src/**/*\" --end-of-line auto",
-    "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
-    "precommit": "lint-staged",
-    "prettier": "prettier -c --write \"src/**/*\"",
-    "start": "umi dev",
-    "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none umi dev",
-    "start:no-mock": "cross-env MOCK=none umi dev",
-    "start:no-ui": "cross-env UMI_UI=none umi dev",
-    "start:pre": "cross-env REACT_APP_ENV=pre umi dev",
-    "start:test": "cross-env REACT_APP_ENV=test MOCK=none umi dev",
-    "pretest": "node ./tests/beforeTest",
-    "test": "umi test",
-    "test:all": "node ./tests/run-tests.js",
-    "test:component": "umi test ./src/components",
-    "tsc": "tsc --noEmit"
-  },
-  "lint-staged": {
-    "**/*.less": "stylelint --syntax less",
-    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "**/*.{js,jsx,tsx,ts,less,md,json}": [
-      "prettier --write"
-    ]
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ],
-  "dependencies": {
-    "@ant-design/icons": "^4.3.0",
-    "@ant-design/pro-descriptions": "^1.0.19",
-    "@ant-design/pro-form": "^1.9.0",
-    "@ant-design/pro-layout": "^6.6.1",
-    "@ant-design/pro-list": "^1.1.12",
-    "@ant-design/pro-table": "^2.15.1",
-    "@umijs/route-utils": "^1.0.33",
-    "antd": "^4.9.4",
-    "classnames": "^2.2.6",
-    "form-render": "^0.9.0",
-    "dayjs": "^1.9.7",
-    "lodash": "^4.17.11",
-    "moment": "^2.25.3",
-    "omit.js": "^2.0.2",
-    "qs": "^6.9.0",
-    "react": "^17.0.0",
-    "react-dev-inspector": "^1.1.1",
-    "react-dom": "^17.0.0",
-    "react-helmet-async": "^1.0.4",
-    "react-router-dom": "^5.2.0",
-    "umi": "^3.2.14",
-    "umi-request": "^1.0.8",
-    "use-merge-value": "^1.0.1"
-  },
-  "devDependencies": {
-    "@ant-design/pro-cli": "^2.0.2",
-    "@types/classnames": "^2.2.7",
-    "@types/express": "^4.17.0",
-    "@types/history": "^4.7.2",
-    "@types/jest": "^26.0.0",
-    "@types/lodash": "^4.14.144",
-    "@types/qs": "^6.5.3",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-helmet": "^6.1.0",
-    "@umijs/fabric": "^2.3.0",
-    "@umijs/plugin-blocks": "^2.0.5",
-    "@umijs/plugin-esbuild": "^1.0.1",
-    "@umijs/preset-ant-design-pro": "^1.2.0",
-    "@umijs/preset-dumi": "^1.1.0-rc.6",
-    "@umijs/preset-react": "^1.7.8",
-    "@umijs/yorkie": "^2.0.3",
-    "carlo": "^0.9.46",
-    "cross-env": "^7.0.0",
-    "cross-port-killer": "^1.1.1",
-    "detect-installer": "^1.0.1",
-    "enzyme": "^3.11.0",
-    "eslint": "^7.1.0",
-    "express": "^4.17.1",
-    "gh-pages": "^3.0.0",
-    "jsdom-global": "^3.0.2",
-    "lint-staged": "^10.0.0",
-    "mockjs": "^1.0.1-beta3",
-    "prettier": "^2.0.1",
-    "pro-download": "1.0.1",
-    "puppeteer-core": "^5.0.0",
-    "stylelint": "^13.0.0",
-    "typescript": "^4.1.2",
-    "webpack-plugin-fr-theme": "^0.2.0"
-  },
-  "engines": {
-    "node": ">=10.0.0"
-  }
-}

dashboard/public/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" version="1.1" viewBox="0 0 200 200"><title>Group 28 Copy 5</title><desc>Created with Sketch.</desc><defs><linearGradient id="linearGradient-1" x1="62.102%" x2="108.197%" y1="0%" y2="37.864%"><stop offset="0%" stop-color="#4285EB"/><stop offset="100%" stop-color="#2EC7FF"/></linearGradient><linearGradient id="linearGradient-2" x1="69.644%" x2="54.043%" y1="0%" y2="108.457%"><stop offset="0%" stop-color="#29CDFF"/><stop offset="37.86%" stop-color="#148EFF"/><stop offset="100%" stop-color="#0A60FF"/></linearGradient><linearGradient id="linearGradient-3" x1="69.691%" x2="16.723%" y1="-12.974%" y2="117.391%"><stop offset="0%" stop-color="#FA816E"/><stop offset="41.473%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient><linearGradient id="linearGradient-4" x1="68.128%" x2="30.44%" y1="-35.691%" y2="114.943%"><stop offset="0%" stop-color="#FA8E7D"/><stop offset="51.264%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="logo" transform="translate(-20.000000, -20.000000)"><g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)"><g id="Group-27-Copy-3"><g id="Group-25" fill-rule="nonzero"><g id="2"><path id="Shape" fill="url(#linearGradient-1)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/><path id="Shape" fill="url(#linearGradient-2)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/></g><path id="Shape" fill="url(#linearGradient-3)" d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z"/></g><ellipse id="Combined-Shape" cx="100.519" cy="100.437" fill="url(#linearGradient-4)" rx="23.6" ry="23.581"/></g></g></g></g></svg>

dashboard/public/pro_icon.svg

@@ -1,5 +0,0 @@
-<svg width="42" height="42" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <path fill="#070707" d="m6.717392,13.773912l5.6,0c2.8,0 4.7,1.9 4.7,4.7c0,2.8 -2,4.7 -4.9,4.7l-2.5,0l0,4.3l-2.9,0l0,-13.7zm2.9,2.2l0,4.9l1.9,0c1.6,0 2.6,-0.9 2.6,-2.4c0,-1.6 -0.9,-2.4 -2.6,-2.4l-1.9,0l0,-0.1zm8.9,11.5l2.7,0l0,-5.7c0,-1.4 0.8,-2.3 2.2,-2.3c0.4,0 0.8,0.1 1,0.2l0,-2.4c-0.2,-0.1 -0.5,-0.1 -0.8,-0.1c-1.2,0 -2.1,0.7 -2.4,2l-0.1,0l0,-1.9l-2.7,0l0,10.2l0.1,0zm11.7,0.1c-3.1,0 -5,-2 -5,-5.3c0,-3.3 2,-5.3 5,-5.3s5,2 5,5.3c0,3.4 -1.9,5.3 -5,5.3zm0,-2.1c1.4,0 2.2,-1.1 2.2,-3.2c0,-2 -0.8,-3.2 -2.2,-3.2c-1.4,0 -2.2,1.2 -2.2,3.2c0,2.1 0.8,3.2 2.2,3.2z" class="st0" id="Ant-Design-Pro"/>
- </g>
-</svg>

dashboard/src/access.ts

@@ -1,4 +0,0 @@
-// src/access.ts
-export default function access() {
-  return {};
-}