Add parameters comments for crossplane definitions (#1515 )

* Add parameters commetns for crossplane definitions Added parameter comments for ComponentDefinition alibaba-oss alibaba-rds and TraitDefinition service-binding * add the result of vela show
Add More End User Docs (#1511 )
2026-02-28 08:43:57 +00:00 · 2021-04-16 22:24:50 +08:00 · 2021-04-16 21:46:44 +08:00 · 2021-04-16 20:43:26 +08:00 · 2021-04-16 20:42:41 +08:00 · 2021-04-16 18:13:54 +08:00
383 changed files with 18064 additions and 4676 deletions
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -15,5 +15,7 @@ jobs:
        with:
          node-version: '12.x'
      - name: Test Build
+        env:
+          VERSION: ${{ github.ref }}
        run: |
-          sh ./hack/website/test-build.sh
+          bash ./hack/website/test-build.sh
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,30 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, release-* ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -15,7 +15,6 @@ env:
  # Common versions
  GO_VERSION: '1.14'
  GOLANGCI_VERSION: 'v1.38'
-  DOCKER_BUILDX_VERSION: 'v0.4.2'
  KIND_VERSION: 'v0.7.0'

 jobs:
@@ -30,7 +29,7 @@ jobs:
        uses: fkirc/skip-duplicate-actions@v3.3.0
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
-          paths_ignore: '["**.md", "**.png", "**.jpg"]'
+          paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
          do_not_skip: '["workflow_dispatch", "schedule", "push"]'
          concurrent_skipping: false

@@ -167,6 +166,8 @@ jobs:
        run: |
          make e2e-cleanup
          make e2e-setup
+          helm lint ./charts/vela-core
+          helm test -n vela-system kubevela --timeout 5m

      - name: Wait for e2e preparation ready
        run: |
--- a/.github/workflows/release-docs.yaml
+++ b/.github/workflows/release-docs.yaml
@@ -11,11 +11,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
      - name: Sync to kubevela.io Repo
-        uses: wonderflow/auto-docs-action@v0.2.3
        env:
-          SSH_PRIVATE_KEY: ${{ secrets.GH_PAGES_DEPLOY }}
+          SSH_DEPLOY_KEY: ${{ secrets.GH_PAGES_DEPLOY }}
          VERSION: ${{ github.ref }}
          COMMIT_ID: ${{ github.sha }}
-        with:
-          gh-page: git@github.com:oam-dev/kubevela.io.git
+        run: |
+          bash ./hack/website/release.sh
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,52 +34,104 @@ jobs:
      - name: Get release
        id: get_release
        uses: bruceadams/get-release@v1.2.2
-      - name: Upload Linux amd64 tar.gz
+      - name: Upload Vela Linux amd64 tar.gz
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-linux-amd64.tar.gz
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
          asset_content_type: binary/octet-stream
-      - name: Upload Linux amd64 zip
+      - name: Upload Vela Linux amd64 zip
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-linux-amd64.zip
+          asset_path: ./_bin/vela/vela-linux-amd64.zip
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
          asset_content_type: binary/octet-stream
-      - name: Upload MacOS tar.gz
+      - name: Upload Vela MacOS tar.gz
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-darwin-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-darwin-amd64.tar.gz
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
          asset_content_type: binary/octet-stream
-      - name: Upload MacOS zip
+      - name: Upload Vela MacOS zip
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-darwin-amd64.zip
+          asset_path: ./_bin/vela/vela-darwin-amd64.zip
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
          asset_content_type: binary/octet-stream
-      - name: Upload Windows tar.gz
+      - name: Upload Vela Windows tar.gz
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-windows-amd64.tar.gz
+          asset_path: ./_bin/vela/vela-windows-amd64.tar.gz
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
          asset_content_type: binary/octet-stream
-      - name: Upload Windows zip
+      - name: Upload Vela Windows zip
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./_bin/vela-windows-amd64.zip
+          asset_path: ./_bin/vela/vela-windows-amd64.zip
          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Linux amd64 zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-linux-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-darwin-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.tar.gz
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-windows-amd64.zip
+          asset_name: kubectl-vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
      - name: Upload Checksums
        uses: actions/upload-release-asset@v1.0.2
        with:
          upload_url: ${{ steps.get_release.outputs.upload_url }}
          asset_path: ./_bin/sha256sums.txt
          asset_name: sha256sums.txt
-          asset_content_type: text/plain
+          asset_content_type: text/plain
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Sync release to kubevela.io Repo
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.GH_PAGES_DEPLOY }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
+          COMMIT_ID: ${{ github.sha }}
+        run: |
+          bash ./hack/website/release.sh
--- a/.github/workflows/timed-task.yml
+++ b/.github/workflows/timed-task.yml
@@ -0,0 +1,10 @@
+name: Timed Task
+on:
+  schedule:
+    - cron: '0 16 * * *'
+jobs:
+  clean-image:
+    runs-on: aliyun
+    steps:
+      - name: Cleanup image
+        run: docker image prune -f
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,6 @@ references/dashboard/src/.umi-production/

 # Swagger: generate Restful API
 references/apiserver/docs/index.html
+
+# check docs
+git-page/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ contributing to `kubevela` or build a PoC (Proof of Concept).
 3. ginkgo 1.14.0+ (just for [E2E test](./CONTRIBUTING.md#e2e-test))
 4. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.

-We also recommend you to learn about KubeVela's [design](https://kubevela.io/#/en/concepts) before dive into its code.
+We also recommend you to learn about KubeVela's [design](https://kubevela.io/docs/concepts) before dive into its code.

 ### Build

@@ -86,7 +86,7 @@ helm uninstall -n vela-system kubevela

 ### Use

-You can try use your local built binaries follow [the documentation](https://kubevela.io/#/en/quick-start).
+You can try use your local built binaries follow [the documentation](https://kubevela.io/docs/quick-start).

 ## Testing

@@ -110,6 +110,22 @@ Start to test.
 make e2e-test
 ```

+### Contribute Docs
+
+Please read [the documentation](https://github.com/oam-dev/kubevela/tree/master/docs/README.md) before contributing to the docs.
+
+- Build docs
+
+```shell script
+make docs-build
+```
+
+- Local development and preview
+
+```shell script
+make docs-start
+```
+
 ## Make a pull request

 Remember to write unit-test and e2e-test after you have finished your code.
--- a/24
+++ b/24
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,24 +19,26 @@ COPY version/ version/
 ARG TARGETARCH
 ARG VERSION
 ARG GITVERSION
-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}" \
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
    -o manager-${TARGETARCH} main.go

-# Use ubuntu as base image for convenience.
+# Use alpine as base image due to the discussion in issue #1448
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-# Could use `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot` to overwrite
+# Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE:-ubuntu:latest}
+FROM ${BASE_IMAGE:-alpine: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
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

 ARG TARGETARCH
-COPY --from=builder /workspace/manager-${TARGETARCH} /manager
+COPY --from=builder /workspace/manager-${TARGETARCH} /usr/local/bin/manager

-ENTRYPOINT ["/manager"]
+COPY entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["entrypoint.sh"]
+
+CMD ["manager"]
--- a/84
+++ b/84
@@ -3,10 +3,11 @@ VELA_VERSION ?= master
 # Repo info
 GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
 GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
-VELA_VERSION_VAR    := github.com/oam-dev/kubevela/version.VelaVersion
-VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision
-LDFLAGS             ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
+VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
+VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
+LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"

+GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
 GOX         = go run github.com/mitchellh/gox
 TARGETS     := darwin/amd64 linux/amd64 windows/amd64
 DIST_DIRS   := find * -type d -exec
@@ -34,6 +35,10 @@ else
 GOBIN=$(shell go env GOBIN)
 endif

+# Image URL to use all building/pushing image targets
+VELA_CORE_IMAGE      ?= vela-core:latest
+VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
+
 all: build

 # Run tests
@@ -42,18 +47,18 @@ test: vet lint staticcheck
 	go test -race -covermode=atomic ./references/apiserver/... ./references/appfile/... ./references/cli/... ./references/common/... ./references/plugins/...
 	@$(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} references/cmd/cli/main.go
-	git checkout references/cmd/cli/fake/chart_source.go
+# Build vela cli binary
+build: fmt vet lint staticcheck vela-cli kubectl-vela
 	@$(OK) build succeed

 vela-cli:
 	go run hack/chart/generate.go
-	go build -o bin/vela -ldflags ${LDFLAGS} references/cmd/cli/main.go
+	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
 	git checkout references/cmd/cli/fake/chart_source.go

+kubectl-vela:
+	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
+
 dashboard-build:
 	cd references/dashboard && npm install && cd ..

@@ -62,6 +67,22 @@ doc-gen:
 	go run hack/docgen/gen.go
 	go run hack/references/generate.go

+docs-build:
+ifneq ($(wildcard git-page),)
+	rm -rf git-page
+endif
+	sh ./hack/website/test-build.sh
+
+docs-start:
+ifeq ($(wildcard git-page),)
+	git clone --single-branch --depth 1 https://github.com/oam-dev/kubevela.io.git git-page
+endif
+	rm -r git-page/docs
+	rm git-page/sidebars.js
+	cat docs/sidebars.js > git-page/sidebars.js
+	cp -R docs/en git-page/docs
+	cd git-page && yarn install && yarn start
+
 api-gen:
 	swag init -g references/apiserver/route.go --output references/apiserver/docs
 	swagger-codegen generate -l html2 -i references/apiserver/docs/swagger.yaml -o references/apiserver/docs
@@ -71,19 +92,28 @@ generate-source:
 	go run hack/frontend/source.go

 cross-build:
+	rm -rf _bin
 	go run hack/chart/generate.go
-	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli/
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/vela/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/kubectl-vela/{{.OS}}-{{.Arch}}/kubectl-vela" -osarch='$(TARGETS)' ./cmd/plugin
+	git checkout references/cmd/cli/fake/chart_source.go

 compress:
 	( \
 		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
 		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
-		cd _bin && \
-		$(DIST_DIRS) cp ../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../README.md {} \; && \
+		cd _bin/vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
 		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
 		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
-		sha256sum vela-* > sha256sums.txt \
+		cd ../kubectl-vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
+		cd .. && \
+		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
 	)

 # Run against the configured Kubernetes cluster in ~/.kube/config
@@ -104,7 +134,7 @@ staticcheck: staticchecktool
 	$(STATICCHECK) ./...

 lint: golangci
-	$(GOLANGCILINT) run  ./...
+	$(GOLANGCILINT) run ./...

 reviewable: manifests fmt vet lint staticcheck
 	go mod tidy
@@ -117,19 +147,16 @@ check-diff: reviewable

 # Build the docker image
 docker-build:
-	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) . -t ${IMG}
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .

 # Push the docker image
 docker-push:
-	docker push ${IMG}
+	docker push $(VELA_CORE_IMAGE)

 e2e-setup:
 	helm install --create-namespace -n flux-system helm-flux http://oam.dev/catalog/helm-flux2-0.1.0.tgz
 	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.7.0/kruise-chart.tgz
-	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
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --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
@@ -166,25 +193,22 @@ e2e-cleanup:

 image-cleanup:
 # Delete Docker image
-ifneq ($(shell docker images -q vela-core-test:$(GIT_COMMIT)),)
-	docker image rm -f vela-core-test:$(GIT_COMMIT)
+ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
+	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif

 # load docker image to the kind cluster
 kind-load:
-	docker build -t vela-core-test:$(GIT_COMMIT) .
-	kind load docker-image vela-core-test:$(GIT_COMMIT) || { echo >&2 "kind not installed or error loading image: $(IMAGE)"; exit 1; }
-
-# Image URL to use all building/pushing image targets
-IMG ?= vela-core:latest
+	docker build -t $(VELA_CORE_TEST_IMAGE) .
+	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }

 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out

-# Build manager binary
+# Build vela core manager binary
 manager: fmt vet lint manifests
-	go build -o bin/manager ./cmd/core/main.go
+	$(GOBUILD_ENV) go build -o bin/manager -a -ldflags $(LDFLAGS) ./cmd/core/main.go

 # Run against the configured Kubernetes cluster in ~/.kube/config
 core-run: fmt vet manifests
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@

 # KubeVela

-KubeVela is the platform engine to create *PaaS-like* experience on Kubernetes, in a scalable approach.
+KubeVela is a modern application engine that adapts to your application's needs, not the other way around.

 ## Community

@@ -22,28 +22,35 @@ KubeVela is the platform engine to create *PaaS-like* experience on Kubernetes,
 - Gitter: [Discussion](https://gitter.im/oam-dev/community)
 - Bi-weekly Community Call: [Meeting Notes](https://docs.google.com/document/d/1nqdFEyULekyksFHtFvgvFAYE-0AMHKoS3RMnaKsarjs)

-> NOTE: KubeVela is still iterating quickly. It's currently under pre-beta release.
+## Introduction

-## What problems does it solve?
+*Developers simply want to deploy.*

-Building **developer-centric platforms** with Kubernetes requires higher level primitives which is out-of-scope of Kubernetes itself. Hence, we platform teams build abstractions.
+Traditional Platform-as-a-Service (PaaS) systems enable easy application deployments, but this happiness disappears when your application outgrows the capabilities of your platform. This is inevitable regardless of your PaaS is built on Kubernetes or not - the root cause is its inflexibility.

-However, great in flexibility and extensibility, the existing solutions such as IaC (Infrastructure-as-Code) and client-side templating tools all lead to ***Configuration Drift*** (i.e. the generated instances are not in line with the expected configuration) which is a nightmare in production.
+KubeVela is a modern application deployment system that adapts to your needs. Essentially, KubeVela enables you to define platform capabilities (such as workloads, operational behaviors, and cloud services) as reusable [CUE](https://cuelang.org/) or [Helm](https://helm.sh) components, per needs of your application deployment. And when your needs grow, your platform capabilities expand naturally in a programmable approach.

-KubeVela allows platform teams to create developer-centric abstractions with IaC but maintain them with the battle tested [Kubernetes Control Loop](https://kubernetes.io/docs/concepts/architecture/controller/). Think about a plug-in that turns your Kubernetes cluster into a *"PaaS"* via abstractions designed by yourself.
+Perfect in flexibility though, X-as-Code tends to lead to configuration drift. That's why KubeVela is fully built as a [Kubernetes Controller](https://kubernetes.io/docs/concepts/architecture/controller/) instead of a client-side tool, i.e. all its capabilities are modeled as code but enforced with battle tested reconciling loops which will never leave inconsistency in your clusters. Think about *Platform-as-Code* enabled by Kubernetes, CUE and Helm.
+
+With developer experience in mind, KubeVela exposes those programmable platform capabilities as application-centric API shown as below:
+- Components - deployable/provisionable entities that composed your application deployment
+  - e.g. a Kubernetes workload, a MySQL database, or a AWS OSS bucket
+- Traits - attachable operational features per your needs
+  - e.g. autoscaling rules, rollout strategies, ingress rules, sidecars, security policies etc
+- Application - full description of your application deployment assembled with components and traits.

 ## Getting Started

- [Installation](https://kubevela.io/#/en/install)
- [Quick start](https://kubevela.io/#/en/quick-start)
- [How it works](https://kubevela.io/#/en/concepts)
+- [Installation](https://kubevela.io/docs/install)
+- [Quick start](https://kubevela.io/docs/quick-start)
+- [How it works](https://kubevela.io/docs/concepts)

 ## Features

- **Robust, repeatable and extensible approach to create and maintain abstractions** - design your abstractions with [CUE](https://cuelang.org/) or [Helm](https://helm.sh), ship them to end users by `kubectl apply -f`, automatically generating GUI forms, upgrade your abstractions at runtime, and let Kubernetes controller guarantee determinism of the abstractions, no configuration drift.
- **Generic progressive rollout framework** - built-in rollout framework and strategies to upgrade your microservice regardless of its workload type (e.g. stateless, stateful, or even custom operators etc), seamless integration with observability systems.
- **Multi-enviroment app delievry model (WIP)** - built-in model to deliver or rollout your apps across multiple enviroments and/or clusters, seamless integration with Service Mesh for traffic management. 
- **Simple and Kubernetes native** - KubeVela is just a simple custom controller, all its app delivery abstractions and features are defined as [Kubernetes Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) so they naturally work with any CI/CD or GitOps tools.
+- **Zero-restriction application deployment system** - design and express platform capabilities with CUE and Helm per needs of your application, and let Kubernetes controller guarantee the determinism in the application deployment. GUI forms are automatically generated for capabilities so even your dashboard are fully extensible.
+- **Generic progressive rollout framework** - built-in rollout framework and strategies to upgrade your microservice regardless of its workload type (e.g. stateless, stateful, or even custom operators etc).
+- **Multi-cluster multi-revision application deployment** - built-in model to deploy or rollout your apps across hybrid infrastructures, with Service Mesh for traffic shifting. 
+- **Simple and native** - KubeVela is a just simple Kubernetes custom controller, all its capabilities are defined as [Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) so they naturally work with any CI/CD or GitOps tools which work with Kubernetes.

 ## Documentation

--- a/apis/core.oam.dev/common/types.go
+++ b/apis/core.oam.dev/common/types.go
@@ -160,10 +160,12 @@ const (

 // ApplicationComponentStatus record the health status of App component
 type ApplicationComponentStatus struct {
-	Name    string                   `json:"name"`
-	Healthy bool                     `json:"healthy"`
-	Message string                   `json:"message,omitempty"`
-	Traits  []ApplicationTraitStatus `json:"traits,omitempty"`
+	Name string `json:"name"`
+	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
+	Healthy            bool                     `json:"healthy"`
+	Message            string                   `json:"message,omitempty"`
+	Traits             []ApplicationTraitStatus `json:"traits,omitempty"`
 }

 // ApplicationTraitStatus records the trait health status
--- a/apis/core.oam.dev/common/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/common/zz_generated.deepcopy.go
@@ -65,6 +65,7 @@ func (in *AppStatus) DeepCopy() *AppStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationComponentStatus) DeepCopyInto(out *ApplicationComponentStatus) {
 	*out = *in
+	out.WorkloadDefinition = in.WorkloadDefinition
 	if in.Traits != nil {
 		in, out := &in.Traits, &out.Traits
 		*out = make([]ApplicationTraitStatus, len(*in))
--- a/apis/core.oam.dev/groupversion_info.go
+++ b/apis/core.oam.dev/groupversion_info.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/application_types.go
+++ b/apis/core.oam.dev/v1alpha2/application_types.go
@@ -88,8 +88,14 @@ type ApplicationSpec struct {

 // Application is the Schema for the applications API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={oam},shortName=app
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
+// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
+// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1alpha2/applicationrevision_types.go
+++ b/apis/core.oam.dev/v1alpha2/applicationrevision_types.go
@@ -55,7 +55,8 @@ type ApplicationRevisionSpec struct {

 // ApplicationRevision is the Schema for the ApplicationRevision API
 // +kubebuilder:object:root=true
-// +kubebuilder:shortName=apprev,resource:categories={oam}
+// +kubebuilder:resource:categories={oam},shortName=apprev
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type ApplicationRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1alpha2/approllout_types.go
+++ b/apis/core.oam.dev/v1alpha2/approllout_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -61,8 +61,14 @@ type AppRolloutStatus struct {

 // AppRollout is the Schema for the AppRollout API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={oam},shortName=approllout
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutStatus.rolloutTargetSize`
+// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.rolloutStatus.upgradedReplicas`
+// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.rolloutStatus.upgradedReadyReplicas`
+// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.rolloutStatus.batchRollingState`
+// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rolloutStatus.rollingState`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type AppRollout struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1alpha2/componentdefinition_types.go
+++ b/apis/core.oam.dev/v1alpha2/componentdefinition_types.go
@@ -67,8 +67,10 @@ type ComponentDefinitionStatus struct {
 // +kubebuilder:object:root=true

 // ComponentDefinition is the Schema for the componentdefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1alpha2/core_scope_types.go
+++ b/apis/core.oam.dev/v1alpha2/core_scope_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/core_trait_types.go
+++ b/apis/core.oam.dev/v1alpha2/core_trait_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/core_types.go
+++ b/apis/core.oam.dev/v1alpha2/core_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
@@ -69,8 +69,8 @@ type WorkloadDefinitionStatus struct {
 // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
 // is used to validate the schema of the workload when it is embedded in an OAM
 // Component.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
+// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -111,6 +111,10 @@ type TraitDefinitionSpec struct {
 	// +optional
 	WorkloadRefPath string `json:"workloadRefPath,omitempty"`

+	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+	// +optional
+	PodDisruptive bool `json:"podDisruptive,omitempty"`
+
 	// AppliesToWorkloads specifies the list of workload kinds this trait
 	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
@@ -158,9 +162,10 @@ type TraitDefinitionStatus struct {
 // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
 // to validate the schema of the trait when it is embedded in an OAM
 // ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -213,7 +218,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=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1alpha2/core_workload_types.go
+++ b/apis/core.oam.dev/v1alpha2/core_workload_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/doc.go
+++ b/apis/core.oam.dev/v1alpha2/doc.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/methods.go
+++ b/apis/core.oam.dev/v1alpha2/methods.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1alpha2/register.go
+++ b/apis/core.oam.dev/v1alpha2/register.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The KubeVela Authors.
+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.
--- a/apis/core.oam.dev/v1beta1/appdeployment_types.go
+++ b/apis/core.oam.dev/v1beta1/appdeployment_types.go
@@ -178,7 +178,7 @@ type AppDeploymentStatus struct {

 // AppDeployment is the Schema for the AppDeployment API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={oam},shortName=appdeploy
 // +kubebuilder:subresource:status
 type AppDeployment struct {
 	metav1.TypeMeta   `json:",inline"`
--- a/apis/core.oam.dev/v1beta1/application_types.go
+++ b/apis/core.oam.dev/v1beta1/application_types.go
@@ -67,6 +67,13 @@ type ApplicationSpec struct {
 // Application is the Schema for the applications API
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:categories={oam},shortName=app
+// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name`
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type`
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
+// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
+// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1beta1/applicationrevision_types.go
+++ b/apis/core.oam.dev/v1beta1/applicationrevision_types.go
@@ -56,6 +56,8 @@ type ApplicationRevisionSpec struct {

 // ApplicationRevision is the Schema for the ApplicationRevision API
 // +kubebuilder:storageversion
+// +kubebuilder:resource:categories={oam},shortName=apprev
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type ApplicationRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1beta1/approllout_types.go
+++ b/apis/core.oam.dev/v1beta1/approllout_types.go
@@ -41,10 +41,11 @@ type AppRolloutSpec 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
-	// It will remove the target app from the kubernetes if it's set to true
+	// RevertOnDelete revert the failed rollout when the rollout CR is deleted
+	// It will revert the change back to the source version at once (not in batches)
+	// Default is false
 	// +optional
-	RevertOnDelete *bool `json:"revertOnDelete,omitempty"`
+	RevertOnDelete bool `json:"revertOnDelete,omitempty"`
 }

 // AppRolloutStatus defines the observed state of AppRollout
@@ -62,9 +63,15 @@ type AppRolloutStatus struct {

 // AppRollout is the Schema for the AppRollout API
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:categories={oam}
+// +kubebuilder:resource:categories={oam},shortName=approllout
 // +kubebuilder:subresource:status
 // +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutTargetSize`
+// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.upgradedReplicas`
+// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.upgradedReadyReplicas`
+// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState`
+// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 type AppRollout struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1beta1/componentdefinition_types.go
+++ b/apis/core.oam.dev/v1beta1/componentdefinition_types.go
@@ -67,9 +67,11 @@ type ComponentDefinitionStatus struct {
 // +kubebuilder:object:root=true

 // ComponentDefinition is the Schema for the componentdefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
--- a/apis/core.oam.dev/v1beta1/core_types.go
+++ b/apis/core.oam.dev/v1beta1/core_types.go
@@ -20,6 +20,7 @@ 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/types"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
@@ -67,9 +68,10 @@ type WorkloadDefinitionStatus struct {
 // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD
 // is used to validate the schema of the workload when it is embedded in an OAM
 // Component.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload
 // +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -110,6 +112,10 @@ type TraitDefinitionSpec struct {
 	// +optional
 	WorkloadRefPath string `json:"workloadRefPath,omitempty"`

+	// PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+	// +optional
+	PodDisruptive bool `json:"podDisruptive,omitempty"`
+
 	// AppliesToWorkloads specifies the list of workload kinds this trait
 	// applies to. Workload kinds are specified in kind.group/version format,
 	// e.g. server.core.oam.dev/v1alpha2. Traits that omit this field apply to
@@ -157,10 +163,11 @@ type TraitDefinitionStatus struct {
 // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used
 // to validate the schema of the trait when it is embedded in an OAM
 // ApplicationConfiguration.
-// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
-// +kubebuilder:resource:scope=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait
 // +kubebuilder:subresource:status
 // +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
+// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -213,7 +220,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=Namespaced,categories={oam}
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
 // +kubebuilder:storageversion
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -232,12 +239,41 @@ type ScopeDefinitionList struct {
 }

 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status

 // An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:resource:scope=Cluster,categories={oam}
+// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
 type ResourceTracker struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Status ResourceTrackerStatus `json:"status,omitempty"`
+}
+
+// ResourceTrackerStatus define the status of resourceTracker
+type ResourceTrackerStatus struct {
+	TrackedResources []TypedReference `json:"trackedResources,omitempty"`
+}
+
+// A TypedReference refers to an object by Name, Kind, and APIVersion. It is
+// commonly used to reference across-namespace objects
+type TypedReference struct {
+	// APIVersion of the referenced object.
+	APIVersion string `json:"apiVersion"`
+
+	// Kind of the referenced object.
+	Kind string `json:"kind"`
+
+	// Name of the referenced object.
+	Name string `json:"name"`
+
+	// Namespace of the objects outside the application namespace.
+	// +optional
+	Namespace string `json:"namespace,omitempty"`
+
+	// UID of the referenced object.
+	// +optional
+	UID types.UID `json:"uid,omitempty"`
 }

 // +kubebuilder:object:root=true
--- a/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
@@ -225,11 +225,6 @@ func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
 		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.
@@ -867,6 +862,7 @@ func (in *ResourceTracker) DeepCopyInto(out *ResourceTracker) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Status.DeepCopyInto(&out.Status)
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTracker.
@@ -919,6 +915,26 @@ func (in *ResourceTrackerList) DeepCopyObject() runtime.Object {
 	return nil
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
+	*out = *in
+	if in.TrackedResources != nil {
+		in, out := &in.TrackedResources, &out.TrackedResources
+		*out = make([]TypedReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerStatus.
+func (in *ResourceTrackerStatus) DeepCopy() *ResourceTrackerStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ResourceTrackerStatus)
+	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
@@ -1146,6 +1162,21 @@ func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TypedReference) DeepCopyInto(out *TypedReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TypedReference.
+func (in *TypedReference) DeepCopy() *TypedReference {
+	if in == nil {
+		return nil
+	}
+	out := new(TypedReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *URIMatch) DeepCopyInto(out *URIMatch) {
 	*out = *in
--- a/apis/standard.oam.dev/v1alpha1/rollout_plan_types.go
+++ b/apis/standard.oam.dev/v1alpha1/rollout_plan_types.go
@@ -50,6 +50,9 @@ const (
 type RollingState string

 const (
+	// LocatingTargetAppState indicates that the rollout is in the stage of locating target app
+	// we use this state to make sure we special handle the target app successfully only once
+	LocatingTargetAppState RollingState = "locatingTargetApp"
 	// VerifyingSpecState indicates that the rollout is in the stage of verifying the rollout settings
 	// and the controller can locate both the target and the source
 	VerifyingSpecState RollingState = "verifyingSpec"
@@ -64,8 +67,12 @@ const (
 	RolloutFailingState RollingState = "rolloutFailing"
 	// RolloutSucceedState indicates that rollout successfully completed to match the desired target state
 	RolloutSucceedState RollingState = "rolloutSucceed"
-	// RolloutAbandoningState indicates that the rollout is abandoned, can be restarted. This is a terminal state
-	RolloutAbandoningState RollingState = "rolloutAbandoned"
+	// RolloutAbandoningState indicates that the rollout is being abandoned
+	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
+	RolloutAbandoningState RollingState = "rolloutAbandoning"
+	// RolloutDeletingState indicates that the rollout is being deleted
+	// we need to finalize it by cleaning up the old resources, adjust traffic and return control back to its owner
+	RolloutDeletingState RollingState = "RolloutDeletingState"
 	// RolloutFailedState indicates that rollout is failed, the target replica is not reached
 	// we can not move forward anymore, we will let the client to decide when or whether to revert.
 	RolloutFailedState RollingState = "rolloutFailed"
@@ -240,9 +247,13 @@ 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
+	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
 	// and does not change until the rollout is restarted
-	RolloutTargetTotalSize int32 `json:"rolloutTargetSize,omitempty"`
+	RolloutOriginalSize int32 `json:"rolloutOriginalSize,omitempty"`
+
+	// RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification
+	// and does not change until the rollout is restarted
+	RolloutTargetSize int32 `json:"rolloutTargetSize,omitempty"`

 	// NewPodTemplateIdentifier is a string that uniquely represent the new pod template
 	// each workload type could use different ways to identify that so we cannot compare between resources
--- a/apis/standard.oam.dev/v1alpha1/rollout_state.go
+++ b/apis/standard.oam.dev/v1alpha1/rollout_state.go
@@ -36,9 +36,15 @@ const (
 	// RollingRetriableFailureEvent indicates that we encountered an unexpected but retriable error
 	RollingRetriableFailureEvent RolloutEvent = "RollingRetriableFailureEvent"

+	// AppLocatedEvent indicates that apps are located successfully
+	AppLocatedEvent RolloutEvent = "AppLocatedEvent"
+
 	// RollingModifiedEvent indicates that the rolling target or source has changed
 	RollingModifiedEvent RolloutEvent = "RollingModifiedEvent"

+	// RollingDeletedEvent indicates that the rolling is being deleted
+	RollingDeletedEvent RolloutEvent = "RollingDeletedEvent"
+
 	// RollingSpecVerifiedEvent indicates that we have successfully verified that the rollout spec
 	RollingSpecVerifiedEvent RolloutEvent = "RollingSpecVerifiedEvent"

@@ -86,6 +92,8 @@ const (
 	RolloutFailing runtimev1alpha1.ConditionType = "RolloutFailing"
 	// RolloutAbandoning means that the rollout is being abandoned.
 	RolloutAbandoning runtimev1alpha1.ConditionType = "RolloutAbandoning"
+	// RolloutDeleting means that the rollout is being deleted.
+	RolloutDeleting runtimev1alpha1.ConditionType = "RolloutDeleting"
 	// RolloutFailed means that the rollout failed.
 	RolloutFailed runtimev1alpha1.ConditionType = "RolloutFailed"
 	// RolloutSucceed means that the rollout is done.
@@ -166,8 +174,8 @@ func (r *RolloutStatus) getRolloutConditionType() runtimev1alpha1.ConditionType
 	case RolloutAbandoningState:
 		return RolloutAbandoning

-	case RolloutFailedState:
-		return RolloutFailed
+	case RolloutDeletingState:
+		return RolloutDeleting

 	case RolloutSucceedState:
 		return RolloutSucceed
@@ -201,9 +209,9 @@ func (r *RolloutStatus) RolloutFailing(reason string) {
 // ResetStatus resets the status of the rollout to start from beginning
 func (r *RolloutStatus) ResetStatus() {
 	r.NewPodTemplateIdentifier = ""
-	r.RolloutTargetTotalSize = -1
+	r.RolloutTargetSize = -1
 	r.LastAppliedPodTemplateIdentifier = ""
-	r.RollingState = VerifyingSpecState
+	r.RollingState = LocatingTargetAppState
 	r.BatchRollingState = BatchInitializingState
 	r.CurrentBatch = 0
 	r.UpgradedReplicas = 0
@@ -234,7 +242,11 @@ func (r *RolloutStatus) SetRolloutCondition(new runtimev1alpha1.Condition) {
 	if !exists {
 		r.Conditions = append(r.Conditions, new)
 	}
+}

+// we can't panic since it will crash the other controllers
+func (r *RolloutStatus) illegalStateTransition(err error) {
+	r.RolloutFailed(err.Error())
 }

 // StateTransition is the center place to do rollout state transition
@@ -253,15 +265,41 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {

 	// we have special transition for these types of event since they require additional info
 	if event == RollingFailedEvent || event == RollingRetriableFailureEvent {
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		return
 	}
 	// special handle modified event here
 	if event == RollingModifiedEvent {
+		if r.RollingState == RolloutDeletingState {
+			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			return
+		}
 		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
 			r.ResetStatus()
 		} else {
 			r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout Spec is modified"))
 			r.RollingState = RolloutAbandoningState
+			r.BatchRollingState = BatchInitializingState
+		}
+		return
+	}
+
+	// special handle deleted event here, it can happen at many states
+	if event == RollingDeletedEvent {
+		if r.RollingState == RolloutFailedState || r.RollingState == RolloutSucceedState {
+			r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+			return
+		}
+		r.SetRolloutCondition(NewNegativeCondition(r.getRolloutConditionType(), "Rollout is being deleted"))
+		r.RollingState = RolloutDeletingState
+		r.BatchRollingState = BatchInitializingState
+		return
+	}
+
+	// special handle appLocatedEvent event here, it only applies to one state but it's legal to happen at other states
+	if event == AppLocatedEvent {
+		if r.RollingState == LocatingTargetAppState {
+			r.RollingState = VerifyingSpecState
 		}
 		return
 	}
@@ -273,7 +311,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = InitializingState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

 	case InitializingState:
 		if event == RollingInitializedEvent {
@@ -282,7 +320,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchInitializingState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

 	case RollingInBatchesState:
 		r.batchStateTransition(event)
@@ -294,7 +332,15 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.ResetStatus()
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+
+	case RolloutDeletingState:
+		if event == RollingFinalizedEvent {
+			r.SetRolloutCondition(NewPositiveCondition(r.getRolloutConditionType()))
+			r.RollingState = RolloutFailedState
+			return
+		}
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

 	case FinalisingState:
 		if event == RollingFinalizedEvent {
@@ -302,7 +348,7 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = RolloutSucceedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

 	case RolloutFailingState:
 		if event == RollingFinalizedEvent {
@@ -310,16 +356,13 @@ func (r *RolloutStatus) StateTransition(event RolloutEvent) {
 			r.RollingState = RolloutFailedState
 			return
 		}
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

-	case RolloutSucceedState:
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
-
-	case RolloutFailedState:
-		panic(fmt.Errorf(invalidRollingStateTransition, rollingState, event))
+	case RolloutSucceedState, RolloutFailedState:
+		r.illegalStateTransition(fmt.Errorf(invalidRollingStateTransition, rollingState, event))

 	default:
-		panic(fmt.Errorf("invalid rolling state %s", rollingState))
+		r.illegalStateTransition(fmt.Errorf("invalid rolling state %s before transition", rollingState))
 	}
 }

@@ -338,7 +381,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchInRollingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

 	case BatchInRollingState:
 		if event == RolloutOneBatchEvent {
@@ -346,7 +389,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchVerifyingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

 	case BatchVerifyingState:
 		if event == OneBatchAvailableEvent {
@@ -354,7 +397,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.BatchRollingState = BatchFinalizingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

 	case BatchFinalizingState:
 		if event == FinishedOneBatchEvent {
@@ -369,7 +412,7 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.RollingState = FinalisingState
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

 	case BatchReadyState:
 		if event == BatchRolloutApprovedEvent {
@@ -378,9 +421,9 @@ func (r *RolloutStatus) batchStateTransition(event RolloutEvent) {
 			r.CurrentBatch++
 			return
 		}
-		panic(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))
+		r.illegalStateTransition(fmt.Errorf(invalidBatchRollingStateTransition, batchRollingState, event))

 	default:
-		panic(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
+		r.illegalStateTransition(fmt.Errorf("invalid batch rolling state %s", batchRollingState))
 	}
 }
--- a/apis/standard.oam.dev/v1alpha1/rollouttrait_types.go
+++ b/apis/standard.oam.dev/v1alpha1/rollouttrait_types.go
@@ -42,6 +42,7 @@ type RolloutTraitSpec struct {
 // RolloutTrait is the Schema for the RolloutTrait API
 // +kubebuilder:object:root=true
 // +genclient
+// +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 type RolloutTrait struct {
 	metav1.TypeMeta   `json:",inline"`
--- a/apis/types/types.go
+++ b/apis/types/types.go
@@ -50,8 +50,6 @@ type EnvMeta struct {
 	Email     string `json:"email,omitempty"`
 	Domain    string `json:"domain,omitempty"`

-	// Below are not arguments, should be auto-generated
-	Issuer  string `json:"issuer"`
 	Current string `json:"current,omitempty"`
 }

@@ -66,4 +64,6 @@ const (
 	TypeCap = "Managing Capabilities"
 	// TypeSystem defines one category
 	TypeSystem = "System"
+	// TypePlugin defines one category used in Kubectl Plugin
+	TypePlugin = "Debug and Test"
 )
--- a/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
+++ b/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
@@ -14,6 +14,8 @@ spec:
    kind: AppDeployment
    listKind: AppDeploymentList
    plural: appdeployments
+    shortNames:
+    - appdeploy
    singular: appdeployment
  scope: Namespaced
  versions:
--- a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
@@ -9,13 +9,21 @@ metadata:
 spec:
  group: core.oam.dev
  names:
+    categories:
+    - oam
    kind: ApplicationRevision
    listKind: ApplicationRevisionList
    plural: applicationrevisions
+    shortNames:
+    - apprev
    singular: applicationrevision
  scope: Namespaced
  versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1alpha2
    schema:
      openAPIV3Schema:
        description: ApplicationRevision is the Schema for the ApplicationRevision API
@@ -404,8 +412,12 @@ spec:
                      rollingState:
                        description: RollingState is the Rollout State
                        type: string
+                      rolloutOriginalSize:
+                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                        format: int32
+                        type: integer
                      rolloutTargetSize:
-                        description: 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
+                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                        format: int32
                        type: integer
                      services:
@@ -434,6 +446,17 @@ spec:
                                - type
                                type: object
                              type: array
+                            workloadDefinition:
+                              description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              type: object
                          required:
                          - healthy
                          - name
@@ -748,6 +771,9 @@ spec:
                          description: Extension is used for extension needs by OAM platform builders
                          type: object
                          x-kubernetes-preserve-unknown-fields: true
+                        podDisruptive:
+                          description: PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+                          type: boolean
                        revisionEnabled:
                          description: Revision indicates whether a trait is aware of component revision
                          type: boolean
@@ -1058,7 +1084,12 @@ spec:
        type: object
    served: true
    storage: false
-  - name: v1beta1
+    subresources: {}
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
    schema:
      openAPIV3Schema:
        description: ApplicationRevision is the Schema for the ApplicationRevision API
@@ -1447,8 +1478,12 @@ spec:
                      rollingState:
                        description: RollingState is the Rollout State
                        type: string
+                      rolloutOriginalSize:
+                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                        format: int32
+                        type: integer
                      rolloutTargetSize:
-                        description: 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
+                        description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                        format: int32
                        type: integer
                      services:
@@ -1477,6 +1512,17 @@ spec:
                                - type
                                type: object
                              type: array
+                            workloadDefinition:
+                              description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                              required:
+                              - apiVersion
+                              - kind
+                              type: object
                          required:
                          - healthy
                          - name
@@ -1792,6 +1838,9 @@ spec:
                          description: Extension is used for extension needs by OAM platform builders
                          type: object
                          x-kubernetes-preserve-unknown-fields: true
+                        podDisruptive:
+                          description: PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+                          type: boolean
                        revisionEnabled:
                          description: Revision indicates whether a trait is aware of component revision
                          type: boolean
@@ -2102,6 +2151,7 @@ spec:
        type: object
    served: true
    storage: true
+    subresources: {}
 status:
  acceptedNames:
    kind: ""
--- a/charts/vela-core/crds/core.oam.dev_applications.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applications.yaml
@@ -25,10 +25,31 @@ spec:
    kind: Application
    listKind: ApplicationList
    plural: applications
+    shortNames:
+    - app
    singular: application
  scope: Namespaced
  versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - jsonPath: .spec.components[*].name
+      name: COMPONENT
+      type: string
+    - jsonPath: .spec.components[*].type
+      name: TYPE
+      type: string
+    - jsonPath: .status.status
+      name: PHASE
+      type: string
+    - jsonPath: .status.services[*].healthy
+      name: HEALTHY
+      type: boolean
+    - jsonPath: .status.services[*].message
+      name: STATUS
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1alpha2
    schema:
      openAPIV3Schema:
        description: Application is the Schema for the applications API
@@ -403,8 +424,12 @@ spec:
              rollingState:
                description: RollingState is the Rollout State
                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
              rolloutTargetSize:
-                description: 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
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                format: int32
                type: integer
              services:
@@ -433,6 +458,17 @@ spec:
                        - type
                        type: object
                      type: array
+                    workloadDefinition:
+                      description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                      properties:
+                        apiVersion:
+                          type: string
+                        kind:
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      type: object
                  required:
                  - healthy
                  - name
@@ -463,7 +499,26 @@ spec:
    storage: false
    subresources:
      status: {}
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.components[*].name
+      name: COMPONENT
+      type: string
+    - jsonPath: .spec.components[*].type
+      name: TYPE
+      type: string
+    - jsonPath: .status.status
+      name: PHASE
+      type: string
+    - jsonPath: .status.services[*].healthy
+      name: HEALTHY
+      type: boolean
+    - jsonPath: .status.services[*].message
+      name: STATUS
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
    schema:
      openAPIV3Schema:
        description: Application is the Schema for the applications API
@@ -838,8 +893,12 @@ spec:
              rollingState:
                description: RollingState is the Rollout State
                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
              rolloutTargetSize:
-                description: 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
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                format: int32
                type: integer
              services:
@@ -868,6 +927,17 @@ spec:
                        - type
                        type: object
                      type: array
+                    workloadDefinition:
+                      description: WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
+                      properties:
+                        apiVersion:
+                          type: string
+                        kind:
+                          type: string
+                      required:
+                      - apiVersion
+                      - kind
+                      type: object
                  required:
                  - healthy
                  - name
--- a/charts/vela-core/crds/core.oam.dev_approllouts.yaml
+++ b/charts/vela-core/crds/core.oam.dev_approllouts.yaml
@@ -14,10 +14,31 @@ spec:
    kind: AppRollout
    listKind: AppRolloutList
    plural: approllouts
+    shortNames:
+    - approllout
    singular: approllout
  scope: Namespaced
  versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - jsonPath: .status.rolloutStatus.rolloutTargetSize
+      name: TARGET
+      type: string
+    - jsonPath: .status.rolloutStatus.upgradedReplicas
+      name: UPGRADED
+      type: string
+    - jsonPath: .status.rolloutStatus.upgradedReadyReplicas
+      name: READY
+      type: string
+    - jsonPath: .status.rolloutStatus.batchRollingState
+      name: BATCH-STATE
+      type: string
+    - jsonPath: .status.rolloutStatus.rollingState
+      name: ROLLING-STATE
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1alpha2
    schema:
      openAPIV3Schema:
        description: AppRollout is the Schema for the AppRollout API
@@ -319,8 +340,12 @@ spec:
              rollingState:
                description: RollingState is the Rollout State
                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
              rolloutTargetSize:
-                description: 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
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                format: int32
                type: integer
              targetGeneration:
@@ -346,7 +371,26 @@ spec:
    storage: false
    subresources:
      status: {}
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .status.rolloutTargetSize
+      name: TARGET
+      type: string
+    - jsonPath: .status.upgradedReplicas
+      name: UPGRADED
+      type: string
+    - jsonPath: .status.upgradedReadyReplicas
+      name: READY
+      type: string
+    - jsonPath: .status.batchRollingState
+      name: BATCH-STATE
+      type: string
+    - jsonPath: .status.rollingState
+      name: ROLLING-STATE
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
    schema:
      openAPIV3Schema:
        description: AppRollout is the Schema for the AppRollout API
@@ -368,7 +412,7 @@ spec:
                  type: string
                type: array
              revertOnDelete:
-                description: RevertOnDelete revert the rollout when the rollout CR is deleted It will remove the target app from the kubernetes if it's set to true
+                description: RevertOnDelete revert the failed rollout when the rollout CR is deleted It will revert the change back to the source version at once (not in batches) Default is false
                type: boolean
              rolloutPlan:
                description: RolloutPlan is the details on how to rollout the resources
@@ -648,8 +692,12 @@ spec:
              rollingState:
                description: RollingState is the Rollout State
                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
              rolloutTargetSize:
-                description: 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
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                format: int32
                type: integer
              targetGeneration:
--- a/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
@@ -14,10 +14,19 @@ spec:
    kind: ComponentDefinition
    listKind: ComponentDefinitionList
    plural: componentdefinitions
+    shortNames:
+    - comp
    singular: componentdefinition
  scope: Namespaced
  versions:
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - jsonPath: .spec.workload.definition.kind
+      name: WORKLOAD-KIND
+      type: string
+    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
+      name: DESCRIPTION
+      type: string
+    name: v1alpha2
    schema:
      openAPIV3Schema:
        description: ComponentDefinition is the Schema for the componentdefinitions API
@@ -206,7 +215,14 @@ spec:
    storage: false
    subresources:
      status: {}
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.workload.definition.kind
+      name: WORKLOAD-KIND
+      type: string
+    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
+      name: DESCRIPTION
+      type: string
+    name: v1beta1
    schema:
      openAPIV3Schema:
        description: ComponentDefinition is the Schema for the componentdefinitions API
--- a/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
+++ b/charts/vela-core/crds/core.oam.dev_resourcetrackers.yaml
@@ -14,6 +14,8 @@ spec:
    kind: ResourceTracker
    listKind: ResourceTrackerList
    plural: resourcetrackers
+    shortNames:
+    - tracker
    singular: resourcetracker
  scope: Cluster
  versions:
@@ -30,9 +32,40 @@ spec:
            type: string
          metadata:
            type: object
+          status:
+            description: ResourceTrackerStatus define the status of resourceTracker
+            properties:
+              trackedResources:
+                items:
+                  description: A TypedReference refers to an object by Name, Kind, and APIVersion. It is commonly used to reference across-namespace objects
+                  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
+                    namespace:
+                      description: Namespace of the objects outside the application namespace.
+                      type: string
+                    uid:
+                      description: UID of the referenced object.
+                      type: string
+                  required:
+                  - apiVersion
+                  - kind
+                  - name
+                  type: object
+                type: array
+            type: object
        type: object
    served: true
    storage: true
+    subresources:
+      status: {}
 status:
  acceptedNames:
    kind: ""
--- a/charts/vela-core/crds/core.oam.dev_scopedefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_scopedefinitions.yaml
@@ -14,6 +14,8 @@ spec:
    kind: ScopeDefinition
    listKind: ScopeDefinitionList
    plural: scopedefinitions
+    shortNames:
+    - scope
    singular: scopedefinition
  scope: Namespaced
  versions:
--- a/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
@@ -14,12 +14,17 @@ spec:
    kind: TraitDefinition
    listKind: TraitDefinitionList
    plural: traitdefinitions
+    shortNames:
+    - trait
    singular: traitdefinition
  scope: Namespaced
  versions:
  - additionalPrinterColumns:
-    - jsonPath: .spec.definitionRef.name
-      name: DEFINITION-NAME
+    - jsonPath: .spec.appliesToWorkloads
+      name: APPLIES-TO
+      type: string
+    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
+      name: DESCRIPTION
      type: string
    name: v1alpha2
    schema:
@@ -63,6 +68,9 @@ spec:
                description: Extension is used for extension needs by OAM platform builders
                type: object
                x-kubernetes-preserve-unknown-fields: true
+              podDisruptive:
+                description: PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+                type: boolean
              revisionEnabled:
                description: Revision indicates whether a trait is aware of component revision
                type: boolean
@@ -192,8 +200,11 @@ spec:
    subresources:
      status: {}
  - additionalPrinterColumns:
-    - jsonPath: .spec.definitionRef.name
-      name: DEFINITION-NAME
+    - jsonPath: .spec.appliesToWorkloads
+      name: APPLIES-TO
+      type: string
+    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
+      name: DESCRIPTION
      type: string
    name: v1beta1
    schema:
@@ -237,6 +248,9 @@ spec:
                description: Extension is used for extension needs by OAM platform builders
                type: object
                x-kubernetes-preserve-unknown-fields: true
+              podDisruptive:
+                description: PodDisruptive specifies whether using the trait will cause the pod to restart or not.
+                type: boolean
              revisionEnabled:
                description: Revision indicates whether a trait is aware of component revision
                type: boolean
--- a/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
@@ -14,6 +14,8 @@ spec:
    kind: WorkloadDefinition
    listKind: WorkloadDefinitionList
    plural: workloaddefinitions
+    shortNames:
+    - workload
    singular: workloaddefinition
  scope: Namespaced
  versions:
@@ -204,6 +206,9 @@ spec:
    - jsonPath: .spec.definitionRef.name
      name: DEFINITION-NAME
      type: string
+    - jsonPath: .metadata.annotations.definition\.oam\.dev/description
+      name: DESCRIPTION
+      type: string
    name: v1beta1
    schema:
      openAPIV3Schema:
--- a/charts/vela-core/crds/standard.oam.dev_rollouttraits.yaml
+++ b/charts/vela-core/crds/standard.oam.dev_rollouttraits.yaml
@@ -9,6 +9,8 @@ metadata:
 spec:
  group: standard.oam.dev
  names:
+    categories:
+    - oam
    kind: RolloutTrait
    listKind: RolloutTraitList
    plural: rollouttraits
@@ -340,8 +342,12 @@ spec:
              rollingState:
                description: RollingState is the Rollout State
                type: string
+              rolloutOriginalSize:
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
+                format: int32
+                type: integer
              rolloutTargetSize:
-                description: 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
+                description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
                format: int32
                type: integer
              targetGeneration:
--- a/charts/vela-core/templates/NOTES.txt
+++ b/charts/vela-core/templates/NOTES.txt
@@ -1,21 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "kubevela.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "kubevela.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kubevela.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kubevela.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
-{{- end }}
+Welcome to use the KubeVela! Enjoy your shipping application journey!
--- a/charts/vela-core/templates/admission-webhooks/job-patch/clusterrole.yaml
+++ b/charts/vela-core/templates/admission-webhooks/job-patch/clusterrole.yaml
@@ -18,4 +18,11 @@ rules:
    verbs:
      - get
      - update
+  - apiGroups:
+      - apiextensions.k8s.io
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - get
+      - update
 {{- end }}
--- a/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -32,6 +32,7 @@ spec:
            - --namespace={{ .Release.Namespace }}
            - --secret-name={{ template "kubevela.fullname" . }}-admission
            - --patch-failure-policy={{ .Values.admissionWebhooks.failurePolicy }}
+            - --crds=applications.core.oam.dev
      restartPolicy: OnFailure
      serviceAccountName: {{ template "kubevela.fullname" . }}-admission
      {{- with .Values.admissionWebhooks.patch.affinity }}
--- a/charts/vela-core/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
+++ b/charts/vela-core/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.admissionWebhooks.enabled -}}
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
  name: {{ template "kubevela.fullname" . }}-admission
@@ -21,6 +21,7 @@ webhooks:
    failurePolicy: Fail
    {{- end }}
    name: mutating.core.oam.dev.v1alpha2.applicationconfigurations
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -47,6 +48,7 @@ webhooks:
    failurePolicy: Fail
    {{- end }}
    name: mutating.core.oam.dev.v1beta1.approllouts
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -70,9 +72,10 @@ webhooks:
    {{- if .Values.admissionWebhooks.patch.enabled  }}
    failurePolicy: Ignore
    {{- else }}
-    failurePolicy: Fails
+    failurePolicy: Fail
    {{- end }}
    name: mutating.core.oam-dev.v1alpha2.components
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -87,28 +90,6 @@ webhooks:
    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:
@@ -118,9 +99,12 @@ webhooks:
    {{- if .Values.admissionWebhooks.patch.enabled  }}
    failurePolicy: Ignore
    {{- else }}
-    failurePolicy: Fails
+    failurePolicy: Fail
    {{- end }}
    name: mcontainerized.kb.io
+    sideEffects: None
+    admissionReviewVersions:
+    - v1beta1
    rules:
      - apiGroups:
          - standard.oam.dev
--- a/charts/vela-core/templates/admission-webhooks/validatingWebhookConfiguration.yaml
+++ b/charts/vela-core/templates/admission-webhooks/validatingWebhookConfiguration.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.admissionWebhooks.enabled -}}
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
  name: {{ template "kubevela.fullname" . }}-admission
@@ -21,6 +21,7 @@ webhooks:
    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
    {{- end }}
    name: validating.core.oam.dev.v1alpha2.applicationconfigurations
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -47,6 +48,7 @@ webhooks:
    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
    {{- end }}
    name: validating.core.oam.dev.v1beta1.approllouts
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -73,6 +75,7 @@ webhooks:
    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
    {{- end }}
    name: validating.core.oam.dev.v1alpha2.components
+    sideEffects: None
    rules:
      - apiGroups:
          - core.oam.dev
@@ -99,6 +102,9 @@ webhooks:
    failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }}
    {{- end }}
    name: validating.core.oam.dev.v1alpha2.traitdefinitions
+    sideEffects: None
+    admissionReviewVersions:
+      - v1beta1
    rules:
      - apiGroups:
          - core.oam.dev
@@ -113,29 +119,6 @@ webhooks:
    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:
@@ -144,6 +127,9 @@ webhooks:
        path: /validate-standard-oam-dev-v1alpha1-podspecworkload
    failurePolicy: Fail
    name: vcontainerized.kb.io
+    admissionReviewVersions:
+      - v1beta1
+    sideEffects: None
    rules:
      - apiGroups:
          - standard.oam.dev
--- a/charts/vela-core/templates/defwithtemplate/annotations.yaml
+++ b/charts/vela-core/templates/defwithtemplate/annotations.yaml
@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Add annotations for your Workload."
+  name: annotations
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	spec: template: metadata: annotations: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        }
+        parameter: [string]: string
+        
--- a/charts/vela-core/templates/defwithtemplate/cpuhpa.yaml
+++ b/charts/vela-core/templates/defwithtemplate/cpuhpa.yaml
@@ -0,0 +1,51 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "configure k8s HPA with CPU metrics for Deployment"
+  name: cpuscaler
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  schematic:
+    cue:
+      template: |
+        outputs: cpuhpa: {
+        	apiVersion: "autoscaling/v2beta2"
+        	kind:       "HorizontalPodAutoscaler"
+        	metadata: name: context.name
+        	spec: {
+        		scaleTargetRef: {
+        			apiVersion: "apps/v1"
+        			kind:       "Deployment"
+        			name:       context.name
+        		}
+        		minReplicas: parameter.min
+        		maxReplicas: parameter.max
+        		metrics: [{
+        			type: "Resource"
+        			resource: {
+        				name: "cpu"
+        				target: {
+        					type:               "Utilization"
+        					averageUtilization: parameter.cpuUtil
+        				}
+        			}
+        		}]
+        	}
+        }
+        parameter: {
+        
+        	// +usage=Specify the minimal number of replicas to which the autoscaler can scale down
+        	min: *1 | int
+        
+        	// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up
+        	max: *10 | int
+        
+        	// +usage=Specify the average cpu utilization, for example, 50 means the CPU usage is 50%
+        	cpuUtil: *50 | int
+        }
+        
--- a/charts/vela-core/templates/defwithtemplate/ingress.yaml
+++ b/charts/vela-core/templates/defwithtemplate/ingress.yaml
@@ -21,14 +21,10 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: false
  schematic:
    cue:
      template: |
-        parameter: {
-        	domain: string
-        	http: [string]: int
-        }
-        
        // trait template can have multiple outputs in one trait
        outputs: service: {
        	apiVersion: "v1"
@@ -71,3 +67,11 @@ spec:
        	}
        }
        
+        parameter: {
+        	// +usage=Specify the domain you want to expose
+        	domain: string
+        
+        	// +usage=Specify the mapping relationship between the http path and the workload port
+        	http: [string]: int
+        }
+        
--- a/charts/vela-core/templates/defwithtemplate/labels.yaml
+++ b/charts/vela-core/templates/defwithtemplate/labels.yaml
@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Add labels for your Workload."
+  name: labels
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	spec: template: metadata: labels: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        }
+        parameter: [string]: string
+        
--- a/charts/vela-core/templates/defwithtemplate/manualscale.yaml
+++ b/charts/vela-core/templates/defwithtemplate/manualscale.yaml
@@ -3,29 +3,22 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
  annotations:
-    definition.oam.dev/description: "Configures replicas for your service."
+    definition.oam.dev/description: "Configures replicas for your service by patch replicas field."
  name: scaler
  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - webservice
    - worker
-  definitionRef:
-    name: manualscalertraits.core.oam.dev
-  workloadRefPath: spec.workloadRef
+  podDisruptive: false
  schematic:
    cue:
      template: |
-        outputs: scaler: {
-        	apiVersion: "core.oam.dev/v1alpha2"
-        	kind:       "ManualScalerTrait"
-        	spec: {
-        		replicaCount: parameter.replicas
-        	}
+        patch: {
+        	spec: replicas: parameter.replicas
        }
        parameter: {
-        	//+short=r
-        	//+usage=Replicas of the workload
+        	// +usage=Specify the number of workload
        	replicas: *1 | int
        }
        
--- a/charts/vela-core/templates/defwithtemplate/sidecar.yaml
+++ b/charts/vela-core/templates/defwithtemplate/sidecar.yaml
@@ -0,0 +1,48 @@
+# Code generated by KubeVela templates. DO NOT EDIT.
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "inject a sidecar container into your app"
+  name: sidecar
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  schematic:
+    cue:
+      template: |-
+        patch: {
+        	// +patchKey=name
+        	spec: template: spec: containers: [{
+        		name:    parameter.name
+        		image:   parameter.image
+        		command: parameter.cmd
+        		if parameter["volumes"] != _|_ {
+        			volumeMounts: [ for v in parameter.volumes {
+        				{
+        					mountPath: v.path
+        					name:      v.name
+        				}
+        			}]
+        		}
+        	}]
+        }
+        parameter: {
+        	// +usage=Specify the name of sidecar container
+        	name: string
+        
+        	// +usage=Specify the image of sidecar container
+        	image: string
+        
+        	// +usage=Specify the commands run in the sidecar
+        	cmd?: [...string]
+        
+        	// +usage=Specify the shared volume path
+        	volumes?: [...{
+        		name: string
+        		path: string
+        	}]
+        }
+        
--- a/charts/vela-core/templates/defwithtemplate/task.yaml
+++ b/charts/vela-core/templates/defwithtemplate/task.yaml
@@ -34,7 +34,7 @@ spec:
        	}
        }
        parameter: {
-        	// +usage=specify number of tasks to run in parallel
+        	// +usage=Specify number of tasks to run in parallel
        	// +short=c
        	count: *1 | int
        
--- a/charts/vela-core/templates/defwithtemplate/webservice.yaml
+++ b/charts/vela-core/templates/defwithtemplate/webservice.yaml
@@ -62,7 +62,50 @@ spec:
        								cpu: parameter.cpu
        						}
        					}
+        
+        					if parameter["volumes"] != _|_ {
+        						volumeMounts: [ for v in parameter.volumes {
+        							{
+        								mountPath: v.mountPath
+        								name:      v.name
+        							}}]
+        					}
        				}]
+        
+        			if parameter["volumes"] != _|_ {
+        				volumes: [ for v in parameter.volumes {
+        					{
+        						name: v.name
+        						if v.type == "pvc" {
+        							persistentVolumeClaim: {
+        								claimName: v.claimName
+        							}
+        						}
+        						if v.type == "configMap" {
+        							configMap: {
+        								defaultMode: v.defaultMode
+        								name:        v.cmName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "secret" {
+        							secret: {
+        								defaultMode: v.defaultMode
+        								secretName:  v.secretName
+        								if v.items != _|_ {
+        									items: v.items
+        								}
+        							}
+        						}
+        						if v.type == "emptyDir" {
+        							emptyDir: {
+        								medium: v.medium
+        							}
+        						}
+        					}}]
+        			}
        		}
        		}
        	}
@@ -100,5 +143,37 @@ spec:
        
        	// If addRevisionLabel is true, the appRevision label will be added to the underlying pods 
        	addRevisionLabel: *false | bool
+        
+        	// +usage=Declare volumes and volumeMounts
+        	volumes?: [...{
+        		name:      string
+        		mountPath: string
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		if type == "pvc" {
+        			claimName: string
+        		}
+        		if type == "configMap" {
+        			defaultMode: *420 | int
+        			cmName:      string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "secret" {
+        			defaultMode: *420 | int
+        			secretName:  string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "emptyDir" {
+        			medium: *"" | "Memory"
+        		}
+        	}]
        }
        
--- a/charts/vela-core/templates/defwithtemplate/worker.yaml
+++ b/charts/vela-core/templates/defwithtemplate/worker.yaml
@@ -35,7 +35,59 @@ spec:
        					if parameter["cmd"] != _|_ {
        						command: parameter.cmd
        					}
+        
+        					if parameter["volumes"] != _|_ {
+        						volumeMounts: [ for v in parameter.volumes {
+        							{
+        								mountPath: v.mountPath
+        								name:      v.name
+        							}
+        						}]
+        					}
+        
+        					if parameter["volumes"] != _|_ {
+        						volumeMounts: [ for v in parameter.volumes {
+        							{
+        								mountPath: v.mountPath
+        								name:      v.name
+        							}}]
+        					}
        				}]
+        
+        				if parameter["volumes"] != _|_ {
+        					volumes: [ for v in parameter.volumes {
+        						{
+        							name: v.name
+        							if v.type == "pvc" {
+        								persistentVolumeClaim: {
+        									claimName: v.claimName
+        								}
+        							}
+        							if v.type == "configMap" {
+        								configMap: {
+        									defaultMode: v.defaultMode
+        									name:        v.cmName
+        									if v.items != _|_ {
+        										items: v.items
+        									}
+        								}
+        							}
+        							if v.type == "secret" {
+        								secret: {
+        									defaultMode: v.defaultMode
+        									secretName:  v.secretName
+        									if v.items != _|_ {
+        										items: v.items
+        									}
+        								}
+        							}
+        							if v.type == "emptyDir" {
+        								emptyDir: {
+        									medium: v.medium
+        								}
+        							}
+        						}}]
+        				}
        			}
        		}
        	}
@@ -47,5 +99,36 @@ spec:
        	image: string
        	// +usage=Commands to run in the container
        	cmd?: [...string]
+        	// +usage=Declare volumes and volumeMounts
+        	volumes?: [...{
+        		name:      string
+        		mountPath: string
+        		// +usage=Specify volume type, options: "pvc","configMap","secret","emptyDir"
+        		type: "pvc" | "configMap" | "secret" | "emptyDir"
+        		if type == "pvc" {
+        			claimName: string
+        		}
+        		if type == "configMap" {
+        			defaultMode: *420 | int
+        			cmName:      string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "secret" {
+        			defaultMode: *420 | int
+        			secretName:  string
+        			items?: [...{
+        				key:  string
+        				path: string
+        				mode: *511 | int
+        			}]
+        		}
+        		if type == "emptyDir" {
+        			medium: *"" | "Memory"
+        		}
+        	}]
        }
        
--- a/charts/vela-core/templates/ingress.yaml
+++ b/charts/vela-core/templates/ingress.yaml
@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "kubevela.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "kubevela.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}
--- a/charts/vela-core/templates/kubevela-controller.yaml
+++ b/charts/vela-core/templates/kubevela-controller.yaml
@@ -120,6 +120,8 @@ spec:
            {{ if ne .Values.disableCaps "" }}
            - "--disable-caps={{ .Values.disableCaps }}"
            {{ end }}
+            - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
+            - "--application-revision-limit={{ .Values.applicationRevisionLimit }}"
          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
--- a/charts/vela-core/templates/test/test-application.yaml
+++ b/charts/vela-core/templates/test/test-application.yaml
@@ -0,0 +1,60 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  annotations:
+    helm.sh/hook: test-success
+  name: first-vela-app
+spec:
+  components:
+    - name: express-server
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+        port: 8000
+      traits:
+        - type: ingress
+          properties:
+            domain: testsvc.example.com
+            http:
+              "/": 8000
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-application-test"
+  annotations:
+    "helm.sh/hook": test
+spec:
+  serviceAccountName: kubevela-vela-core
+  containers:
+    - name: {{ .Release.Name }}-application-test
+      image: alpine/k8s:1.18.2
+      imagePullPolicy: IfNotPresent
+      command:
+        - /bin/bash
+        - -ec
+        - |
+
+          set -e
+
+          echo "Waiting application is ready..."
+
+          echo "waiting for application being Applied"
+          kubectl -n vela-system wait --for=condition=Applied application first-vela-app --timeout=3m
+          echo "application being Applied"
+
+          # wait for deploy being created
+          echo "waiting for deployment being available"
+          kubectl -n vela-system wait --for=condition=available deploy express-server --timeout 3m
+          echo "deployment being available"
+
+          # wait for ingress being created
+          while ! [ `kubectl -n vela-system get ing express-server | grep -v NAME | wc -l` = 1 ]; do
+            echo "waiting for ingress being created"
+            sleep 1
+          done
+
+
+
+          echo "Application and its components are created"
+  restartPolicy: Never
--- a/charts/vela-core/templates/tests/test-connection.yaml
+++ b/charts/vela-core/templates/tests/test-connection.yaml
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "kubevela.fullname" . }}-test-connection"
-  labels:
-    {{- include "kubevela.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "kubevela.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
--- a/charts/vela-core/values.yaml
+++ b/charts/vela-core/values.yaml
@@ -38,24 +38,6 @@ securityContext: {}
  # runAsNonRoot: true
  # runAsUser: 1000

-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-
 resources:
  limits:
    cpu: 500m
@@ -88,8 +70,8 @@ admissionWebhooks:
  patch:
    enabled: true
    image:
-      repository: jettech/kube-webhook-certgen
-      tag: v1.5.0
+      repository: wonderflow/kube-webhook-certgen
+      tag: v2.1
      pullPolicy: IfNotPresent
    affinity: {}
    tolerations: []
@@ -98,3 +80,5 @@ admissionWebhooks:


 systemDefinitionNamespace: vela-system
+
+applicationRevisionLimit: 10
--- a/cmd/core/main.go
+++ b/cmd/core/main.go
@@ -30,9 +30,6 @@ import (
 	"time"

 	"github.com/crossplane/crossplane-runtime/pkg/logging"
-	injectorcontroller "github.com/oam-dev/trait-injector/controllers"
-	"github.com/oam-dev/trait-injector/pkg/injector"
-	"github.com/oam-dev/trait-injector/pkg/plugin"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -70,7 +67,7 @@ func main() {
 	var logRetainDate int
 	var certDir string
 	var webhookPort int
-	var useWebhook, useTraitInjector bool
+	var useWebhook bool
 	var controllerArgs oamcontroller.Args
 	var healthAddr string
 	var disableCaps string
@@ -79,7 +76,6 @@ func main() {
 	var applyOnceOnly string

 	flag.BoolVar(&useWebhook, "use-webhook", false, "Enable Admission Webhook")
-	flag.BoolVar(&useTraitInjector, "use-trait-injector", false, "Enable TraitInjector")
 	flag.StringVar(&certDir, "webhook-cert-dir", "/k8s-webhook-server/serving-certs", "Admission webhook cert/key dir.")
 	flag.IntVar(&webhookPort, "webhook-port", 9443, "admission webhook listen address")
 	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
@@ -93,6 +89,8 @@ func main() {
 	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.IntVar(&controllerArgs.AppRevisionLimit, "application-revision-limit", 10,
+		"application-revision-limit is the maximum number of application useless revisions that will be maintained, if the useless revisions exceed this number, older ones will be GCed first.The default value is 10.")
 	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.BoolVar(&controllerArgs.ApplicationConfigurationInstalled, "app-config-installed", true,
@@ -217,24 +215,6 @@ func main() {
 	}
 	setupLog.Info("use storage driver", "storageDriver", os.Getenv(system.StorageDriverEnv))

-	if useTraitInjector {
-		// register all service injectors
-		plugin.RegisterTargetInjectors(injector.Defaults()...)
-
-		tiWebhook := &injectorcontroller.ServiceBindingReconciler{
-			Client:   mgr.GetClient(),
-			Log:      ctrl.Log.WithName("controllers").WithName("ServiceBinding"),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("servicebinding"),
-		}
-		if err = (tiWebhook).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "ServiceBinding")
-			os.Exit(1)
-		}
-		// this has hard coded requirement "./ssl/service-injector.pem", "./ssl/service-injector.key"
-		go tiWebhook.ServeAdmission()
-	}
-
 	setupLog.Info("starting the vela controller manager")

 	if err := mgr.Start(makeSignalHandler()); err != nil {
--- a/cmd/plugin/main.go
+++ b/cmd/plugin/main.go
@@ -0,0 +1,35 @@
+/*
+ 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 main
+
+import (
+	"math/rand"
+	"os"
+	"time"
+
+	"github.com/oam-dev/kubevela/pkg/plugin/cli"
+)
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	command := cli.NewCommand()
+
+	if err := command.Execute(); err != nil {
+		os.Exit(1)
+	}
+}
--- a/design/vela-core/APIServer-Catalog.md
+++ b/design/vela-core/APIServer-Catalog.md
@@ -51,7 +51,7 @@ There are two distinguished layers:
 - **API layer**: It defines the API discovery and serving endpoints that Vela APIServer implementation must follow. This is the integration point for external system components (e.g. UI) to contact.
 - **Storage layer**: It describes the storage systems and objects that Vela APIServer syncs data with behind the scene. There are three types of storage:
  - **K8s cluster**: Vela APIServer manages multiple k8s clusters with regard to the applications and definitions custom resources.
-  - **Catalog server**: Vela APIServer manages mulitple catalogs which contain COTS application pacakges. Currently in our use case the catalogs resides in Git repos. In the future we can extend this to other catalog storage like file server, object storage.
+  - **Catalog server**: Vela APIServer manages multiple catalogs which contain COTS application pacakges. Currently in our use case the catalogs resides in Git repos. In the future we can extend this to other catalog storage like file server, object storage.
  - **MySQL database**: Vela APIServer stores global, cross-cluster, cross catalog information in a MySQL database. These data do not exist in k8s or catalog and thus need to be managed by APIServer in a separate database. The database is usually hosted on cloud.

 #### Environment API
--- a/design/vela-core/app_deployment.md
+++ b/design/vela-core/app_deployment.md
@@ -105,7 +105,7 @@ In the following example, we are assuming the app has deployed v1 now and is upg

 We will make sure the spec works for the following environments:

- K8s ingress + service (traffic split percetange determined by replica number)
+- K8s ingress + service (traffic split percentages determined by replica number)
 - Istio service mesh

 Here is the workflow with Istio:
--- a/design/vela-core/apply-once-only.md
+++ b/design/vela-core/apply-once-only.md
@@ -142,7 +142,7 @@ Besides the condition in `apply-once-only`, `apply-once-only-force` has one more

 Three available options are provided to a vela-core runtime setup flag named `apply-one-only`, referring to three modes:

- off - `apply-once-only` is disabeld, this is the default option
+- off - `apply-once-only` is disabled, this is the default option
 - on - `apply-once-only` is enabled
 - force - `apply-once-only-force` is enabled

--- a/design/vela-core/apply-workload-and-trait.md
+++ b/design/vela-core/apply-workload-and-trait.md
@@ -152,7 +152,7 @@ status:
 # update with original manifest fails
 # reconciling also fails for cannot applying trait
 ```
-Additonally, if a trait has no immutable field, update will eliminate all fields set by others.
+Additionally, if a trait has no immutable field, update will eliminate all fields set by others.
 ```yaml
 # original trait manifest
 kind: Bar
--- a/design/vela-core/restful-interface.md
+++ b/design/vela-core/restful-interface.md
@@ -136,7 +136,7 @@ const cueTemplate appCreateMode = "appFile"
 ```go
 type appConfigValue struct {
    appName string       `json:"appName"`
-    defintion runtime.RawExtension `json:"defintion"` // the content
+    definition runtime.RawExtension `json:"definition"` // the content
    definitionName string `json:"definitionName"` // use to find the definition
    definitionType string `json:"definitionType"`
 }
@@ -161,7 +161,7 @@ const cueTemplate appUpdateMode = "appFile"
 ```go

 type appConfigValue struct {
-    defintion runtime.RawExtension `json:"defintion"` // the content
+    definition runtime.RawExtension `json:"definition"` // the content
 }
 ```

--- a/design/vela-core/rollout-design.md
+++ b/design/vela-core/rollout-design.md
@@ -179,7 +179,7 @@ just change the application, and the system will pick up the change, then apply
 depends on the workload type and we will list each in the 
 [rollout with different workload](#Rollout plan work with different type of workloads) section
 . This special AC logic is also the real magic for the other rollout scenario to work as AC
-  controller is the only entity that is directly responsible for emiting the workload to the k8s.
+  controller is the only entity that is directly responsible for emitting the workload to the k8s.
   
   
 #### ApplicationDeployment workflow 
--- a/design/vela-core/route.md
+++ b/design/vela-core/route.md
@@ -1,8 +1,8 @@
 # Route Trait Design

-The main idea of route trait is to let users have an entrypoint to visit their App.
+The main idea of [route trait](https://github.com/oam-dev/catalog/tree/master/traits/routetrait) is to let users have an entrypoint to visit their App.

-In k8s world, if you want to do so, you have to understand K8s [Serivce](https://kubernetes.io/docs/concepts/services-networking/service/)
+In k8s world, if you want to do so, you have to understand K8s [Service](https://kubernetes.io/docs/concepts/services-networking/service/)
 , [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/), [Ingress Controllers](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/).
 It's not easy to get all of these things work well.

--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,72 @@
+# Contributing to KubeVela Docs
+
+[Here](https://github.com/oam-dev/kubevela/tree/master/docs) is the source documentation of [Kubevela website](http://kubevela.io/).
+Any files modifid here will trigger the `check-docs` Github action to run and validate the docs could be build successfully into the website.
+Any changes on these files(`docs/en/*`, `docs/en/resource/*`, `sidebars.js`) will be submitted to the corresponding locations of the repo 
+[kubevela.io](https://github.com/oam-dev/kubevela.io). The Github-Action there will parse the document and publish it to the Kubevela Website automatically.
+
+Please follow our guides below to learn how to write the docs in the right way.
+
+## Add or Update Docs
+
+When you add or modify the docs, these three files(`docs/en/`, `docs/en/resource/` and `sidebars.js`) should be taken into consideration.
+
+1. `docs/en/`, the main English documentation files are mainly located in this folder. All markdown files need to follow the format,
+   that the title at the beginning should be in the following format:
+   
+    ```markdown
+    ---
+    title: Title Name
+    ---
+
+    ```
+
+   When you want to add a link refer to any `.md` files inside the docs(`docs/en`), you need to use relative path and remove the `.md` suffix.
+   For example, the `en/helm/component.md` has a link refer to `en/platform-engineers/definition-and-templates.md`. Then the format should like:
+   
+    ```markdown
+    [the definition and template concepts](../platform-engineers/definition-and-templates)
+    ```
+   
+2. `docs/en/resource/`, image files are located in this folder. When you want to use link any image in documentation, 
+   you should put the image resources here and use a relative path like below:
+  
+   ```markdown
+    ![alt](./resources/concepts.png)
+    ```
+
+3. `sidebars.js`, this file contain the navigation information of the KubeVela website.
+    Please read [the official docs of docusaurus](https://docusaurus.io/docs/sidebar) to learn how to write `sidebar.js`.
+    
+    ```js
+       {
+          type: 'category',
+          label: 'Capability References',
+          items: [
+            // Note!: here must be add the path under "docs/en" 
+            'developers/references/README',
+            'developers/references/workload-types/webservice',
+            'developers/references/workload-types/task',
+            ...
+          ],
+        },
+    ```
+
+[comment]: <> (TODO: ADD how to translate into Chinese or other language here.)
+   
+## Local Development
+
+You can preview the website locally with the `node` and `yarn` installed.
+Every time you modify the files under the docs, you need to re-run the following command, it will not sync automatically:
+
+```shell
+make docs-start
+```
+
+## Build in Local
+
+You can build Kubevela website in local to test the correctness of docs, only run the following cmd:
+
+```shell
+make docs-build
+```
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -1,159 +0,0 @@
-/** @type {import('@docusaurus/types').DocusaurusConfig} */
-module.exports = {
-  title: 'KubeVela',
-  tagline: 'Make shipping applications more enjoyable.',
-  url: 'https://kubevela.io',
-  baseUrl: '/',
-  onBrokenLinks: 'throw',
-  onBrokenMarkdownLinks: 'warn',
-  favicon: 'img/favicon.ico',
-  organizationName: 'oam-dev', // Usually your GitHub org/user name.
-  projectName: 'kubevela.io', // Usually your repo name.
-  i18n: {
-    defaultLocale: 'en',
-    locales: ['en', 'zh'],
-    localeConfigs: {
-      en: {
-        label: 'English',
-      },
-      zh: {
-        label: '简体中文',
-      },
-    },
-  },
-  themeConfig: {
-    navbar: {
-      title: 'KubeVela',
-      logo: {
-        alt: 'KubeVela',
-        src: 'img/logo.svg',
-        srcDark: 'img/logoDark.svg',
-      },
-      items: [
-        {
-          type: 'docsVersionDropdown',
-          position: 'right',
-        },
-        {
-          to: 'docs/',
-          activeBasePath: 'docs',
-          label: 'Documentation',
-          position: 'left',
-        },
-        {
-          to: 'blog',
-          label: 'Blog',
-          position: 'left'
-        },
-        {
-          type: 'localeDropdown',
-          position: 'right',
-        },
-        {
-          href: 'https://github.com/oam-dev/kubevela',
-          className: 'header-githab-link',
-          position: 'right',
-        },
-      ],
-    },
-    footer: {
-      links: [
-        {
-          title: 'Documentation',
-          items: [
-            {
-              label: 'Getting Started',
-              to: '/docs/install',
-            },
-            {
-              label: 'Platform Builder Guide',
-              to: '/docs/platform-engineers/overview',
-            },
-            {
-              label: 'Developer Experience Guide',
-              to: '/docs/quick-start-appfile',
-            },
-          ],
-        },
-        {
-          title: 'Community',
-          items: [
-            {
-              label: 'Slack ( #kubevela channel )',
-              href: 'https://slack.cncf.io/'
-            },
-            {
-              label: 'Gitter',
-              href: 'https://gitter.im/oam-dev/community',
-            },
-            {
-              label: 'DingTalk (23310022)',
-              href: '.',
-            }
-          ],
-        },
-        {
-          title: 'More',
-          items: [
-            {
-              label: 'GitHub',
-              href: 'https://github.com/oam-dev/kubevela',
-            },
-            {
-              label: 'Blog',
-              to: 'blog',
-            },
-          ],
-        },
-      ],
-      copyright: `
-        <br />
-        <strong>© KubeVela Authors ${new Date().getFullYear()} | Documentation Distributed under <a herf="https://creativecommons.org/licenses/by/4.0">CC-BY-4.0</a> </strong>
-        <br />
-      `,
-    },
-    prism: {
-      theme: require('prism-react-renderer/themes/dracula'),
-    },
-  },
-  plugins: [
-    [
-      require.resolve("@easyops-cn/docusaurus-search-local"),
-      {
-        hashed: true,
-        language: ["en", "zh"],
-        indexBlog: true,
-      },
-    ],
-  ],
-  presets: [
-    [
-      '@docusaurus/preset-classic',
-      {
-        docs: {
-          sidebarPath: require.resolve('./sidebars.js'),
-          editUrl:
-            'https://github.com/oam-dev/kubevela.io/edit/main/',
-          showLastUpdateAuthor: true,
-          showLastUpdateTime: true,
-          includeCurrentVersion: true,
-          lastVersion: 'current',
-          // versions: {
-          //   current: {
-          //     label: 'master',
-          //     path: '/',
-          //   },
-          // },
-        },
-        blog: {
-          showReadingTime: true,
-          editUrl:
-            'https://github.com/oam-dev/kubevela.io/tree/main/blog',
-        },
-        theme: {
-          customCss: require.resolve('./src/css/custom.css'),
-        },
-      },
-    ],
-  ],
-};
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -1,10 +1,10 @@
-![alt](../resources/KubeVela-03.png)
+![alt](resources/KubeVela-03.png)

 *Make shipping applications more enjoyable.*

 # KubeVela

-KubeVela is the platform engine to create *PaaS-like* experience on Kubernetes, in a scalable approach.
+KubeVela is a modern application engine that adapts to your application's needs, not the other way around.

 ## Community

--- a/docs/en/advanced-install.md
+++ b/docs/en/advanced-install.md
@@ -0,0 +1,124 @@
+---
+title:  Advanced Topics for Installation
+---
+
+## Install KubeVela with cert-manager
+
+KubeVela can use cert-manager generate certs for your application if it's available. Note that you need to install cert-manager **before** the KubeVela chart.
+
+```shell script
+helm repo add jetstack https://charts.jetstack.io
+helm repo update
+helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.2.0 --create-namespace --set installCRDs=true
+```
+
+Install kubevela with enabled certmanager:
+```shell script
+helm install --create-namespace -n vela-system --set admissionWebhooks.certManager.enabled=true kubevela kubevela/vela-core
+```
+
+## Install Pre-release
+    
+Add flag `--devel` in command `helm search` to choose a pre-release
+version in format `<next_version>-rc-master`. It means a release candidate version build on `master` branch,
+such as `0.4.0-rc-master`.
+
+```shell script
+helm search repo kubevela/vela-core -l --devel
+```
+```console
+    NAME                      CHART VERSION         APP VERSION           DESCRIPTION
+    kubevela/vela-core        0.4.0-rc-master         0.4.0-rc-master         A Helm chart for KubeVela core
+    kubevela/vela-core        0.3.2                   0.3.2                   A Helm chart for KubeVela core
+    kubevela/vela-core        0.3.1                 0.3.1                 A Helm chart for KubeVela core
+```
+
+And try the following command to install it.
+
+```shell script
+helm install --create-namespace -n vela-system kubevela kubevela/vela-core --version <next_version>-rc-master
+```
+```console
+NAME: kubevela
+LAST DEPLOYED: Thu Apr  1 19:41:30 2021
+NAMESPACE: vela-system
+STATUS: deployed
+REVISION: 1
+NOTES:
+Welcome to use the KubeVela! Enjoy your shipping application journey!
+```
+
+## Upgrade
+
+### Step 1. Update Helm repo
+
+
+You can explore the newly released chart versions of KubeVela by run:
+
+```shell
+helm repo update
+helm search repo kubevela/vela-core -l
+```
+
+### Step 2. Upgrade KubeVela CRDs
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applications.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_approllouts.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_scopedefinitions.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_appdeployments.yaml
+kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/charts/vela-core/crds/core.oam.dev_applicationcontexts.yaml
+```
+
+> Tips: If you see errors like `* is invalid: spec.scope: Invalid value: "Namespaced": filed is immutable`. Please delete the CRD which reports error and re-apply the kubevela crds.
+
+```shell
+ kubectl delete crd \
+  scopedefinitions.core.oam.dev \
+  traitdefinitions.core.oam.dev \
+  workloaddefinitions.core.oam.dev
+```
+
+### Step 3. Upgrade KubeVela Helm chart
+
+```shell
+helm upgrade --install --create-namespace --namespace vela-system  kubevela kubevela/vela-core --version <the_new_version>
+```
+
+## Clean Up
+
+Run:
+
+```shell script
+helm uninstall -n vela-system kubevela
+rm -r ~/.vela
+```
+
+This will uninstall KubeVela server component and its dependency components.
+This also cleans up local CLI cache.
+
+Then clean up CRDs (CRDs are not removed via helm by default):
+
+```shell script
+ kubectl delete crd \
+  appdeployments.core.oam.dev \
+  applicationconfigurations.core.oam.dev \
+  applicationcontexts.core.oam.dev \
+  applicationdeployments.core.oam.dev \
+  applicationrevisions.core.oam.dev \
+  applications.core.oam.dev \
+  approllouts.core.oam.dev \
+  componentdefinitions.core.oam.dev \
+  components.core.oam.dev \
+  containerizedworkloads.core.oam.dev \
+  healthscopes.core.oam.dev \
+  manualscalertraits.core.oam.dev \
+  podspecworkloads.standard.oam.dev \
+  scopedefinitions.core.oam.dev \
+  traitdefinitions.core.oam.dev \
+  workloaddefinitions.core.oam.dev
+```
--- a/docs/en/application.md
+++ b/docs/en/application.md
@@ -1,35 +1,58 @@
 ---
-title:  Application CRD
+title: Deploy Application
 ---

-This documentation will walk through how to use `Application` object to define your apps with corresponding operational behaviors in declarative approach.
+This documentation will walk through a full application deployment workflow on KubeVela platform.

-## Example
+## Introduction

-The sample application below claimed a `backend` component with *Worker* workload type, and a `frontend` component with *Web Service* workload type.
+KubeVela is a fully self-service platform. All capabilities an application deployment needs are maintained as building block modules in this platform. Specifically:
+- Components - deployable/provisionable entities that composed your application deployment
+  - e.g. a Kubernetes workload, a MySQL database, or a AWS OSS bucket
+- Traits - attachable operational features per your needs
+  - e.g. autoscaling rules, rollout strategies, ingress rules, sidecars, security policies etc

-Moreover, the `frontend` component claimed `sidecar` and `autoscaler` traits which means the workload will be automatically injected with a `fluentd` sidecar and scale from 1-100 replicas triggered by CPU usage.
+## Step 1: Check Capabilities in the Platform
+
+As user of this platform, you could check available components you can deploy, and available traits you can attach.
+
+```console
+$ kubectl get componentdefinitions -n vela-system
+NAME         WORKLOAD-KIND   DESCRIPTION                                                                                                                                                AGE
+task         Job             Describes jobs that run code or a script to completion.                                                                                                    5h52m
+webservice   Deployment      Describes long-running, scalable, containerized services that have a stable network endpoint to receive external network traffic from customers.           5h52m
+worker       Deployment      Describes long-running, scalable, containerized services that running at backend. They do NOT have network endpoint to receive external network traffic.   5h52m
+```
+
+```console
+$ kubectl get traitdefinitions -n vela-system
+NAME      APPLIES-TO                DESCRIPTION                                                                                                                           AGE
+ingress   ["webservice","worker"]   Configures K8s ingress and service to enable web traffic for your service. Please use route trait in cap center for advanced usage.   6h8m
+cpuscaler ["webservice","worker"]   Configure k8s HPA with CPU metrics for Deployment                                                                                          6h8m
+```
+
+To show the specification for given capability, you could use `vela` CLI. For example, `vela show webservice` will return full schema of *Web Service* component and `vela show webservice --web` will open its capability reference documentation in your browser.
+
+## Step 2: Design and Deploy Application
+
+In KubeVela, `Application` is the main API to define your application deployment based on available capabilities. Every `Application` could contain multiple components, each of them can be attached with a number of traits per needs. 
+
+Now let's define an application composed by *Web Service* and *Worker* components.

 ```yaml
+# sample.yaml
 apiVersion: core.oam.dev/v1beta1
 kind: Application
 metadata:
  name: website
 spec:
  components:
-    - name: backend
-      type: worker
-      properties:
-        image: busybox
-        cmd:
-          - sleep
-          - '1000'
    - name: frontend
      type: webservice
      properties:
        image: nginx
      traits:
-        - type: autoscaler
+        - type: cpuscaler
          properties:
            min: 1
            max: 10
@@ -38,159 +61,32 @@ spec:
          properties:
            name: "sidecar-test"
            image: "fluentd"
+    - name: backend
+      type: worker
+      properties:
+        image: busybox
+        cmd:
+          - sleep
+          - '1000'
 ```

-The `type: worker` means the specification of this component (claimed in following `properties` section) will be enforced by a `ComponentDefinition` object named `worker` as below:
+In this sample, we also attached `sidecar` and `cpuscaler` traits to the `frontend` component.
+So after deployed, the `frontend` component instance (a Kubernetes Deployment workload) will be automatically injected
+with a `fluentd` sidecar and automatically scale from 1-10 replicas based on CPU usage.

-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  name: worker
-  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:
-  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
+### Deploy the Application

-        					if parameter["cmd"] != _|_ {
-        						command: parameter.cmd
-        					}
-        				}]
-        			}
-        		}
-        	}
-        }
-        parameter: {
-        	image: string
-        	cmd?: [...string]
-        }
-```
-
-
-Hence, the `properties` section of `backend` only supports two parameters: `image` and `cmd`, this is enforced by the `parameter` list of the `.spec.template` field of the definition.
-
-The similar extensible abstraction mechanism also applies to traits.
-For example, `type: autoscaler` in `frontend` means its trait specification (i.e. `properties` section)
-will be enforced by a `TraitDefinition` object named `autoscaler` as below:
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: "configure k8s HPA for Deployment"
-  name: hpa
-spec:
-  appliesToWorkloads:
-    - webservice
-    - worker
-  schematic:
-    cue:
-      template: |
-        outputs: hpa: {
-        	apiVersion: "autoscaling/v2beta2"
-        	kind:       "HorizontalPodAutoscaler"
-        	metadata: name: context.name
-        	spec: {
-        		scaleTargetRef: {
-        			apiVersion: "apps/v1"
-        			kind:       "Deployment"
-        			name:       context.name
-        		}
-        		minReplicas: parameter.min
-        		maxReplicas: parameter.max
-        		metrics: [{
-        			type: "Resource"
-        			resource: {
-        				name: "cpu"
-        				target: {
-        					type:               "Utilization"
-        					averageUtilization: parameter.cpuUtil
-        				}
-        			}
-        		}]
-        	}
-        }
-        parameter: {
-        	min:     *1 | int
-        	max:     *10 | int
-        	cpuUtil: *50 | int
-        }
-```
-
-The application also have a `sidecar` trait.
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: "add sidecar to the app"
-  name: sidecar
-spec:
-  appliesToWorkloads:
-    - webservice
-    - worker
-  schematic:
-    cue:
-      template: |-
-        patch: {
-           // +patchKey=name
-           spec: template: spec: containers: [parameter]
-        }
-        parameter: {
-           name: string
-           image: string
-           command?: [...string]
-        }
-```
-
-All the definition objects are expected to be defined and installed by platform team.
-The end users will only focus on `Application` resource.
-
-## Conventions and "Standard Contract"
-
-After the `Application` resource is applied to Kubernetes cluster,
-the KubeVela runtime will generate and manage the underlying resources instances following below "standard contract" and conventions.
-
-
-| Label  | Description |
-| :--: | :---------: | 
-|`workload.oam.dev/type=<component definition name>` | The name of its corresponding `ComponentDefinition` |
-|`trait.oam.dev/type=<trait definition name>` | The name of its corresponding `TraitDefinition` | 
-|`app.oam.dev/name=<app name>` | The name of the application it belongs to |
-|`app.oam.dev/component=<component name>` | The name of the component it belongs to |
-|`trait.oam.dev/resource=<name of trait resource instance>` | The name of trait resource instance |
-|`app.oam.dev/appRevision=<name of app revision>` | The name of the application revision it belongs to |
-
-
-## Run Application
-
-Apply application yaml above, then you'll get the application started
+Apply application YAML to Kubernetes:

 ```shell
-$ kubectl get application -o yaml
+$ kubectl apply -f https://raw.githubusercontent.com/oam-dev/kubevela/master/docs/examples/enduser/sample.yaml
+application.core.oam.dev/website created
+```
+
+You'll get the application becomes `running`.
+
+```shell
+$ kubectl get application website -o yaml
 apiVersion: core.oam.dev/v1beta1
 kind: Application
 metadata:
@@ -209,12 +105,31 @@ status:

 ```

-You could see a Deployment named `frontend` with a container `fluentd` injected is running.
+### Verify the Deployment
+
+You could see a Deployment named `frontend` is running, with port exposed, and with a container `fluentd` injected.

 ```shell
 $ kubectl get deploy frontend
 NAME       READY   UP-TO-DATE   AVAILABLE   AGE
-frontend   1/1     1            1           100m
+frontend   1/1     1            1           97s
+```
+
+```shell
+$ kubectl get deploy frontend -o yaml
+...
+    spec:
+      containers:
+      - image: nginx
+        imagePullPolicy: Always
+        name: frontend
+        ports:
+        - containerPort: 80
+          protocol: TCP
+      - image: fluentd
+        imagePullPolicy: Always
+        name: sidecar-test
+...
 ```

 Another Deployment is also running named `backend`.
@@ -222,13 +137,13 @@ Another Deployment is also running named `backend`.
 ```shell
 $ kubectl get deploy backend
 NAME      READY   UP-TO-DATE   AVAILABLE   AGE
-backend   1/1     1            1           100m
+backend   1/1     1            1           111s
 ```

-An HPA was also created by the `autoscaler` trait. 
+An HPA was also created by the `cpuscaler` trait. 

 ```shell
 $ kubectl get HorizontalPodAutoscaler frontend
 NAME       REFERENCE             TARGETS         MINPODS   MAXPODS   REPLICAS   AGE
 frontend   Deployment/frontend   <unknown>/50%   1         10        1          101m
-```
+```
--- a/docs/en/concepts.md
+++ b/docs/en/concepts.md
@@ -16,20 +16,18 @@ First of all, KubeVela introduces a workflow with separate of concerns as below:

 Below is how this workflow looks like:

-![alt](../resources/how-it-works.png)
+![alt](resources/how-it-works.png)

 This template based workflow make it possible for platform team enforce best practices and deployment confidence with a set of Kubernetes CRDs, and give end users a *PaaS-like* experience (*i.e. app-centric, higher level abstractions, self-service operations etc*) by natural.

-![alt](../resources/what-is-kubevela.png)
+![alt](resources/what-is-kubevela.png)

-Below are the core building blocks in KubeVela that make this happen.
+Below are the core concepts in KubeVela that make this happen.

 ## `Application`
-The *Application* is the core API of KubeVela. It allows developers to work with a single artifact to capture the complete application definition with simplified primitives.
+The *Application* is the core API of KubeVela. It allows developers to work with a single artifact to capture the complete application deployment with simplified primitives.

-### Why Choose `Application` as the Main Abstraction
-
-Having an "application" concept is important to any developer-centric platform to simplify administrative tasks and can serve as an anchor to avoid configuration drifts during operation. Also, as an abstraction object, `Application` provides a much simpler path for on-boarding Kubernetes capabilities without relying on low level details. For example, a developer will be able to model a "web service" without defining a detailed Kubernetes Deployment + Service combo each time, or claim the auto-scaling requirements without referring to the underlying KEDA ScaleObject.
+In application delivery platform, having an "application" concept is important to simplify administrative tasks and can serve as an anchor to avoid configuration drifts during operation. Also, it provides a much simpler path for on-boarding Kubernetes capabilities to application delivery process without relying on low level details. For example, a developer will be able to model a "web service" without defining a detailed Kubernetes Deployment + Service combo each time, or claim the auto-scaling requirements without referring to the underlying KEDA ScaleObject.

 ### Example

@@ -66,15 +64,15 @@ spec:

 ## Building the Abstraction

-Unlike most of the higher level platforms, the `Application` abstraction in KubeVela is fully extensible and does not even have fixed schema. Instead, it is composed by building blocks (app components and traits etc.) that allow you to onboard platform capabilities to this application definition with your own abstractions.
+The `Application` resource in KubeVela is a LEGO-style object and does not even have fixed schema. Instead, it is composed by building blocks (app components and traits etc.) that allow you to on-board platform capabilities to this application definition via your own abstractions.

 The building blocks to abstraction and model platform capabilities named `ComponentDefinition` and `TraitDefinition`.

 ### ComponentDefinition

-You can think of `ComponentDefinition` as a *template* for workload type. It contains template, parametering and workload characteristic information as a declarative API resource. 
+`ComponentDefinition` is a pre-defined *template* for the deployable workload. It contains template, parametering and workload characteristic information as a declarative API resource. 

-Hence, the `Application` abstraction essentially declares how users want to **instantiate** given component definitions. Specifically, the `.type` field references the name of installed `ComponentDefinition` and `.properties` are the user set values to instantiate it. 
+Hence, the `Application` abstraction essentially declares how the user want to **instantiate** given component definitions in target cluster. Specifically, the `.type` field references the name of installed `ComponentDefinition` and `.properties` are the user set values to instantiate it. 

 Some typical component definitions are *Long Running Web Service*, *One-time Off Task* or *Redis Database*. All component definitions expected to be pre-installed in the platform, or provided by component providers such as 3rd-party software vendors.

@@ -82,7 +80,7 @@ Some typical component definitions are *Long Running Web Service*, *One-time Off

 Optionally, each component has a `.traits` section that augments the component instance with operational behaviors such as load balancing policy, network ingress routing, auto-scaling policies, or upgrade strategies, etc.

-You can think of traits as operational features provided by the platform. To attach a trait to component instance, the user will use `.type` field to reference the specific `TraitDefinition`, and `.properties` field to set property values of the given trait. Similarly, `TraitDefiniton` also allows you to define *template* for operational features.
+Traits are operational features provided by the platform. To attach a trait to component instance, the user will declare `.type` field to reference the specific `TraitDefinition`, and `.properties` field to set property values of the given trait. Similarly, `TraitDefiniton` also allows you to define *template* for operational features.

 We also reference component definitions and trait definitions as *"capability definitions"* in KubeVela. 

@@ -95,12 +93,12 @@ Currently, a KubeVela `environment` only maps to a Kubernetes namespace, while t

 The main concepts of KubeVela could be shown as below:

-![alt](../resources/concepts.png)
+![alt](resources/concepts.png)

 ## Architecture

 The overall architecture of KubeVela is shown as below:

-![alt](../resources/arch.png)
+![alt](resources/arch.png)

-Specifically, the application controller is responsible for application abstraction and encapsulation (i.e. the controller for `Application` and `Definition`). The rollout controller will handle progressive rollout strategy with the whole application as a unit. The multi-env deployment engine (*currently WIP*) is responsible for deploying the application across multiple clusters and environments. 
+Specifically, the application controller is responsible for application abstraction and encapsulation (i.e. the controller for `Application` and `Definition`). The rollout controller will handle progressive rollout strategy with the whole application as a unit. The multi-cluster deployment engine is responsible for deploying the application across multiple clusters and environments with traffic shifting and rollout features supported. 
--- a/docs/en/cue/basic.md
+++ b/docs/en/cue/basic.md
@@ -22,7 +22,7 @@ The reasons for KubeVela supports CUE as a first-class solution to design abstra

 Please make sure below CLIs are present in your environment:
 * [`cue` >=v0.2.2](https://cuelang.org/docs/install/)
-* [`vela` (>v1.0.0)](https://kubevela.io/#/en/install?id=_3-optional-get-kubevela-cli)
+* [`vela` (>v1.0.0)](../install#4-optional-get-kubevela-cli)

 ## CUE CLI Basic

--- a/docs/en/cue/component.md
+++ b/docs/en/cue/component.md
@@ -209,6 +209,7 @@ output: {
 | Context Variable  | Description |
 | :--: | :---------: |
 | `context.appRevision` | The revision of the application |
+| `context.appRevisionNum` | The revision number(`int` type) of the application, e.g., `context.appRevisionNum` will be `1` if `context.appRevision` is `app-v1`|
 | `context.appName` | The name of the application |
 | `context.name` | The name of the component of the application |
 | `context.namespace` | The namespace of the application |
--- a/docs/en/cue/cross-namespace-resource.md
+++ b/docs/en/cue/cross-namespace-resource.md
@@ -4,7 +4,7 @@ title:  Define resources located in defferent namespace with application

 In this section, we will introduce how to use cue template create resources (workload/trait) in different namespace with the application.

-By default, the `metadata.namespace` of K8s resource in CuE template is automatically filled with the same namespace of the applicaiton.
+By default, the `metadata.namespace` of K8s resource in CuE template is automatically filled with the same namespace of the application.

 If you want to create K8s resources running in a specific namespace witch is different with the application, you can set the `metadata.namespace` field.
 KubeVela will create the resources in the specified namespace, and create a resourceTracker object as owener of those resources.
@@ -50,7 +50,4 @@ spec:
        			}}}
        }
 ```
-## Limitations
-If you update definition by changing the `metadata.namespace` field. KubeVela will create new resources in the new namespace but not delete old resources.
-We wil fix the limitation in the near future.

--- a/docs/en/cue/patch-trait.md
+++ b/docs/en/cue/patch-trait.md
@@ -21,6 +21,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -54,7 +55,12 @@ spec:
        }
 ```

-The patch trait above assumes the target component instance have `spec.template.spec.affinity` field. Hence we need to use `appliesToWorkloads` to enforce the trait only applies to those workload types have this field.
+The patch trait above assumes the target component instance have `spec.template.spec.affinity` field.
+Hence, we need to use `appliesToWorkloads` to enforce the trait only applies to those workload types have this field.
+
+Another important field is `podDisruptive`, this patch trait will patch to the pod template field,
+so changes on any field of this trait will cause the pod to restart, We should add `podDisruptive` and make it to be true
+to tell users that applying this trait will cause the pod to restart.


 Now the users could declare they want to add node affinity rules to the component instance as below:
@@ -112,6 +118,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -141,6 +148,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -185,6 +193,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -235,6 +244,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: false
  schematic:
    cue:
      template: |
@@ -258,7 +268,7 @@ spec:

 Inject system environments into Pod is also very common use case.

-> This case rely on strategy merge patch, so don't forget add `+patchKey=name` as below:
+> This case relies on strategy merge patch, so don't forget add `+patchKey=name` as below:

 ```yaml
 apiVersion: core.oam.dev/v1beta1
@@ -271,6 +281,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -312,6 +323,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
@@ -358,6 +370,7 @@ spec:
  appliesToWorkloads:
    - webservice
    - worker
+  podDisruptive: true
  schematic:
    cue:
      template: |
--- a/docs/en/cue/trait.md
+++ b/docs/en/cue/trait.md
@@ -68,6 +68,7 @@ kind: TraitDefinition
 metadata:
  name: ingress
 spec:
+  podDisruptive: false
  schematic:
    cue:
      template: |
--- a/docs/en/developers/check-ref-doc.md
+++ b/docs/en/developers/check-ref-doc.md
@@ -22,7 +22,7 @@ This command will automatically open the reference documentation for given workl

 Let's take `$ vela show webservice --web` as example. The detailed schema documentation for `Web Service` workload type will show up immediately as below:

-![](../../resources/vela_show_webservice.jpg)
+![](../resources/vela_show_webservice.jpg)

 Note that there's in the section named `Specification`, it even provides you with a full sample for the usage of this workload type with a fake name `my-service-name`.

@@ -30,7 +30,7 @@ Note that there's in the section named `Specification`, it even provides you wit

 Similarly, we can also do `$ vela show autoscale --web`:

-![](../../resources/vela_show_autoscale.jpg)
+![](../resources/vela_show_autoscale.jpg)

 With these auto-generated reference documentations, we could easily complete the application description by simple copy-paste, for example:

--- a/docs/en/developers/config-enviroments.md
+++ b/docs/en/developers/config-enviroments.md
@@ -2,7 +2,8 @@
 title:  Setting Up Deployment Environment
 ---

-A deployment environment is where you could configure the workspace, email for certificate issuer and domain for your applications globally. A typical set of deployment environment is `test`, `staging`, `prod`, etc.
+A deployment environment is where you could configure the workspace, email for contact and domain for your applications globally.
+A typical set of deployment environment is `test`, `staging`, `prod`, etc.

 ## Create environment

--- a/docs/en/developers/extensions/set-metrics.md
+++ b/docs/en/developers/extensions/set-metrics.md
@@ -102,6 +102,6 @@ kubectl --namespace monitoring port-forward `kubectl -n monitoring get pods -l p

 Then access the Prometheus dashboard via http://localhost:9090/targets

-![Prometheus Dashboard](../../../resources/metrics.jpg)
+![Prometheus Dashboard](../../resources/metrics.jpg)

 </details>
--- a/docs/en/developers/extensions/set-rollout.md
+++ b/docs/en/developers/extensions/set-rollout.md
@@ -149,14 +149,14 @@ Hello World -- This is rolling 02
 In detail, `Rollout` controller will create a canary of your app , and then gradually shift traffic to the canary while measuring key performance indicators like HTTP requests success rate at the same time. 


-![alt](../../../resources/traffic-shifting-analysis.png)
+![alt](../../resources/traffic-shifting-analysis.png)

 In this sample, for every `10s`, `5%` traffic will be shifted to canary from the primary, until the traffic on canary reached `50%`. At the mean time, the instance number of canary will automatically scale to `replicas: 2` per configured in Appfile.


 Based on analysis result of the KPIs during this traffic shifting, a canary will be promoted or aborted if analysis is failed. If promoting, the primary will be upgraded from v1 to v2, and traffic will be fully shifted back to the primary instances. So as result, canary instances will be deleted after the promotion finished.

-![alt](../../../resources/promotion.png)
+![alt](../../resources/promotion.png)

 > Note: KubeVela's `Rollout` trait is implemented with [Weaveworks Flagger](https://flagger.app/) operator.
  
--- a/docs/en/developers/references/README.md
+++ b/docs/en/developers/references/README.md
@@ -1,5 +1,5 @@
 ---
-title:  The Reference Documentation of Capabilities
+title:  Overview
 ---

 In this documentation, we will show how to check the detailed schema of a given capability (i.e. component type or trait). 
@@ -20,13 +20,13 @@ This command will automatically open the reference documentation for given compo

 Let's take `$ vela show webservice --web` as example. The detailed schema documentation for `Web Service` component type will show up immediately as below:

-![](../../../resources/vela_show_webservice.jpg)
+![](../../resources/vela_show_webservice.jpg)

 Note that there's in the section named `Specification`, it even provides you with a full sample for the usage of this workload type with a fake name `my-service-name`.

 Similarly, we can also do `$ vela show autoscale`:

-![](../../../resources/vela_show_autoscale.jpg)
+![](../../resources/vela_show_autoscale.jpg)

 With these auto-generated reference documentations, we could easily complete the application description by simple copy-paste, for example:

--- a/docs/en/developers/references/component-types/task.md
+++ b/docs/en/developers/references/component-types/task.md
@@ -11,11 +11,7 @@ Describes jobs that run code or a script to completion.
 List of all configuration options for a `Task` workload type.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    type: task
+...
    image: perl
    count: 10
    cmd: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
--- a/docs/en/developers/references/component-types/webservice.md
+++ b/docs/en/developers/references/component-types/webservice.md
@@ -11,11 +11,7 @@ Describes long-running, scalable, containerized services that have a stable netw
 List of all configuration options for a `Webservice` workload type.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    type: webservice # could be skipped
+...
    image: oamdev/testapp:v1
    cmd: ["node", "server.js"]
    port: 8080
--- a/docs/en/developers/references/component-types/worker.md
+++ b/docs/en/developers/references/component-types/worker.md
@@ -11,11 +11,7 @@ Describes long-running, scalable, containerized services that running at backend
 List of all configuration options for a `Worker` workload type.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    type: worker
+...
    image: oamdev/testapp:v1
    cmd: ["node", "server.js"]
 ```
--- a/docs/en/developers/references/devex/faq.md
+++ b/docs/en/developers/references/devex/faq.md
@@ -270,7 +270,7 @@ Metrics server is already enabled.

 Metrics server has to be enabled in `Operations/Add-ons` section of [Alibaba Cloud console](https://cs.console.aliyun.com/) as below.

-![](../../../../resources/install-metrics-server-in-ASK.jpg)
+![](../../../resources/install-metrics-server-in-ASK.jpg)

 Please refer to [metrics server debug guide](https://help.aliyun.com/document_detail/176515.html) if you hit more issue.

--- a/docs/en/developers/references/traits/autoscale.md
+++ b/docs/en/developers/references/traits/autoscale.md
@@ -11,22 +11,16 @@ Automatically scales workloads by resource utilization metrics or cron triggers.
 List of all configuration options for a `Autoscale` trait.

 ```yaml
-name: testapp
-
-services:
-  express-server:
-    ...
-
-    autoscale:
-      min: 1
-      max: 4
-      cron:
-        startAt:  "14:00"
-        duration: "2h"
-        days:     "Monday, Thursday"
-        replicas: 2
-        timezone: "America/Los_Angeles"
-      cpuPercent: 10
+...
+	min: 1
+	max: 4
+	cron:
+	startAt:  "14:00"
+	duration: "2h"
+	days:     "Monday, Thursday"
+	replicas: 2
+	timezone: "America/Los_Angeles"
+	cpuPercent: 10
 ```

 ## Properties
--- a/docs/en/developers/references/traits/ingress.md
+++ b/docs/en/developers/references/traits/ingress.md
@@ -10,7 +10,12 @@ Configures K8s ingress and service to enable web traffic for your service. Pleas

 List of all configuration options for a `Ingress` trait.

-```yaml```
+```yaml
+...
+    domain: testsvc.example.com
+    http:
+      /: 8000
+```

 ## Properties

--- a/docs/en/developers/references/traits/metrics.md
+++ b/docs/en/developers/references/traits/metrics.md
@@ -11,17 +11,12 @@ Configures monitoring metrics for your service.
 List of all configuration options for a `Metrics` trait.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    ...
-    metrics:
-      format: "prometheus"
-      port: 8080
-      path: "/metrics"
-      scheme:  "http"
-      enabled: true
+...
+    format: "prometheus"
+    port: 8080
+    path: "/metrics"
+    scheme:  "http"
+    enabled: true
 ```

 ## Properties
--- a/docs/en/developers/references/traits/rollout.md
+++ b/docs/en/developers/references/traits/rollout.md
@@ -11,10 +11,7 @@ Configures Canary deployment strategy for your application.
 List of all configuration options for a `Rollout` trait.

 ```yaml
-servcies:
-  express-server:
-    ...
-
+...
    rollout:
      replicas: 2
      stepWeight: 50
--- a/docs/en/developers/references/traits/route.md
+++ b/docs/en/developers/references/traits/route.md
@@ -11,17 +11,12 @@ Configures external access to your service.
 List of all configuration options for a `Route` trait.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    ...
-    route:
-      domain: example.com
-      issuer: tls
-      rules:
-        - path: /testapp
-          rewriteTarget: /
+...
+    domain: example.com
+    issuer: tls
+    rules:
+      - path: /testapp
+        rewriteTarget: /
 ```

 ## Properties
--- a/docs/en/developers/references/traits/scaler.md
+++ b/docs/en/developers/references/traits/scaler.md
@@ -11,11 +11,7 @@ Configures replicas for your service.
 List of all configuration options for a `Scaler` trait.

 ```yaml
-name: my-app-name
-
-services:
-  my-service-name:
-    ...
+...
    scaler:
      replicas: 100
 ```
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zheng Xi Zhou	3800a700b0	Add parameters comments for crossplane definitions (#1515 ) * Add parameters commetns for crossplane definitions Added parameter comments for ComponentDefinition alibaba-oss alibaba-rds and TraitDefinition service-binding * add the result of vela show	2021-04-16 22:24:50 +08:00
Jianbo Sun	75f081f248	Add More End User Docs (#1511 ) * update docs * update docs * refine cloud resource docs * update install guidegst	2021-04-16 21:46:44 +08:00
yangsoon	fb6d505e6e	fix kubectl vela -h (#1512 )	2021-04-16 20:43:26 +08:00
yangsoon	1a267bc6d1	add end-user/sidecar (#1513 )	2021-04-16 20:42:41 +08:00
Zheng Xi Zhou	8643558f6b	Add cloud service docs for end-users (#1510 ) * Add cloud service docs for end-users Split cloud service into two section, one for platform engineers, and the other for end-users * correct titles * adjust componentdefinition and traitdefinition order * address comments	2021-04-16 18:13:54 +08:00
yangsoon	d063cd3b78	rm printcolumn AGE in crd (#1509 )	2021-04-16 17:35:08 +08:00
yangsoon	c4fa81b703	add kubectl vela show in docs (#1508 )	2021-04-16 17:27:05 +08:00
wyike	ebc8476a31	garbage collection mechanism for AppRevision (#1501 ) * WIP refactor gc func WIP write gc code WIP update chart,cmd args add cleanupRevison func into garbageCollection add more test finish unit-test refactor use func implements Complete e2e test WIP rewrite some logic add func test and rewirte context pointing to func fix cilint refactor some function fix typo fix ci error change gc logic after change gc number, fix all test add check appRevision collection WIP finish most code * add rollout batch to fix rollout e2e-tet * fix component name in rollout * ignore gc error, just log the error	2021-04-16 16:46:41 +08:00
Zheng Xi Zhou	0333b9e891	Refactor template_test.go to make it readable (#1507 ) Some tests are not named which make it difficult to read test cases and add more	2021-04-16 15:39:05 +08:00
yangsoon	3be63bba91	add end-user/labels.md (#1505 )	2021-04-16 13:58:42 +08:00
woshicai	f9f2c3b119	update: try to add workloadDefinitionRef to application status (#1471 ) * add workloadDef in application status' services * Update pkg/controller/core.oam.dev/v1alpha2/application/apply.go * fix: go fmt Co-authored-by: charles <charles.cai@sap.com> Co-authored-by: Jianbo Sun <wonderflow.sun@gmail.com>	2021-04-16 13:21:52 +08:00
xiqiu618	34684650c3	fix appContext update failed error (#1500 ) * fix appContext update failed error * Update pkg/controller/core.oam.dev/v1alpha2/applicationcontext/applicationcontext_controller.go Co-authored-by: Jianbo Sun <wonderflow.sun@gmail.com> * gofmt comments Co-authored-by: Jianbo Sun <wonderflow.sun@gmail.com>	2021-04-16 13:05:09 +08:00
Ryan Zhang	e76992df87	randomize port to listen to separate tests (#1497 ) * randomize the port * make all tests sequential	2021-04-16 10:16:20 +08:00
yangsoon	3a68ec77fd	fix CI: add action to release kubectl-vela binary file (#1503 ) * add kubectl-vela release * add docs	2021-04-15 22:54:31 +08:00
yangsoon	199e747865	Introduce vela as a kubectl plugin (#1485 ) * add kubectl plugin * add vela show * add test	2021-04-15 18:25:46 +08:00
Jianbo Sun	c6b65cbd5b	fix flaky test (#1498 ) * fix flaky test * fix flaky check apprevision created more than one * remove unused annottaion	2021-04-15 18:25:17 +08:00
xiqiu618	9fa237721e	add app name as label for AppRevision (#1488 )	2021-04-15 15:41:53 +08:00
yangsoon	b90fffad43	fix action (#1496 )	2021-04-15 10:06:29 +08:00
Lei Zhang (Harry)	1ad6dcc1a7	Modify doc title of keda trait (#1494 )	2021-04-15 08:54:27 +08:00
yangsoon	1659528015	fix-resources-url (#1492 )	2021-04-14 23:50:07 +08:00
Jianbo Sun	ce20f55382	add an overview for end user guide (#1469 ) * add an overview for end user guide end user guide * add explore section * finish scale section * add expose section * remove trait already contains as built-in feature * try fix flaky test	2021-04-14 21:38:04 +08:00
Zheng Xi Zhou	384c5ab6a9	Remove trait-injector from controller options (#1490 ) As trait injector isn't used, so removed it.	2021-04-14 18:54:02 +08:00
wyike	a7bfb2fb6f	refactor appRevison extract func to utils (#1481 ) * refactor appRevison extract func to utils * add some corener case check * add more checks	2021-04-14 15:48:23 +08:00
C.YAO	8703950da6	Fix helm install error when disable webhook patch (#1483 )	2021-04-14 12:51:16 +08:00
Ryan Zhang	f7cfe6fbae	improve cloneset integration test suite (#1482 )	2021-04-14 12:29:28 +08:00
Shiwen Cheng	e8ed4d78cf	Keep docker binary command due to the issue #416 (#1478 )	2021-04-14 11:26:35 +08:00
Gallardot	0c8e22ef4d	fix tiny typo (#1480 ) Signed-off-by: Gallardot <tttick@163.com>	2021-04-14 10:56:33 +08:00
Lei Zhang (Harry)	e9004d7478	Fix introduction (#1479 )	2021-04-14 10:55:31 +08:00
Serhat Şevki Dinçer	282efa2893	Create codeql-analysis.yml (#1470 ) * Create codeql-analysis.yml * rm schedule from codeql * codeql: master & release branches only on push * codeql: use release-* pattern Co-authored-by: Jianbo Sun <wonderflow.sun@gmail.com> Co-authored-by: Jianbo Sun <wonderflow.sun@gmail.com>	2021-04-14 10:54:08 +08:00
yangsoon	580157df6a	refactor vela cli (#1475 )	2021-04-13 20:13:07 +08:00
yangsoon	6ecb0567f5	change email (#1477 )	2021-04-13 20:11:41 +08:00
Yue Wang	dcf79a9b57	fix falky unit test (#1474 ) Signed-off-by: roy wang <seiwy2010@gmail.com>	2021-04-13 20:01:47 +08:00
Yue Wang	b411d79ed0	add webhook validation on CUE template outputs name (#1460 ) add hooks for process.Context to do validation add unit test Signed-off-by: roy wang <seiwy2010@gmail.com>	2021-04-13 19:18:15 +08:00
Lei Zhang (Harry)	d8eb7d687c	Add user docs (#1472 )	2021-04-13 15:20:39 +08:00
Yue Wang	63b348f4d8	implement cli `vela system live-diff` (#1419 ) move dry-run and live-diff into an independent pkg WIP add sample and doc WIP unit test for live-diff add unit test Signed-off-by: roy wang <seiwy2010@gmail.com>	2021-04-13 12:29:25 +08:00
Ryan Zhang	2e43a6dc78	make sure we don't create more pods (#1452 )	2021-04-12 15:48:20 -07:00
Jianbo Sun	26163aacdc	fix flaky test (#1467 )	2021-04-12 16:51:06 +08:00
yangsoon	5164efeb4a	add context.appRevisionNum (#1466 )	2021-04-12 15:36:19 +08:00
wyike	2254777523	ignore error not found when deleting resourceTracker (#1462 ) * ingore error not found when delete resourceTracker * ignore error not found	2021-04-12 10:57:16 +08:00
LeoLiuYan	389722a94e	Remove duplicated logic (#1465 ) Signed-off-by: LeoLiuYan <929908264@qq.com>	2021-04-12 10:24:34 +08:00
Shiwen Cheng	4b86689d63	Update copyright year (#1464 ) * Update copyright year to 2021 for The KubeVela Authors * Update copyright year to 2021 for other project authors	2021-04-11 21:00:14 +08:00
Shiwen Cheng	2b07ec49d4	[Improvement-1457] Use kind cmd code to load docker image instead of local kind binary (#1458 ) * [Improvement-1457] Use kind cmd code to load docker image instead of local kind binary * [Improvement-1457] Update copyright year and kind repo declaration	2021-04-11 20:59:21 +08:00
Yue Wang	7edfbde2f5	skip applying helm-release if app spec not change (#1461 ) Signed-off-by: roywang <seiwy2010@gmail.com>	2021-04-11 15:47:00 +08:00
Yue Wang	bc6a60dde2	add volumes definition in worker/webservice (#1459 ) Signed-off-by: roywang <seiwy2010@gmail.com>	2021-04-11 14:18:48 +08:00
Lei Zhang (Harry)	1407fc5125	Update readme for 1.0 (#1453 )	2021-04-11 14:11:03 +08:00
Yue Wang	2d6f2083db	refactor pkg/appfile (#1447 ) Signed-off-by: roy wang <seiwy2010@gmail.com>	2021-04-11 14:10:16 +08:00
yangsoon	c619b7b290	fix bug which Component/TraitDefinition won't work when contains "_\|_" in value (#1450 )	2021-04-09 21:46:04 +08:00
wyike	bc6000f794	fix flaky appcontext e2e-test (#1449 )	2021-04-09 21:42:17 +08:00
yangsoon	2e92a66fa5	fix data race (#1446 )	2021-04-09 20:15:02 +08:00
Shiwen Cheng	e5a9be8de9	Improve makefile and dockerfile (#1445 ) * Improve makefile and dockerfile * Add entrypoint.sh to support entrypoint and debugging * Add docker base image discussion issue #1448 in dockerfile	2021-04-09 20:12:57 +08:00
Jianbo Sun	5d40f121ea	add release docs when have tag (#1444 )	2021-04-09 16:50:59 +08:00
woshicai	58c3283411	update: run helm lint & test after e2e-setup (#1415 ) Co-authored-by: charles <charles.cai@sap.com>	2021-04-09 14:13:59 +08:00
Ryan Zhang	6d65169449	fix webhooks and try to fix e2e (#1441 ) * fix webhooks and try to fix e2e * address comments	2021-04-09 13:27:16 +08:00
yangsoon	9bf6cc2659	update version (#1442 )	2021-04-09 12:28:04 +08:00
Lei Zhang (Harry)	ecbb5f56ca	Update doc (#1440 )	2021-04-09 11:10:03 +08:00
yangsoon	7ede0746c1	add clean-image action (#1436 )	2021-04-09 10:17:21 +08:00
Zheng Xi Zhou	e8e45dd7d3	Add unit-tests for ApplicationRollout related packages (#1413 ) * Add unit-tests for ApplicationRollout related packages Part I: pkg/controller/common/rollout * Add more unittets * add unit tests for cloneset controller * fix test issue * add more unit-tests for cloneset_controller and deployment_controller * fix rebase issues	2021-04-08 14:08:48 -07:00
yangsoon	08a1dc5a22	Add package discover refresh when component/trait definition are registered (#1402 ) * add discover refresh * add test * fix store openapi schema * fix discovermapper	2021-04-08 20:35:21 +08:00
Jianbo Sun	d2a46322c0	Merge pull request #1434 from chengshiwen/add-short-name Add short name for crds	2021-04-08 20:15:22 +08:00
chengshiwen	7d31d84ec3	Remove redundant and ambiguous short names	2021-04-08 19:49:28 +08:00
chengshiwen	f59341f667	Add short name for crds	2021-04-08 19:49:23 +08:00
Jian.Li	a446aab46b	Fix Bug: strategyUnify not work with close call (#1430 )	2021-04-08 18:41:04 +08:00
Shiming Zhang	f2de6de6f8	Remove useless code (#1433 ) Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>	2021-04-08 18:39:42 +08:00
guoxudong	0f23f6eb09	stop zh-CN docs sync (#1431 ) Co-authored-by: guoxudong <guoxudong.dev@gmial.com>	2021-04-08 17:23:45 +08:00
Lei Zhang (Harry)	473164efbd	Finalize the message (#1426 )	2021-04-08 15:54:40 +08:00
yangsoon	7dec0afc16	vela-cli support use "vela system cue-packages" to list cue-package (#1417 ) * support list cue-package * add test kube package doc * refine words * fix workflow * fix the docs Co-authored-by: 天元 <jianbo.sjb@alibaba-inc.com>	2021-04-08 15:54:25 +08:00
Jianbo Sun	a44257e153	fix flaky test (#1427 )	2021-04-08 14:34:36 +08:00
yangsoon	1261e2678f	add podDisruptive to traitdefinition (#1192 ) * add podDisruptive to traitdefinition * fix docs & example * fix diff and add docs * use bool type for podDisruptive Co-authored-by: 天元 <jianbo.sjb@alibaba-inc.com>	2021-04-08 13:39:03 +08:00
Ryan Zhang	325a4cdb0e	Add a new cloneset scale controller (#1301 ) * add scale implementation * fine tune the logic and adjust e2e test * fix tests and fine tune logic * try to fix flaky verification * allow zero size step * fix scale down check	2021-04-07 11:14:46 -07:00
wyike	b33b6fbead	garbage collection for cross-namespace workloads and traits in application layer (#1421 ) * add logic for gc cross ns resources WIP regenerate api and charts rewrite handle resourceTracker logic WIP add e2e test logic add more e2e test * WIP refactor sevral funs name and add comments for code * WIP add more corener case e2e test * add unit test and fix bug * WIP refactor handleResouceTracker logic * refactor func name aglin with others and add comments * make generate to fix check-diff ci error * change resourceTracker status as a subresource	2021-04-07 21:34:48 +08:00
Jian.Li	15b1bd2660	Fix the bug that the registered k8s built-in gvk does not exist (#1414 ) * fix bug for method exist(gvk) * check that all built-in k8s resource are registered	2021-04-07 13:06:19 +08:00
yangsoon	8c73ea5d8a	fix keda.md (#1420 )	2021-04-06 16:07:22 +08:00
Jian.Li	4b25ed4ba1	fix import inner package in the format of third party package path and split test cases (#1412 ) * test third party path in cue * fix typo * fix pkg mount bug Co-authored-by: 天元 <jianbo.sjb@alibaba-inc.com>	2021-04-02 13:04:52 +08:00
Jianbo Sun	f47ca0f4da	remove no used ingress notes in charts (#1405 ) * remove no used ingress notes in charts * remove helm repo update	2021-04-02 10:58:07 +08:00
Herman Zhu	5b1b054cca	refactor(workload) remove all the duplicate fields (#1410 ) remove all the duplicate fields in parser above as template contains fix #1388 Signed-off-by: zhuhuijun <zhuhuijunzhj@gmail.com>	2021-04-02 10:24:27 +08:00
Lei Zhang (Harry)	35376bd396	Reword readme for clearer message (#1408 ) Rewording the readme	2021-04-02 09:41:23 +08:00
Lei Zhang (Harry)	06069d3580	Update docs to reflect app delivery idea (#1401 )	2021-04-01 15:26:25 +08:00
yangsoon	43057161bf	update contributing guide (#1398 )	2021-04-01 13:54:56 +08:00
woshicai	50ded65805	Fix: update homebrew before install kubevela client (#1395 ) Co-authored-by: charles <charles.cai@sap.com>	2021-04-01 12:45:40 +08:00
Stupig	1444376b0c	newline is missing for BaseContextFile (#1396 )	2021-04-01 12:07:27 +08:00
yangsoon	04486f89bb	fix crd: add additional print column and short Name for CRD (#1377 ) * add additional print column * add shortname * fix printcolumn & test	2021-04-01 11:51:43 +08:00
Zheng Xi Zhou	d6d19a7c5a	Remove outputSecretName in cloud service provisoing and consuming (#1393 ) Refer to the reason https://github.com/oam-dev/kubevela/issues/1128#issuecomment-811590631	2021-04-01 11:13:19 +08:00
Jianbo Sun	6b8875012d	use shell instead action to sync website && don't sync index.js and config.js (#1386 ) * use shell instead action to sync website && don't sync index.js and config.js * update test website build * use bash instead sh	2021-04-01 10:06:34 +08:00
joelhy	7ae6a148a0	Fix grammar error: changed "an success story" to "a success story" (#1385 )	2021-03-31 23:33:00 +08:00
Jianbo Sun	bbea29c8e5	fix kube-webhook-certgen to patch CRD conversation && remove cert-manager in CI e2e test && remove issuer create from CLI env (#1267 ) * remove cert-manager in CI e2e test and remove issuer create from CLI env * update job patch image(https://github.com/wonderflow/kube-webhook-certgen)	2021-03-31 21:21:28 +08:00
Robin Brämer	6e6c4c76a6	fix docs typo (#1384 )	2021-03-31 19:56:36 +08:00
wyike	1bf673c3c1	upgrade webhook configuration to v1 (#1383 )	2021-03-31 19:56:09 +08:00
yangsoon	352fe1ba5b	remove useless script & update install.mdx (#1382 )	2021-03-31 18:40:34 +08:00
Yue Wang	3bdf7a044f	fix generate schema for helm values (#1375 ) Signed-off-by: roy wang <seiwy2010@gmail.com>	2021-03-31 17:31:54 +08:00
yangsoon	3cb9fa79bf	fix index.js (#1380 )	2021-03-31 16:01:53 +08:00
wyike	20f6e0ab02	skip check cross ns resource owner, add tests (#1374 )	2021-03-31 15:00:16 +08:00
Kinso	438ab96f95	fix: add "system-definition-namespace" flag to container args (#1371 ) Co-authored-by: kinsolee <lijingzhao@forchange.tech>	2021-03-31 14:41:07 +08:00
yangsoon	b5bf7a4f62	fix siderbar (#1373 )	2021-03-31 14:39:09 +08:00
Lei Zhang (Harry)	d473e41f20	Update readme and doc (#1376 )	2021-03-31 14:38:46 +08:00
Jianbo Sun	96c1d0786a	the application context should not own application object (#1370 ) * the application context should not own application object * add time for flaky test	2021-03-31 13:55:57 +08:00
yangsoon	f7196e10ca	fix upgrade in install.mdx (#1364 )	2021-03-30 21:37:48 +08:00
yangsoon	a2997a070d	fix vela show (#1366 )	2021-03-30 21:36:28 +08:00
Ryan Zhang	0629049e1f	add initial finalizer and abandon support (#1362 ) * add initial finalizer and abandon support * fix lint	2021-03-30 02:04:38 -07:00
yangsoon	553b5d19eb	add docs readme (#1359 )	2021-03-30 16:37:46 +08:00