Feat: support vela show for workflow step definition (#3161)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
(cherry picked from commit 23852b3d10)

Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>

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

@@ -90,12 +90,12 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
+          files: /tmp/e2e-profile.out
           flags: e2e-rollout-tests
           name: codecov-umbrella
 
       - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out
+        run: rm /tmp/e2e-profile.out
 
       - name: Cleanup image
         if: ${{ always() }}

.github/workflows/e2e-test.yml

@@ -96,12 +96,12 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out,/tmp/oam-e2e-profile.out
+          files: /tmp/e2e-profile.out
           flags: e2etests
           name: codecov-umbrella
 
       - name: Clean e2e profile
-        run: rm /tmp/e2e-profile.out /tmp/oam-e2e-profile.out
+        run: rm /tmp/e2e-profile.out
 
       - name: Cleanup image
         if: ${{ always() }}

.github/workflows/go.yml

@@ -33,52 +33,6 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  compatibility-test:
-    runs-on: ubuntu-20.04
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v2
-        with:
-          path: .work/pkg
-          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-pkg-
-
-      - name: Install ginkgo
-        run: |
-          sudo apt-get install -y golang-ginkgo-dev
-
-      - name: Setup Kind Cluster
-        uses: engineerd/setup-kind@v0.5.0
-        with:
-          version: ${{ env.KIND_VERSION }}
-
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 3.1.0
-          kubebuilderOnly: false
-          kubernetesVersion: v1.21.2
-
-      - name: Run Make compatibility-test
-        run: make compatibility-test
-
-      - name: Clean up testdata
-        run: make compatibility-testdata-cleanup
-
   staticcheck:
     runs-on: ubuntu-20.04
     needs: detect-noop

.github/workflows/registry.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Build & Pushing vela-core for ACR
         run: |
-          docker build -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }} .
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }} .
           docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
         name: Build & Pushing vela-core for Dockerhub and GHCR
@@ -72,13 +72,14 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
           tags: |-
             docker.io/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository }}/vela-core:${{ steps.get_version.outputs.VERSION }}
 
       - name: Build & Pushing vela-apiserver for ACR
         run: |
-          docker build -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.apiserver .
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }} -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }} -f Dockerfile.apiserver .
           docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
         name: Build & Pushing vela-apiserver for Dockerhub and GHCR
@@ -93,13 +94,14 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
           tags: |-
             docker.io/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository }}/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
 
       - name: Build & Pushing vela runtime rollout for ACR
         run: |
-          docker build -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }} .
+          docker build --build-arg GOPROXY=https://proxy.golang.org --build-arg VERSION=${{ steps.get_version.outputs.VERSION }} --build-arg GITVERSION=git-${{ steps.vars.outputs.git_revision }}  -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }} .
           docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
       - uses: docker/build-push-action@v2
         name: Build & Pushing runtime rollout for Dockerhub and GHCR
@@ -114,6 +116,7 @@ jobs:
           build-args: |
             GITVERSION=git-${{ steps.vars.outputs.git_revision }}
             VERSION=${{ steps.get_version.outputs.VERSION }}
+            GOPROXY=https://proxy.golang.org
           tags: |-
             docker.io/oamdev/vela-rollout:${{ steps.get_version.outputs.VERSION }}
             ghcr.io/${{ github.repository }}/vela-rollout:${{ steps.get_version.outputs.VERSION }}

.github/workflows/release.yml

@@ -142,7 +142,7 @@ jobs:
       - name: Update Homebrew formula
         uses: dawidd6/action-homebrew-bump-formula@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.HOMEBREW_TOKEN }}
           formula: kubevela
           tag: ${{ github.ref }}
           revision: ${{ github.sha }}

Dockerfile

@@ -8,7 +8,8 @@ COPY go.mod go.mod
 COPY go.sum go.sum
 
 # It's a proxy for CN developer, please unblock it if you have network issue
-# RUN go env -w GOPROXY=https://goproxy.cn,direct
+ARG GOPROXY
+ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer

Makefile

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

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

@@ -213,6 +213,8 @@ const (
 	WorkflowStateFinished WorkflowState = "finished"
 	// WorkflowStateExecuting means workflow is still running or waiting some steps.
 	WorkflowStateExecuting WorkflowState = "executing"
+	// WorkflowStateSkipping means it will skip this reconcile and let next reconcile to handle it.
+	WorkflowStateSkipping WorkflowState = "skipping"
 )
 
 // ApplicationComponentStatus record the health status of App component
@@ -289,8 +291,6 @@ type AppStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-	Rollout *AppRolloutStatus `json:"rollout,omitempty"`
-
 	Phase ApplicationPhase `json:"status,omitempty"`
 
 	// Components record the related Components created by Application Controller

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

@@ -45,11 +45,6 @@ func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Rollout != nil {
-		in, out := &in.Rollout, &out.Rollout
-		*out = new(AppRolloutStatus)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]v1.ObjectReference, len(*in))

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

@@ -45,10 +45,11 @@ func (in *EnvTraitPatch) ToApplicationTrait() *common.ApplicationTrait {
 
 // EnvComponentPatch is the patch to component
 type EnvComponentPatch struct {
-	Name       string                `json:"name"`
-	Type       string                `json:"type"`
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-	Traits     []EnvTraitPatch       `json:"traits,omitempty"`
+	Name             string                `json:"name"`
+	Type             string                `json:"type"`
+	Properties       *runtime.RawExtension `json:"properties,omitempty"`
+	Traits           []EnvTraitPatch       `json:"traits,omitempty"`
+	ExternalRevision string                `json:"externalRevision,omitempty"`
 }
 
 // ToApplicationComponent convert EnvComponentPatch into ApplicationComponent

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

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

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

@@ -64,8 +64,6 @@ func ApplicationV1alpha2ToV1beta1(v1a2 *Application, v1b1 *v1beta1.Application)
 			Scopes:     scopes,
 		})
 	}
-	// 3.2) convert Spec.RolloutPlan
-	v1b1.Spec.RolloutPlan = v1a2.Spec.RolloutPlan.DeepCopy()
 
 	// 4) convert Status common.AppStatus
 	v1b1.Status = *v1a2.Status.DeepCopy()
@@ -131,8 +129,6 @@ func (app *Application) ConvertFrom(src conversion.Hub) error {
 				Scopes:       scopes,
 			})
 		}
-		// 3.2) convert Spec.RolloutPlan
-		app.Spec.RolloutPlan = sourceApp.Spec.RolloutPlan.DeepCopy()
 
 		// 4) convert Status common.AppStatus
 		app.Status = *sourceApp.Status.DeepCopy()

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

@@ -109,14 +109,6 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
-// AppRollout type metadata.
-var (
-	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
-	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
-	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
-)
-
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -135,6 +127,5 @@ func init() {
 	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
 }

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

@@ -76,107 +76,6 @@ func (in *AppReference) DeepCopy() *AppReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRollout) DeepCopyInto(out *AppRollout) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
-func (in *AppRollout) DeepCopy() *AppRollout {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRollout) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppRollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
-func (in *AppRolloutList) DeepCopy() *AppRolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
-	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-	if in.RevertOnDelete != nil {
-		in, out := &in.RevertOnDelete, &out.RevertOnDelete
-		*out = new(bool)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
-func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutStatus) DeepCopyInto(out *AppRolloutStatus) {
-	*out = *in
-	in.RolloutStatus.DeepCopyInto(&out.RolloutStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutStatus.
-func (in *AppRolloutStatus) DeepCopy() *AppRolloutStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 	*out = *in

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

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

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

@@ -17,12 +17,14 @@
 package v1beta1
 
 import (
+	"encoding/json"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 const (
@@ -86,11 +88,6 @@ type ApplicationSpec struct {
 	Workflow *Workflow `json:"workflow,omitempty"`
 
 	// TODO(wonderflow): we should have application level scopes supported here
-
-	// RolloutPlan is the details on how to rollout the resources
-	// The controller simply replace the old resources with the new one if there is no rollout plan involved
-	// +optional
-	RolloutPlan *v1alpha1.RolloutPlan `json:"rolloutPlan,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -144,3 +141,36 @@ func (app *Application) GetComponent(workloadType string) *common.ApplicationCom
 	}
 	return nil
 }
+
+// Unstructured convert application to unstructured.Unstructured.
+func (app *Application) Unstructured() (*unstructured.Unstructured, error) {
+	var obj = &unstructured.Unstructured{}
+	app.SetGroupVersionKind(ApplicationKindVersionKind)
+	bt, err := json.Marshal(app)
+	if err != nil {
+		return nil, err
+	}
+	if err := obj.UnmarshalJSON(bt); err != nil {
+		return nil, err
+	}
+
+	if app.Status.Services == nil {
+		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "services"); err != nil {
+			return nil, err
+		}
+	}
+
+	if app.Status.AppliedResources == nil {
+		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "appliedResources"); err != nil {
+			return nil, err
+		}
+	}
+
+	if wfStatus := app.Status.Workflow; wfStatus != nil && wfStatus.Steps == nil {
+		if err := unstructured.SetNestedSlice(obj.Object, []interface{}{}, "status", "workflow", "steps"); err != nil {
+			return nil, err
+		}
+	}
+
+	return obj, nil
+}

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

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

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

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

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

@@ -96,14 +96,6 @@ var (
 	ApplicationKindVersionKind = SchemeGroupVersion.WithKind(ApplicationKind)
 )
 
-// AppRollout type metadata.
-var (
-	AppRolloutKind            = reflect.TypeOf(AppRollout{}).Name()
-	AppRolloutGroupKind       = schema.GroupKind{Group: Group, Kind: AppRolloutKind}.String()
-	AppRolloutKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	AppRolloutKindVersionKind = SchemeGroupVersion.WithKind(AppRolloutKind)
-)
-
 // ApplicationRevision type metadata
 var (
 	ApplicationRevisionKind             = reflect.TypeOf(ApplicationRevision{}).Name()
@@ -128,22 +120,6 @@ var (
 	ResourceTrackerKindVersionKind = SchemeGroupVersion.WithKind(ResourceTrackerKind)
 )
 
-// AppDeployment type metadata.
-var (
-	AppDeploymentKind            = reflect.TypeOf(AppDeployment{}).Name()
-	AppDeploymentGroupKind       = schema.GroupKind{Group: Group, Kind: AppDeploymentKind}.String()
-	AppDeploymentKindAPIVersion  = AppDeploymentKind + "." + SchemeGroupVersion.String()
-	AppDeploymentKindVersionKind = SchemeGroupVersion.WithKind(AppDeploymentKind)
-)
-
-// Cluster type metadata.
-var (
-	ClusterKind            = reflect.TypeOf(Cluster{}).Name()
-	ClusterGroupKind       = schema.GroupKind{Group: Group, Kind: ClusterKind}.String()
-	ClusterKindAPIVersion  = ApplicationKind + "." + SchemeGroupVersion.String()
-	ClusterKindVersionKind = SchemeGroupVersion.WithKind(ClusterKind)
-)
-
 func init() {
 	SchemeBuilder.Register(&ComponentDefinition{}, &ComponentDefinitionList{})
 	SchemeBuilder.Register(&WorkloadDefinition{}, &WorkloadDefinitionList{})
@@ -153,10 +129,7 @@ func init() {
 	SchemeBuilder.Register(&DefinitionRevision{}, &DefinitionRevisionList{})
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
-	SchemeBuilder.Register(&AppRollout{}, &AppRolloutList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
-	SchemeBuilder.Register(&AppDeployment{}, &AppDeploymentList{})
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
 }
 

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

@@ -187,7 +187,7 @@ func (in *ResourceTracker) findMangedResourceIndex(mr ManagedResource) int {
 }
 
 // AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) {
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) (updated bool) {
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	mr := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
@@ -206,17 +206,21 @@ func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool)
 		mr.Data = &runtime.RawExtension{Object: rsc}
 	}
 	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
+		if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
+			return false
+		}
 		in.Spec.ManagedResources[idx] = mr
 	} else {
 		in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
 	}
+	return true
 }
 
 // DeleteManagedResource if remove flag is on, it will remove the object from recorded resources.
 // otherwise, it will mark the object as deleted instead of removing it
 // workflow   stage: resources are marked as deleted (and execute the deletion action)
 // state-keep stage: resources marked as deleted and successfully deleted will be removed from resourcetracker
-func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool) {
+func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool) (updated bool) {
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	mr := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
@@ -234,6 +238,9 @@ func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool)
 		if remove {
 			in.Spec.ManagedResources = append(in.Spec.ManagedResources[:idx], in.Spec.ManagedResources[idx+1:]...)
 		} else {
+			if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
+				return false
+			}
 			in.Spec.ManagedResources[idx] = mr
 		}
 	} else {
@@ -241,6 +248,7 @@ func (in *ResourceTracker) DeleteManagedResource(rsc client.Object, remove bool)
 			in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
 		}
 	}
+	return true
 }
 
 // addClusterObjectReference

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

@@ -25,118 +25,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeployment) DeepCopyInto(out *AppDeployment) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeployment.
-func (in *AppDeployment) DeepCopy() *AppDeployment {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeployment)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppDeployment) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentList) DeepCopyInto(out *AppDeploymentList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppDeployment, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentList.
-func (in *AppDeploymentList) DeepCopy() *AppDeploymentList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppDeploymentList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentSpec) DeepCopyInto(out *AppDeploymentSpec) {
-	*out = *in
-	if in.Traffic != nil {
-		in, out := &in.Traffic, &out.Traffic
-		*out = new(Traffic)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.AppRevisions != nil {
-		in, out := &in.AppRevisions, &out.AppRevisions
-		*out = make([]AppRevision, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentSpec.
-func (in *AppDeploymentSpec) DeepCopy() *AppDeploymentSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppDeploymentStatus) DeepCopyInto(out *AppDeploymentStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Placement != nil {
-		in, out := &in.Placement, &out.Placement
-		*out = make([]PlacementStatus, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppDeploymentStatus.
-func (in *AppDeploymentStatus) DeepCopy() *AppDeploymentStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AppDeploymentStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AppPolicy) DeepCopyInto(out *AppPolicy) {
 	*out = *in
@@ -157,108 +47,6 @@ func (in *AppPolicy) DeepCopy() *AppPolicy {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRevision) DeepCopyInto(out *AppRevision) {
-	*out = *in
-	if in.Placement != nil {
-		in, out := &in.Placement, &out.Placement
-		*out = make([]common.ClusterPlacement, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevision.
-func (in *AppRevision) DeepCopy() *AppRevision {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRevision)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRollout) DeepCopyInto(out *AppRollout) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRollout.
-func (in *AppRollout) DeepCopy() *AppRollout {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRollout)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRollout) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutList) DeepCopyInto(out *AppRolloutList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AppRollout, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutList.
-func (in *AppRolloutList) DeepCopy() *AppRolloutList {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AppRolloutList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AppRolloutSpec) DeepCopyInto(out *AppRolloutSpec) {
-	*out = *in
-	if in.ComponentList != nil {
-		in, out := &in.ComponentList, &out.ComponentList
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRolloutSpec.
-func (in *AppRolloutSpec) DeepCopy() *AppRolloutSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AppRolloutSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Application) DeepCopyInto(out *Application) {
 	*out = *in
@@ -472,11 +260,6 @@ func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 		*out = new(Workflow)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.RolloutPlan != nil {
-		in, out := &in.RolloutPlan, &out.RolloutPlan
-		*out = new(v1alpha1.RolloutPlan)
-		(*in).DeepCopyInto(*out)
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.
@@ -489,111 +272,6 @@ func (in *ApplicationSpec) DeepCopy() *ApplicationSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Cluster) DeepCopyInto(out *Cluster) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
-	out.Status = in.Status
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
-func (in *Cluster) DeepCopy() *Cluster {
-	if in == nil {
-		return nil
-	}
-	out := new(Cluster)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Cluster) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterList) DeepCopyInto(out *ClusterList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Cluster, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList.
-func (in *ClusterList) DeepCopy() *ClusterList {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterPlacementStatus) DeepCopyInto(out *ClusterPlacementStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterPlacementStatus.
-func (in *ClusterPlacementStatus) DeepCopy() *ClusterPlacementStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterPlacementStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
-	*out = *in
-	out.KubeconfigSecretRef = in.KubeconfigSecretRef
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
-func (in *ClusterSpec) DeepCopy() *ClusterSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStatus.
-func (in *ClusterStatus) DeepCopy() *ClusterStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ComponentDefinition) DeepCopyInto(out *ComponentDefinition) {
 	*out = *in
@@ -789,72 +467,6 @@ func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HTTPMatchRequest) DeepCopyInto(out *HTTPMatchRequest) {
-	*out = *in
-	if in.URI != nil {
-		in, out := &in.URI, &out.URI
-		*out = new(URIMatch)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPMatchRequest.
-func (in *HTTPMatchRequest) DeepCopy() *HTTPMatchRequest {
-	if in == nil {
-		return nil
-	}
-	out := new(HTTPMatchRequest)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HTTPRule) DeepCopyInto(out *HTTPRule) {
-	*out = *in
-	if in.Match != nil {
-		in, out := &in.Match, &out.Match
-		*out = make([]*HTTPMatchRequest, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(HTTPMatchRequest)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
-	if in.WeightedTargets != nil {
-		in, out := &in.WeightedTargets, &out.WeightedTargets
-		*out = make([]WeightedTarget, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPRule.
-func (in *HTTPRule) DeepCopy() *HTTPRule {
-	if in == nil {
-		return nil
-	}
-	out := new(HTTPRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *LocalSecretReference) DeepCopyInto(out *LocalSecretReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalSecretReference.
-func (in *LocalSecretReference) DeepCopy() *LocalSecretReference {
-	if in == nil {
-		return nil
-	}
-	out := new(LocalSecretReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ManagedResource) DeepCopyInto(out *ManagedResource) {
 	*out = *in
@@ -877,26 +489,6 @@ func (in *ManagedResource) DeepCopy() *ManagedResource {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PlacementStatus) DeepCopyInto(out *PlacementStatus) {
-	*out = *in
-	if in.Clusters != nil {
-		in, out := &in.Clusters, &out.Clusters
-		*out = make([]ClusterPlacementStatus, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PlacementStatus.
-func (in *PlacementStatus) DeepCopy() *PlacementStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(PlacementStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PolicyDefinition) DeepCopyInto(out *PolicyDefinition) {
 	*out = *in
@@ -1178,38 +770,6 @@ func (in *ScopeDefinitionSpec) DeepCopy() *ScopeDefinitionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Traffic) DeepCopyInto(out *Traffic) {
-	*out = *in
-	if in.Hosts != nil {
-		in, out := &in.Hosts, &out.Hosts
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Gateways != nil {
-		in, out := &in.Gateways, &out.Gateways
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.HTTP != nil {
-		in, out := &in.HTTP, &out.HTTP
-		*out = make([]HTTPRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Traffic.
-func (in *Traffic) DeepCopy() *Traffic {
-	if in == nil {
-		return nil
-	}
-	out := new(Traffic)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TraitDefinition) DeepCopyInto(out *TraitDefinition) {
 	*out = *in
@@ -1331,36 +891,6 @@ func (in *TraitDefinitionStatus) DeepCopy() *TraitDefinitionStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *URIMatch) DeepCopyInto(out *URIMatch) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new URIMatch.
-func (in *URIMatch) DeepCopy() *URIMatch {
-	if in == nil {
-		return nil
-	}
-	out := new(URIMatch)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WeightedTarget) DeepCopyInto(out *WeightedTarget) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WeightedTarget.
-func (in *WeightedTarget) DeepCopy() *WeightedTarget {
-	if in == nil {
-		return nil
-	}
-	out := new(WeightedTarget)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Workflow) DeepCopyInto(out *Workflow) {
 	*out = *in

apis/types/capability.go

@@ -179,6 +179,8 @@ type Capability struct {
 
 	// Terraform
 	TerraformConfiguration string `json:"terraformConfiguration,omitempty"`
+	ConfigurationType      string `json:"configurationType,omitempty"`
+	Path                   string `json:"path,omitempty"`
 
 	// KubeTemplate
 	KubeTemplate  runtime.RawExtension   `json:"kubetemplate,omitempty"`

apis/types/types.go

@@ -48,6 +48,14 @@ const (
 	LabelDefinitionDeprecated = "custom.definition.oam.dev/deprecated"
 	// LabelDefinitionHidden is the label which describe whether the capability is hidden by UI
 	LabelDefinitionHidden = "custom.definition.oam.dev/ui-hidden"
+	// LabelNodeRoleGateway gateway role of node
+	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
+	// LabelNodeRoleWorker worker role of node
+	LabelNodeRoleWorker = "node-role.kubernetes.io/worker"
+	// AnnoIngressControllerHTTPSPort define ingress controller listen port for https
+	AnnoIngressControllerHTTPSPort = "ingress.controller/https-port"
+	// AnnoIngressControllerHTTPPort define ingress controller listen port for http
+	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
 )
 
 const (
@@ -64,23 +72,31 @@ type Config map[string]string
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
-
-	Current string `json:"current,omitempty"`
+	Current   string `json:"current"`
 }
 
 const (
 	// TagCommandType used for tag cli category
 	TagCommandType = "commandType"
+
+	// TagCommandOrder defines the order
+	TagCommandOrder = "commandOrder"
+
 	// TypeStart defines one category
 	TypeStart = "Getting Started"
+
 	// TypeApp defines one category
 	TypeApp = "Managing Applications"
-	// TypeCap defines one category
-	TypeCap = "Managing Capabilities"
+
+	// TypeCD defines workflow Management operations
+	TypeCD = "Continuous Delivery"
+
+	// TypeExtension defines one category
+	TypeExtension = "Managing Extension"
+
 	// TypeSystem defines one category
-	TypeSystem = "System"
-	// TypeDefinition defines one category
-	TypeDefinition = "Managing Definitions"
+	TypeSystem = "Others"
+
 	// TypePlugin defines one category used in Kubectl Plugin
 	TypePlugin = "Plugin Command"
 )

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

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

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

@@ -677,113 +677,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services
@@ -2324,324 +2217,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      rolloutPlan:
-                        description: RolloutPlan is the details on how to rollout
-                          the resources The controller simply replace the old resources
-                          with the new one if there is no rollout plan involved
-                        properties:
-                          batchPartition:
-                            description: All pods in the batches up to the batchPartition
-                              (included) will have the target resource specification
-                              while the rest still have the source resource This is
-                              designed for the operators to manually rollout Default
-                              is the the number of batches which will rollout all
-                              the batches
-                            format: int32
-                            type: integer
-                          canaryMetric:
-                            description: CanaryMetric provides a way for the rollout
-                              process to automatically check certain metrics before
-                              complete the process
-                            items:
-                              description: CanaryMetric holds the reference to metrics
-                                used for canary analysis
-                              properties:
-                                interval:
-                                  description: Interval represents the windows size
-                                  type: string
-                                metricsRange:
-                                  description: Range value accepted for this metric
-                                  properties:
-                                    max:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Maximum value
-                                      x-kubernetes-int-or-string: true
-                                    min:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Minimum value
-                                      x-kubernetes-int-or-string: true
-                                  type: object
-                                name:
-                                  description: Name of the metric
-                                  type: string
-                                templateRef:
-                                  description: TemplateRef references a metric template
-                                    object
-                                  properties:
-                                    apiVersion:
-                                      description: API version of the referent.
-                                      type: string
-                                    fieldPath:
-                                      description: 'If referring to a piece of an
-                                        object instead of an entire object, this string
-                                        should contain a valid JSON/Go field access
-                                        statement, such as desiredState.manifest.containers[2].
-                                        For example, if the object reference is to
-                                        a container within a pod, this would take
-                                        on a value like: "spec.containers{name}" (where
-                                        "name" refers to the name of the container
-                                        that triggered the event) or if no container
-                                        name is specified "spec.containers[2]" (container
-                                        with index 2 in this pod). This syntax is
-                                        chosen only to have some well-defined way
-                                        of referencing a part of an object. TODO:
-                                        this design is not final and this field is
-                                        subject to change in the future.'
-                                      type: string
-                                    kind:
-                                      description: 'Kind of the referent. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                      type: string
-                                    name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                      type: string
-                                    namespace:
-                                      description: 'Namespace of the referent. More
-                                        info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                      type: string
-                                    resourceVersion:
-                                      description: 'Specific resourceVersion to which
-                                        this reference is made, if any. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                      type: string
-                                    uid:
-                                      description: 'UID of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                      type: string
-                                  type: object
-                              required:
-                              - name
-                              type: object
-                            type: array
-                          numBatches:
-                            description: The number of batches, default = 1
-                            format: int32
-                            type: integer
-                          paused:
-                            description: Paused the rollout, default is false
-                            type: boolean
-                          rolloutBatches:
-                            description: The exact distribution among batches. its
-                              size has to be exactly the same as the NumBatches (if
-                              set) The total number cannot exceed the targetSize or
-                              the size of the source resource We will IGNORE the last
-                              batch's replica field if it's a percentage since round
-                              errors can lead to inaccurate sum We highly recommend
-                              to leave the last batch's replica field empty
-                            items:
-                              description: RolloutBatch is used to describe how the
-                                each batch rollout should be
-                              properties:
-                                batchRolloutWebhooks:
-                                  description: RolloutWebhooks provides a way for
-                                    the batch rollout to interact with an external
-                                    process
-                                  items:
-                                    description: RolloutWebhook holds the reference
-                                      to external checks used for canary analysis
-                                    properties:
-                                      expectedStatus:
-                                        description: ExpectedStatus contains all the
-                                          expected http status code that we will accept
-                                          as success
-                                        items:
-                                          type: integer
-                                        type: array
-                                      metadata:
-                                        additionalProperties:
-                                          type: string
-                                        description: Metadata (key-value pairs) for
-                                          this webhook
-                                        type: object
-                                      method:
-                                        description: Method the HTTP call method,
-                                          default is POST
-                                        type: string
-                                      name:
-                                        description: Name of this webhook
-                                        type: string
-                                      type:
-                                        description: Type of this webhook
-                                        type: string
-                                      url:
-                                        description: URL address of this webhook
-                                        type: string
-                                    required:
-                                    - name
-                                    - type
-                                    - url
-                                    type: object
-                                  type: array
-                                canaryMetric:
-                                  description: CanaryMetric provides a way for the
-                                    batch rollout process to automatically check certain
-                                    metrics before moving to the next batch
-                                  items:
-                                    description: CanaryMetric holds the reference
-                                      to metrics used for canary analysis
-                                    properties:
-                                      interval:
-                                        description: Interval represents the windows
-                                          size
-                                        type: string
-                                      metricsRange:
-                                        description: Range value accepted for this
-                                          metric
-                                        properties:
-                                          max:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Maximum value
-                                            x-kubernetes-int-or-string: true
-                                          min:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Minimum value
-                                            x-kubernetes-int-or-string: true
-                                        type: object
-                                      name:
-                                        description: Name of the metric
-                                        type: string
-                                      templateRef:
-                                        description: TemplateRef references a metric
-                                          template object
-                                        properties:
-                                          apiVersion:
-                                            description: API version of the referent.
-                                            type: string
-                                          fieldPath:
-                                            description: 'If referring to a piece
-                                              of an object instead of an entire object,
-                                              this string should contain a valid JSON/Go
-                                              field access statement, such as desiredState.manifest.containers[2].
-                                              For example, if the object reference
-                                              is to a container within a pod, this
-                                              would take on a value like: "spec.containers{name}"
-                                              (where "name" refers to the name of
-                                              the container that triggered the event)
-                                              or if no container name is specified
-                                              "spec.containers[2]" (container with
-                                              index 2 in this pod). This syntax is
-                                              chosen only to have some well-defined
-                                              way of referencing a part of an object.
-                                              TODO: this design is not final and this
-                                              field is subject to change in the future.'
-                                            type: string
-                                          kind:
-                                            description: 'Kind of the referent. More
-                                              info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                            type: string
-                                          name:
-                                            description: 'Name of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                            type: string
-                                          namespace:
-                                            description: 'Namespace of the referent.
-                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                            type: string
-                                          resourceVersion:
-                                            description: 'Specific resourceVersion
-                                              to which this reference is made, if
-                                              any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                            type: string
-                                          uid:
-                                            description: 'UID of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                            type: string
-                                        type: object
-                                    required:
-                                    - name
-                                    type: object
-                                  type: array
-                                instanceInterval:
-                                  description: The wait time, in seconds, between
-                                    instances upgrades, default = 0
-                                  format: int32
-                                  type: integer
-                                maxUnavailable:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: MaxUnavailable is the max allowed number
-                                    of pods that is unavailable during the upgrade.
-                                    We will mark the batch as ready as long as there
-                                    are less or equal number of pods unavailable than
-                                    this number. default = 0
-                                  x-kubernetes-int-or-string: true
-                                podList:
-                                  description: The list of Pods to get upgraded it
-                                    is mutually exclusive with the Replicas field
-                                  items:
-                                    type: string
-                                  type: array
-                                replicas:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: 'Replicas is the number of pods to
-                                    upgrade in this batch it can be an absolute number
-                                    (ex: 5) or a percentage of total pods we will
-                                    ignore the percentage of the last batch to just
-                                    fill the gap it is mutually exclusive with the
-                                    PodList field'
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            type: array
-                          rolloutStrategy:
-                            description: RolloutStrategy defines strategies for the
-                              rollout plan The default is IncreaseFirstRolloutStrategyType
-                            type: string
-                          rolloutWebhooks:
-                            description: RolloutWebhooks provide a way for the rollout
-                              to interact with an external process
-                            items:
-                              description: RolloutWebhook holds the reference to external
-                                checks used for canary analysis
-                              properties:
-                                expectedStatus:
-                                  description: ExpectedStatus contains all the expected
-                                    http status code that we will accept as success
-                                  items:
-                                    type: integer
-                                  type: array
-                                metadata:
-                                  additionalProperties:
-                                    type: string
-                                  description: Metadata (key-value pairs) for this
-                                    webhook
-                                  type: object
-                                method:
-                                  description: Method the HTTP call method, default
-                                    is POST
-                                  type: string
-                                name:
-                                  description: Name of this webhook
-                                  type: string
-                                type:
-                                  description: Type of this webhook
-                                  type: string
-                                url:
-                                  description: URL address of this webhook
-                                  type: string
-                              required:
-                              - name
-                              - type
-                              - url
-                              type: object
-                            type: array
-                          targetSize:
-                            description: The size of the target resource. The default
-                              is the same as the size of the source resource.
-                            format: int32
-                            type: integer
-                        type: object
                       workflow:
                         description: 'Workflow defines how to customize the control
                           logic. If workflow is specified, Vela won''t apply any resource,
@@ -2937,113 +2512,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services

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

@@ -485,82 +485,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True, False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:
@@ -876,234 +800,6 @@ spec:
                   - type
                   type: object
                 type: array
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources The controller simply replace the old resources with the new one if there is no rollout plan involved
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                              type: string
-                          type: object
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template object
-                                properties:
-                                  apiVersion:
-                                    description: API version of the referent.
-                                    type: string
-                                  fieldPath:
-                                    description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                                    type: string
-                                  kind:
-                                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                  name:
-                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                  namespace:
-                                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                    type: string
-                                  resourceVersion:
-                                    description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                    type: string
-                                  uid:
-                                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                    type: string
-                                type: object
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
               workflow:
                 description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
                 properties:
@@ -1311,82 +1007,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True, False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:

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

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

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

@@ -1,60 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  name: clusters.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
-    singular: cluster
-  scope: Namespaced
-  versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: Cluster is the Schema for the clusters API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ClusterSpec defines the desired state of Cluster
-            properties:
-              kubeconfigSecretRef:
-                description: KubeconfigSecretRef specifies the reference to the secret
-                  that contains the kubeconfig in field `config`.
-                properties:
-                  name:
-                    description: Name of a secret within the enclosing namespace.
-                    type: string
-                required:
-                - name
-                type: object
-            type: object
-          status:
-            description: ClusterStatus defines the observed state of Cluster
-            type: object
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/vela-core/templates/NOTES.txt

@@ -1 +1,29 @@
-Welcome to use the KubeVela! Enjoy your shipping application journey!
+Welcome to use the KubeVela! Enjoy your shipping application journey!
+
+                                   ,
+                                   //,
+                                   ////
+                               ./  /////*
+                             ,///  ///////
+                           ./////  ////////
+                          ///////  /////////
+                         ////////  //////////
+                       ,/////////  ///////////
+                      ,//////////  ///////////.
+                     .///////////  ////////////
+                     ////////////  ////////////.
+                    *////////////  ////////////*
+       #@@@@@@@@@@@*     ..,,***/  /////////////
+        /@@@@@@@@@@@#
+         *@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&
+          .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.
+
+              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                .&@@@*    *@@@&    ,@@@&.
+
+       _  __       _          __     __     _
+      | |/ /_   _ | |__    ___\ \   / /___ | |  __ _
+      | ' /| | | || '_ \  / _ \\ \ / // _ \| | / _` |
+      | . \| |_| || |_) ||  __/ \ V /|  __/| || (_| |
+      |_|\_\\__,_||_.__/  \___|  \_/  \___||_| \__,_|
+

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

@@ -22,6 +22,10 @@ spec:
         app: {{ template "kubevela.name" . }}-admission-create
         {{- include "kubevela.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: create
           image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}

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

@@ -22,6 +22,10 @@ spec:
         app: {{ template "kubevela.name" . }}-admission-patch
         {{- include "kubevela.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: patch
           image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}

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

@@ -1,5 +1,4 @@
 {{ if .Values.multicluster.enabled }}
-{{ if not (lookup "apps/v1" "Deployment" .Release.Namespace (printf "%s-cluster-gateway" .Release.Name)) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -73,7 +72,6 @@ spec:
       maxSurge: 1
       maxUnavailable: 1
 {{ end }}
-{{ end }}
 ---
 {{ if .Values.multicluster.enabled }}
 apiVersion: v1
@@ -91,7 +89,10 @@ spec:
 {{ end }}
 ---
 {{ if .Values.multicluster.enabled }}
-{{ if not (lookup "apiregistration.k8s.io/v1" "APIService" "" "v1alpha1.cluster.core.oam.dev") }}
+{{ $apiSvc := (lookup "apiregistration.k8s.io/v1" "APIService" "" "v1alpha1.cluster.core.oam.dev") }}
+{{ $shouldAdopt := (not $apiSvc) }}
+{{ if not $shouldAdopt }}{{ $shouldAdopt = (index ($apiSvc).metadata.annotations "meta.helm.sh/release-name") }}{{ end }}
+{{ if $shouldAdopt }}
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
@@ -197,6 +198,10 @@ spec:
         app: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-secret-create
         {{- include "kubevela.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: create
         image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
@@ -240,6 +245,10 @@ spec:
         app: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-secret-patch
         {{- include "kubevela.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: patch
         image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}

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

@@ -32,21 +32,30 @@ spec:
         	kind:       "Ingress"
         	metadata: {
         		name: context.name
-        		annotations: "kubernetes.io/ingress.class": parameter.class
+        		annotations: {
+        			if !parameter.classInSpec {
+        				"kubernetes.io/ingress.class": parameter.class
+        			}
+        		}
+        	}
+        	spec: {
+        		if parameter.classInSpec {
+        			ingressClassName: parameter.class
+        		}
+        		rules: [{
+        			host: parameter.domain
+        			http: paths: [
+        				for k, v in parameter.http {
+        					path:     k
+        					pathType: "ImplementationSpecific"
+        					backend: service: {
+        						name: context.name
+        						port: number: v
+        					}
+        				},
+        			]
+        		}]
         	}
-        	spec: rules: [{
-        		host: parameter.domain
-        		http: paths: [
-        			for k, v in parameter.http {
-        				path:     k
-        				pathType: "ImplementationSpecific"
-        				backend: service: {
-        					name: context.name
-        					port: number: v
-        				}
-        			},
-        		]
-        	}]
         }
         parameter: {
         	// +usage=Specify the domain you want to expose
@@ -57,6 +66,9 @@ spec:
 
         	// +usage=Specify the class of ingress to use
         	class: *"nginx" | string
+
+        	// +usage=Set ingress class in '.spec.ingressClassName' instead of 'kubernetes.io/ingress.class' annotation.
+        	classInSpec: *false | bool
         }
   status:
     customStatus: |-

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

@@ -17,9 +17,39 @@ spec:
         )
 
         parameter: {
+        	lark?: {
+        		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
+        		// +useage=Specify the message that you want to sent
+        		message: {
+        			// +usage=msg_type can be text, post, image, interactive, share_chat, share_user, audio, media, file, sticker
+        			msg_type: string
+        			// +usage=content should be json encode string
+        			content: string
+        		}
+        	}
+
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
-        		url: value | secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
         		// +useage=Specify the message that you want to sent
         		message: {
         			text?: *null | {
@@ -66,7 +96,16 @@ spec:
 
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: value | secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
         		// +useage=Specify the message that you want to sent
         		message: {
         			text:         string
@@ -88,7 +127,16 @@ spec:
         			// +usage=The alias is the email alias to show after sending the email
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
-        			password: value | secretRef
+        			password: {
+        				value: string
+        			} | {
+        				secretRef: {
+        					// +usage=name is the name of the secret
+        					name: string
+        					// +usage=key is the key in the secret
+        					key: string
+        				}
+        			}
         			// +usage=Specify the host of your email
         			host: string
         			// +usage=Specify the port of the email host, default to 587
@@ -150,13 +198,6 @@ spec:
         	description?: textType
         	url?:         string
         }
-        secretRef: {
-        	// +usage=name is the name of the secret
-        	name: string
-        	// +usage=key is the key in the secret
-        	key: string
-        }
-        value: string
         // send webhook notification
         ding: op.#Steps & {
         	if parameter.dingding != _|_ {
@@ -187,6 +228,35 @@ spec:
         		}
         	}
         }
+        lark: op.#Steps & {
+        	if parameter.lark != _|_ {
+        		if parameter.lark.url.value != _|_ {
+        			lark1: op.#Lark & {
+        				message: parameter.lark.message
+        				larkUrl: parameter.lark.url.value
+        			}
+        		}
+        		if parameter.lark.url.secretRef != _|_ && parameter.lark.url.value == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					apiVersion: "v1"
+        					kind:       "Secret"
+        					metadata: {
+        						name:      parameter.lark.url.secretRef.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			lark2:       op.#Lark & {
+        				message: parameter.lark.message
+        				larkUrl: stringValue.str
+        			}
+        		}
+        	}
+        }
         slack: op.#Steps & {
         	if parameter.slack != _|_ {
         		if parameter.slack.url.value != _|_ {

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

@@ -109,10 +109,10 @@ spec:
         }
         parameter: {
         	// +usage=Specify the labels in the workload
-        	labels?: {...}
+        	labels?: [string]: string
 
         	// +usage=Specify the annotations in the workload
-        	annotations?: {...}
+        	annotations?: [string]: string
 
         	// +usage=Specify number of tasks to run in parallel
         	// +short=c

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

@@ -68,14 +68,18 @@ spec:
         		} @step(8)
         	}
         }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
         parameter: {
         	// +usage=Specify the webhook url
-        	url: value | secretRef
+        	url: {
+        		value: string
+        	} | {
+        		secretRef: {
+        			// +usage=name is the name of the secret
+        			name: string
+        			// +usage=key is the key in the secret
+        			key: string
+        		}
+        	}
         	// +usage=Specify the data you want to send
         	data?: {...}
         }

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

@@ -11,6 +11,10 @@ spec:
   schematic:
     cue:
       template: |
+        import (
+        	"strconv"
+        )
+
         mountsArray: {
         	pvc: *[
         		for v in parameter.volumeMounts.pvc {
@@ -152,6 +156,12 @@ spec:
         							{
         								containerPort: v.port
         								protocol:      v.protocol
+        								if v.name != _|_ {
+        									name: v.name
+        								}
+        								if v.name == _|_ {
+        									name: "port-" + strconv.FormatInt(v.port, 10)
+        								}
         							}}]
         					}
 
@@ -262,6 +272,12 @@ spec:
         	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
+        		if v.name != _|_ {
+        			name: v.name
+        		}
+        		if v.name == _|_ {
+        			name: "port-" + strconv.FormatInt(v.port, 10)
+        		}
         	},
         ]
         outputs: {
@@ -280,10 +296,10 @@ spec:
         }
         parameter: {
         	// +usage=Specify the labels in the workload
-        	labels?: {...}
+        	labels?: [string]: string
 
         	// +usage=Specify the annotations in the workload
-        	annotations?: {...}
+        	annotations?: [string]: string
 
         	// +usage=Which image would you like to use for your service
         	// +short=i
@@ -304,6 +320,8 @@ spec:
         	ports?: [...{
         		// +usage=Number of port to expose on the pod's IP address
         		port: int
+        		// +usage=Name of the port
+        		name?: string
         		// +usage=Protocol for port. Must be UDP, TCP, or SCTP
         		protocol: *"TCP" | "UDP" | "SCTP"
         		// +usage=Specify if the port should be exposed
@@ -494,7 +512,7 @@ spec:
       		replica:  strconv.FormatInt(context.output.status.readyReplicas, 10)
       	}
       }
-      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
+      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
     healthPolicy: |-
       ready: {
       	if context.output.status.readyReplicas == _|_ {
@@ -504,7 +522,7 @@ spec:
       		replica:  context.output.status.readyReplicas
       	}
       }
-      isHealth: context.output.status.replicas == context.output.status.readyReplicas
+      isHealth: context.output.spec.replicas == ready.replica
   workload:
     definition:
       apiVersion: apps/v1

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

@@ -405,7 +405,7 @@ spec:
       		replica:  strconv.FormatInt(context.output.status.readyReplicas, 10)
       	}
       }
-      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
+      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
     healthPolicy: |-
       ready: {
       	if context.output.status.readyReplicas == _|_ {
@@ -415,7 +415,7 @@ spec:
       		replica:  context.output.status.readyReplicas
       	}
       }
-      isHealth: context.output.status.replicas == context.output.status.readyReplicas
+      isHealth: context.output.spec.replicas == ready.replica
   workload:
     definition:
       apiVersion: apps/v1

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

@@ -90,6 +90,10 @@ spec:
     metadata:
       labels:
     {{- include "kubevela.selectorLabels" . | nindent 8 }}
+      annotations:
+          prometheus.io/path: /metrics
+          prometheus.io/port: "8080"
+          prometheus.io/scrape: "true"
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -130,6 +134,7 @@ spec:
             {{ if .Values.multicluster.enabled }}
             - "--enable-cluster-gateway"
             {{ end }}
+            - "--application-re-sync-period={{ .Values.controllerArgs.reSyncPeriod }}"
           image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:

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

@@ -0,0 +1,40 @@
+apiVersion: "v1"
+kind:       "ConfigMap"
+metadata: 
+  name:      "service-endpoints-view"
+  namespace: {{.Values.systemDefinitionNamespace}}
+data:
+  template: |
+      import (
+          "vela/ql"
+      )
+      parameter: {
+          appName:    string
+          appNs:      string
+          cluster?:   string
+          clusterNs?: string
+      }
+      resources: ql.#CollectServiceEndpoints & {
+          app: {
+              name:      parameter.appName
+              namespace: parameter.appNs
+              filter: {
+                  if parameter.cluster != _|_ {
+                      cluster: parameter.cluster
+                  }
+                  if parameter.clusterNs != _|_ {
+                      clusterNamespace: parameter.clusterNs
+                  }
+              }
+          }
+      }
+      if resources.err == _|_ {
+          status: {
+              endpoints: resources.list
+          }
+      }
+      if resources.err != _|_ {
+          status: {
+              error: resources.err
+          }
+      }

charts/vela-core/values.yaml

@@ -62,6 +62,9 @@ affinity: {}
 rbac:
   create: true
 
+controllerArgs:
+  reSyncPeriod: 5m
+
 admissionWebhooks:
   enabled: true
   failurePolicy: Fail

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

@@ -677,113 +677,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services
@@ -2324,324 +2217,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      rolloutPlan:
-                        description: RolloutPlan is the details on how to rollout
-                          the resources The controller simply replace the old resources
-                          with the new one if there is no rollout plan involved
-                        properties:
-                          batchPartition:
-                            description: All pods in the batches up to the batchPartition
-                              (included) will have the target resource specification
-                              while the rest still have the source resource This is
-                              designed for the operators to manually rollout Default
-                              is the the number of batches which will rollout all
-                              the batches
-                            format: int32
-                            type: integer
-                          canaryMetric:
-                            description: CanaryMetric provides a way for the rollout
-                              process to automatically check certain metrics before
-                              complete the process
-                            items:
-                              description: CanaryMetric holds the reference to metrics
-                                used for canary analysis
-                              properties:
-                                interval:
-                                  description: Interval represents the windows size
-                                  type: string
-                                metricsRange:
-                                  description: Range value accepted for this metric
-                                  properties:
-                                    max:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Maximum value
-                                      x-kubernetes-int-or-string: true
-                                    min:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Minimum value
-                                      x-kubernetes-int-or-string: true
-                                  type: object
-                                name:
-                                  description: Name of the metric
-                                  type: string
-                                templateRef:
-                                  description: TemplateRef references a metric template
-                                    object
-                                  properties:
-                                    apiVersion:
-                                      description: API version of the referent.
-                                      type: string
-                                    fieldPath:
-                                      description: 'If referring to a piece of an
-                                        object instead of an entire object, this string
-                                        should contain a valid JSON/Go field access
-                                        statement, such as desiredState.manifest.containers[2].
-                                        For example, if the object reference is to
-                                        a container within a pod, this would take
-                                        on a value like: "spec.containers{name}" (where
-                                        "name" refers to the name of the container
-                                        that triggered the event) or if no container
-                                        name is specified "spec.containers[2]" (container
-                                        with index 2 in this pod). This syntax is
-                                        chosen only to have some well-defined way
-                                        of referencing a part of an object. TODO:
-                                        this design is not final and this field is
-                                        subject to change in the future.'
-                                      type: string
-                                    kind:
-                                      description: 'Kind of the referent. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                      type: string
-                                    name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                      type: string
-                                    namespace:
-                                      description: 'Namespace of the referent. More
-                                        info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                      type: string
-                                    resourceVersion:
-                                      description: 'Specific resourceVersion to which
-                                        this reference is made, if any. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                      type: string
-                                    uid:
-                                      description: 'UID of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                      type: string
-                                  type: object
-                              required:
-                              - name
-                              type: object
-                            type: array
-                          numBatches:
-                            description: The number of batches, default = 1
-                            format: int32
-                            type: integer
-                          paused:
-                            description: Paused the rollout, default is false
-                            type: boolean
-                          rolloutBatches:
-                            description: The exact distribution among batches. its
-                              size has to be exactly the same as the NumBatches (if
-                              set) The total number cannot exceed the targetSize or
-                              the size of the source resource We will IGNORE the last
-                              batch's replica field if it's a percentage since round
-                              errors can lead to inaccurate sum We highly recommend
-                              to leave the last batch's replica field empty
-                            items:
-                              description: RolloutBatch is used to describe how the
-                                each batch rollout should be
-                              properties:
-                                batchRolloutWebhooks:
-                                  description: RolloutWebhooks provides a way for
-                                    the batch rollout to interact with an external
-                                    process
-                                  items:
-                                    description: RolloutWebhook holds the reference
-                                      to external checks used for canary analysis
-                                    properties:
-                                      expectedStatus:
-                                        description: ExpectedStatus contains all the
-                                          expected http status code that we will accept
-                                          as success
-                                        items:
-                                          type: integer
-                                        type: array
-                                      metadata:
-                                        additionalProperties:
-                                          type: string
-                                        description: Metadata (key-value pairs) for
-                                          this webhook
-                                        type: object
-                                      method:
-                                        description: Method the HTTP call method,
-                                          default is POST
-                                        type: string
-                                      name:
-                                        description: Name of this webhook
-                                        type: string
-                                      type:
-                                        description: Type of this webhook
-                                        type: string
-                                      url:
-                                        description: URL address of this webhook
-                                        type: string
-                                    required:
-                                    - name
-                                    - type
-                                    - url
-                                    type: object
-                                  type: array
-                                canaryMetric:
-                                  description: CanaryMetric provides a way for the
-                                    batch rollout process to automatically check certain
-                                    metrics before moving to the next batch
-                                  items:
-                                    description: CanaryMetric holds the reference
-                                      to metrics used for canary analysis
-                                    properties:
-                                      interval:
-                                        description: Interval represents the windows
-                                          size
-                                        type: string
-                                      metricsRange:
-                                        description: Range value accepted for this
-                                          metric
-                                        properties:
-                                          max:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Maximum value
-                                            x-kubernetes-int-or-string: true
-                                          min:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Minimum value
-                                            x-kubernetes-int-or-string: true
-                                        type: object
-                                      name:
-                                        description: Name of the metric
-                                        type: string
-                                      templateRef:
-                                        description: TemplateRef references a metric
-                                          template object
-                                        properties:
-                                          apiVersion:
-                                            description: API version of the referent.
-                                            type: string
-                                          fieldPath:
-                                            description: 'If referring to a piece
-                                              of an object instead of an entire object,
-                                              this string should contain a valid JSON/Go
-                                              field access statement, such as desiredState.manifest.containers[2].
-                                              For example, if the object reference
-                                              is to a container within a pod, this
-                                              would take on a value like: "spec.containers{name}"
-                                              (where "name" refers to the name of
-                                              the container that triggered the event)
-                                              or if no container name is specified
-                                              "spec.containers[2]" (container with
-                                              index 2 in this pod). This syntax is
-                                              chosen only to have some well-defined
-                                              way of referencing a part of an object.
-                                              TODO: this design is not final and this
-                                              field is subject to change in the future.'
-                                            type: string
-                                          kind:
-                                            description: 'Kind of the referent. More
-                                              info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                            type: string
-                                          name:
-                                            description: 'Name of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                            type: string
-                                          namespace:
-                                            description: 'Namespace of the referent.
-                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                            type: string
-                                          resourceVersion:
-                                            description: 'Specific resourceVersion
-                                              to which this reference is made, if
-                                              any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                            type: string
-                                          uid:
-                                            description: 'UID of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                            type: string
-                                        type: object
-                                    required:
-                                    - name
-                                    type: object
-                                  type: array
-                                instanceInterval:
-                                  description: The wait time, in seconds, between
-                                    instances upgrades, default = 0
-                                  format: int32
-                                  type: integer
-                                maxUnavailable:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: MaxUnavailable is the max allowed number
-                                    of pods that is unavailable during the upgrade.
-                                    We will mark the batch as ready as long as there
-                                    are less or equal number of pods unavailable than
-                                    this number. default = 0
-                                  x-kubernetes-int-or-string: true
-                                podList:
-                                  description: The list of Pods to get upgraded it
-                                    is mutually exclusive with the Replicas field
-                                  items:
-                                    type: string
-                                  type: array
-                                replicas:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: 'Replicas is the number of pods to
-                                    upgrade in this batch it can be an absolute number
-                                    (ex: 5) or a percentage of total pods we will
-                                    ignore the percentage of the last batch to just
-                                    fill the gap it is mutually exclusive with the
-                                    PodList field'
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            type: array
-                          rolloutStrategy:
-                            description: RolloutStrategy defines strategies for the
-                              rollout plan The default is IncreaseFirstRolloutStrategyType
-                            type: string
-                          rolloutWebhooks:
-                            description: RolloutWebhooks provide a way for the rollout
-                              to interact with an external process
-                            items:
-                              description: RolloutWebhook holds the reference to external
-                                checks used for canary analysis
-                              properties:
-                                expectedStatus:
-                                  description: ExpectedStatus contains all the expected
-                                    http status code that we will accept as success
-                                  items:
-                                    type: integer
-                                  type: array
-                                metadata:
-                                  additionalProperties:
-                                    type: string
-                                  description: Metadata (key-value pairs) for this
-                                    webhook
-                                  type: object
-                                method:
-                                  description: Method the HTTP call method, default
-                                    is POST
-                                  type: string
-                                name:
-                                  description: Name of this webhook
-                                  type: string
-                                type:
-                                  description: Type of this webhook
-                                  type: string
-                                url:
-                                  description: URL address of this webhook
-                                  type: string
-                              required:
-                              - name
-                              - type
-                              - url
-                              type: object
-                            type: array
-                          targetSize:
-                            description: The size of the target resource. The default
-                              is the same as the size of the source resource.
-                            format: int32
-                            type: integer
-                        type: object
                       workflow:
                         description: 'Workflow defines how to customize the control
                           logic. If workflow is specified, Vela won''t apply any resource,
@@ -2937,113 +2512,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services

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

@@ -485,82 +485,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True, False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:
@@ -876,234 +800,6 @@ spec:
                   - type
                   type: object
                 type: array
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources The controller simply replace the old resources with the new one if there is no rollout plan involved
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition (included) will have the target resource specification while the rest still have the source resource This is designed for the operators to manually rollout Default is the the number of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                              type: string
-                          type: object
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has to be exactly the same as the NumBatches (if set) The total number cannot exceed the targetSize or the size of the source resource We will IGNORE the last batch's replica field if it's a percentage since round errors can lead to inaccurate sum We highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout process to automatically check certain metrics before moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template object
-                                properties:
-                                  apiVersion:
-                                    description: API version of the referent.
-                                    type: string
-                                  fieldPath:
-                                    description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                                    type: string
-                                  kind:
-                                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                  name:
-                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                  namespace:
-                                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                    type: string
-                                  resourceVersion:
-                                    description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                    type: string
-                                  uid:
-                                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                    type: string
-                                type: object
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of pods that is unavailable during the upgrade. We will mark the batch as ready as long as there are less or equal number of pods unavailable than this number. default = 0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade in this batch it can be an absolute number (ex: 5) or a percentage of total pods we will ignore the percentage of the last batch to just fill the gap it is mutually exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
               workflow:
                 description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
                 properties:
@@ -1311,82 +1007,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app that we need to upgrade from. We will restart the rollout if this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True, False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that uniquely represent the last pod template each workload type could use different ways to identify that so we cannot compare between resources We update this field only after a successful rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of the app that we upgraded to We will restart the rollout if this is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources. This is determined once the initial spec verification and does not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely represent the new pod template each workload type could use different ways to identify that so we cannot compare between resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:

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

@@ -32,21 +32,30 @@ spec:
         	kind:       "Ingress"
         	metadata: {
         		name: context.name
-        		annotations: "kubernetes.io/ingress.class": parameter.class
+        		annotations: {
+        			if !parameter.classInSpec {
+        				"kubernetes.io/ingress.class": parameter.class
+        			}
+        		}
+        	}
+        	spec: {
+        		if parameter.classInSpec {
+        			ingressClassName: parameter.class
+        		}
+        		rules: [{
+        			host: parameter.domain
+        			http: paths: [
+        				for k, v in parameter.http {
+        					path:     k
+        					pathType: "ImplementationSpecific"
+        					backend: service: {
+        						name: context.name
+        						port: number: v
+        					}
+        				},
+        			]
+        		}]
         	}
-        	spec: rules: [{
-        		host: parameter.domain
-        		http: paths: [
-        			for k, v in parameter.http {
-        				path:     k
-        				pathType: "ImplementationSpecific"
-        				backend: service: {
-        					name: context.name
-        					port: number: v
-        				}
-        			},
-        		]
-        	}]
         }
         parameter: {
         	// +usage=Specify the domain you want to expose
@@ -57,6 +66,9 @@ spec:
 
         	// +usage=Specify the class of ingress to use
         	class: *"nginx" | string
+
+        	// +usage=Set ingress class in '.spec.ingressClassName' instead of 'kubernetes.io/ingress.class' annotation.
+        	classInSpec: *false | bool
         }
   status:
     customStatus: |-

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

@@ -17,9 +17,39 @@ spec:
         )
 
         parameter: {
+        	lark?: {
+        		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
+        		// +useage=Specify the message that you want to sent
+        		message: {
+        			// +usage=msg_type can be text, post, image, interactive, share_chat, share_user, audio, media, file, sticker
+        			msg_type: string
+        			// +usage=content should be json encode string
+        			content: string
+        		}
+        	}
+
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
-        		url: value | secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
         		// +useage=Specify the message that you want to sent
         		message: {
         			text?: *null | {
@@ -66,7 +96,16 @@ spec:
 
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: value | secretRef
+        		url: {
+        			value: string
+        		} | {
+        			secretRef: {
+        				// +usage=name is the name of the secret
+        				name: string
+        				// +usage=key is the key in the secret
+        				key: string
+        			}
+        		}
         		// +useage=Specify the message that you want to sent
         		message: {
         			text:         string
@@ -88,7 +127,16 @@ spec:
         			// +usage=The alias is the email alias to show after sending the email
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
-        			password: value | secretRef
+        			password: {
+        				value: string
+        			} | {
+        				secretRef: {
+        					// +usage=name is the name of the secret
+        					name: string
+        					// +usage=key is the key in the secret
+        					key: string
+        				}
+        			}
         			// +usage=Specify the host of your email
         			host: string
         			// +usage=Specify the port of the email host, default to 587
@@ -150,13 +198,6 @@ spec:
         	description?: textType
         	url?:         string
         }
-        secretRef: {
-        	// +usage=name is the name of the secret
-        	name: string
-        	// +usage=key is the key in the secret
-        	key: string
-        }
-        value: string
         // send webhook notification
         ding: op.#Steps & {
         	if parameter.dingding != _|_ {
@@ -187,6 +228,35 @@ spec:
         		}
         	}
         }
+        lark: op.#Steps & {
+        	if parameter.lark != _|_ {
+        		if parameter.lark.url.value != _|_ {
+        			lark1: op.#Lark & {
+        				message: parameter.lark.message
+        				larkUrl: parameter.lark.url.value
+        			}
+        		}
+        		if parameter.lark.url.secretRef != _|_ && parameter.lark.url.value == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					apiVersion: "v1"
+        					kind:       "Secret"
+        					metadata: {
+        						name:      parameter.lark.url.secretRef.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			lark2:       op.#Lark & {
+        				message: parameter.lark.message
+        				larkUrl: stringValue.str
+        			}
+        		}
+        	}
+        }
         slack: op.#Steps & {
         	if parameter.slack != _|_ {
         		if parameter.slack.url.value != _|_ {

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

@@ -109,10 +109,10 @@ spec:
         }
         parameter: {
         	// +usage=Specify the labels in the workload
-        	labels?: {...}
+        	labels?: [string]: string
 
         	// +usage=Specify the annotations in the workload
-        	annotations?: {...}
+        	annotations?: [string]: string
 
         	// +usage=Specify number of tasks to run in parallel
         	// +short=c

charts/vela-minimal/templates/defwithtemplate/webhook.yaml

@@ -68,14 +68,18 @@ spec:
         		} @step(8)
         	}
         }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
         parameter: {
         	// +usage=Specify the webhook url
-        	url: value | secretRef
+        	url: {
+        		value: string
+        	} | {
+        		secretRef: {
+        			// +usage=name is the name of the secret
+        			name: string
+        			// +usage=key is the key in the secret
+        			key: string
+        		}
+        	}
         	// +usage=Specify the data you want to send
         	data?: {...}
         }

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

@@ -11,6 +11,10 @@ spec:
   schematic:
     cue:
       template: |
+        import (
+        	"strconv"
+        )
+
         mountsArray: {
         	pvc: *[
         		for v in parameter.volumeMounts.pvc {
@@ -152,6 +156,12 @@ spec:
         							{
         								containerPort: v.port
         								protocol:      v.protocol
+        								if v.name != _|_ {
+        									name: v.name
+        								}
+        								if v.name == _|_ {
+        									name: "port-" + strconv.FormatInt(v.port, 10)
+        								}
         							}}]
         					}
 
@@ -262,6 +272,12 @@ spec:
         	for v in parameter.ports if v.expose == true {
         		port:       v.port
         		targetPort: v.port
+        		if v.name != _|_ {
+        			name: v.name
+        		}
+        		if v.name == _|_ {
+        			name: "port-" + strconv.FormatInt(v.port, 10)
+        		}
         	},
         ]
         outputs: {
@@ -280,10 +296,10 @@ spec:
         }
         parameter: {
         	// +usage=Specify the labels in the workload
-        	labels?: {...}
+        	labels?: [string]: string
 
         	// +usage=Specify the annotations in the workload
-        	annotations?: {...}
+        	annotations?: [string]: string
 
         	// +usage=Which image would you like to use for your service
         	// +short=i
@@ -304,6 +320,8 @@ spec:
         	ports?: [...{
         		// +usage=Number of port to expose on the pod's IP address
         		port: int
+        		// +usage=Name of the port
+        		name?: string
         		// +usage=Protocol for port. Must be UDP, TCP, or SCTP
         		protocol: *"TCP" | "UDP" | "SCTP"
         		// +usage=Specify if the port should be exposed
@@ -494,7 +512,7 @@ spec:
       		replica:  strconv.FormatInt(context.output.status.readyReplicas, 10)
       	}
       }
-      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
+      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
     healthPolicy: |-
       ready: {
       	if context.output.status.readyReplicas == _|_ {
@@ -504,7 +522,7 @@ spec:
       		replica:  context.output.status.readyReplicas
       	}
       }
-      isHealth: context.output.status.replicas == context.output.status.readyReplicas
+      isHealth: context.output.spec.replicas == ready.replica
   workload:
     definition:
       apiVersion: apps/v1

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

@@ -405,7 +405,7 @@ spec:
       		replica:  strconv.FormatInt(context.output.status.readyReplicas, 10)
       	}
       }
-      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
+      message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
     healthPolicy: |-
       ready: {
       	if context.output.status.readyReplicas == _|_ {
@@ -415,7 +415,7 @@ spec:
       		replica:  context.output.status.readyReplicas
       	}
       }
-      isHealth: context.output.status.replicas == context.output.status.readyReplicas
+      isHealth: context.output.spec.replicas == ready.replica
   workload:
     definition:
       apiVersion: apps/v1

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

@@ -92,6 +92,10 @@ spec:
     metadata:
       labels:
     {{- include "kubevela.selectorLabels" . | nindent 8 }}
+      annotations:
+          prometheus.io/path: /metrics
+          prometheus.io/port: "8080"
+          prometheus.io/scrape: "true"
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

cmd/core/main.go

@@ -30,13 +30,12 @@ import (
 	"strings"
 	"time"
 
-	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
+	ctrlClient "github.com/oam-dev/kubevela/pkg/client"
 	standardcontroller "github.com/oam-dev/kubevela/pkg/controller"
 	commonconfig "github.com/oam-dev/kubevela/pkg/controller/common"
 	oamcontroller "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev"
@@ -74,7 +73,6 @@ func main() {
 	var healthAddr string
 	var disableCaps string
 	var storageDriver string
-	var syncPeriod time.Duration
 	var applyOnceOnly string
 	var qps float64
 	var burst int
@@ -110,8 +108,8 @@ func main() {
 		"For the purpose of some production environment that workload or trait should not be affected if no spec change, available options: on, off, force.")
 	flag.StringVar(&disableCaps, "disable-caps", "", "To be disabled builtin capability list.")
 	flag.StringVar(&storageDriver, "storage-driver", "Local", "Application file save to the storage driver")
-	flag.DurationVar(&syncPeriod, "informer-re-sync-interval", 60*time.Minute,
-		"controller shared informer lister full re-sync period")
+	flag.DurationVar(&commonconfig.ApplicationReSyncPeriod, "application-re-sync-period", 5*time.Minute,
+		"Re-sync period for application to re-sync, also known as the state-keep interval.")
 	flag.DurationVar(&commonconfig.ReconcileTimeout, "reconcile-timeout", time.Minute*3,
 		"the timeout for controller reconcile")
 	flag.StringVar(&oam.SystemDefinitonNamespace, "system-definition-namespace", "vela-system", "define the namespace of the system-level definition")
@@ -131,6 +129,8 @@ func main() {
 	flag.DurationVar(&retryPeriod, "leader-election-retry-period", 2*time.Second,
 		"The duration the LeaderElector clients should wait between tries of actions")
 	flag.BoolVar(&enableClusterGateway, "enable-cluster-gateway", false, "Enable cluster-gateway to use multicluster, disabled by default.")
+	flag.BoolVar(&controllerArgs.EnableCompatibility, "enable-asi-compatibility", false, "enable compatibility for asi")
+	standardcontroller.AddOptimizeFlags()
 
 	flag.Parse()
 	// setup logging
@@ -205,12 +205,16 @@ func main() {
 		Port:                       webhookPort,
 		CertDir:                    certDir,
 		HealthProbeBindAddress:     healthAddr,
-		SyncPeriod:                 &syncPeriod,
 		LeaderElectionResourceLock: leaderElectionResourceLock,
 		LeaseDuration:              &leaseDuration,
 		RenewDeadline:              &renewDeadline,
 		RetryPeriod:                &retryPeriod,
-		ClientDisableCacheFor:      []client.Object{&appsv1.ControllerRevision{}},
+		// SyncPeriod is configured with default value, aka. 10h. First, controller-runtime does not
+		// recommend use it as a time trigger, instead, it is expected to work for failure tolerance
+		// of controller-runtime. Additionally, set this value will affect not only application
+		// controller but also all other controllers like definition controller. Therefore, for
+		// functionalities like state-keep, they should be invented in other ways.
+		NewClient: ctrlClient.DefaultNewControllerClient,
 	})
 	if err != nil {
 		klog.ErrorS(err, "Unable to create a controller manager")

cmd/plugin/main.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/oam-dev/kubevela/pkg/plugin/cli"
+	"github.com/oam-dev/kubevela/references/cli"
 )
 
 func main() {

contribute/developer-guide.md

@@ -9,6 +9,7 @@ This guide helps you get started developing KubeVela.
 3. ginkgo 1.14.0+ (just for [E2E test](./developer-guide.md#e2e-test))
 4. golangci-lint 1.38.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.
 5. kubebuilder v3.1.0+ and you need to manually install the dependency tools for unit test.
+6. [CUE binary](https://github.com/cue-lang/cue/releases) v0.3.0+
 
 <details>
   <summary>Install Kubebuilder manually</summary>
@@ -135,27 +136,52 @@ Start to test.
 make e2e-test
 ```
 
+## Contribute apiserver and [velaux](https://github.com/oam-dev/velaux)
+
+Before start, please make sure you have already started the vela controller environment.
+
+```shell
+make run-apiserver
+```
+
+By default, the apiserver will serving at "0.0.0.0:8000".
+
+Get the velaux code by:
+
+```shell
+git clone git@github.com:oam-dev/velaux.git
+```
+
+Configure the apiserver address:
+
+```shell
+cd velaux
+echo "BASE_DOMAIN='http://127.0.0.1:8000'" > .env
+```
+
+Make sure you have installed [yarn](https://classic.yarnpkg.com/en/docs/install).
+
+```shell
+yarn install
+yarn start
+```
+
 To execute the e2e test of the API module, the mongodb service needs to exist locally.
 
 ```shell script
+# save your config
+mv ~/.kube/config  ~/.kube/config.save
+
+kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4 --name worker
+kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
+kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
+
+# restore your config
+mv ~/.kube/config.save  ~/.kube/config
+
 make e2e-apiserver-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
-```
 
 ## Next steps
 

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

@@ -21,7 +21,7 @@
 |       apply-once-only       | string |               false               | For the purpose of some production environment that workload or trait should not be affected if no spec change, available options: on, off, force. |
 |        disable-caps         | string |                ""                 |           To be disabled builtin capability list.            |
 |       storage-driver        | string |               Local               |         Application file save to the storage driver          |
-|  informer-re-sync-interval  |  time  |                1h                 | Controller shared informer lister full re-sync period, the interval between two routinely reconciles for one CR (like Application) if no changes made to it. |
+| application-re-sync-period  |  time  |                5m                 | Re-sync period for application to re-sync, also known as the state-keep interval. |
 |      reconcile-timeout      |  time  |                3m                 |           The timeout for controller reconcile.              |
 | system-definition-namespace | string |            vela-system            |     define the namespace of the system-level definition      |
 |    concurrent-reconciles    |  int   |                 4                 | The concurrent reconcile number of the controller. You can increase the degree of concurrency if a large number of CPU cores are provided to the controller. |

docs/examples/core-definitions/component/webservice.yaml

@@ -14,8 +14,12 @@ spec:
         ports:
           - port: 8000
           - port: 8001
+            name: exposeport1
             protocol: UDP
-            expose: true 
+            expose: true
+          - port: 8002
+            protocol: UDP
+            expose: true
         volumeMounts:
           pvc:
             - name: my-mount

docs/examples/envbinding/envpatch-with-wild-match.yaml

@@ -0,0 +1,74 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: example-app
+  namespace: default
+spec:
+  components:
+    - name: podinfo
+      type: webservice
+      properties:
+        image: stefanprodan/podinfo
+      traits:
+        - type: scaler
+          properties:
+            replicas: 1
+    - name: hello-world
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+      traits:
+        - type: scaler
+          properties:
+            replicas: 1
+    - name: nginx
+      type: worker
+      properties:
+        image: nginx
+      traits:
+        - type: scaler
+          properties:
+            replicas: 1
+  policies:
+    - name: example-multi-env-policy
+      type: env-binding
+      properties:
+        envs:
+          - name: test
+            placement:
+              clusterSelector:
+                name: local
+              namespaceSelector:
+                name: test
+            patch:
+              components:
+                - name: podinfo # patch to component named podinfo, no type check
+                  traits:
+                    - type: scaler
+                      properties:
+                        replicas: 2
+
+          - name: staging
+            placement:
+              clusterSelector:
+                name: remote
+            patch:
+              components: # patch to all webservice components
+                - type: webservice
+                  traits:
+                    - type: scaler
+                      properties:
+                        replicas: 3
+
+          - name: prod
+            placement:
+              clusterSelector:
+                name: remote
+              namespaceSelector:
+                name: prod
+            patch:
+              components: # patch to all components
+                - traits:
+                    - type: scaler
+                      properties:
+                        replicas: 3

docs/examples/terraform/cloud-resource-provision-and-consume/application-aws-s3.yaml

@@ -0,0 +1,14 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-aws-s3
+spec:
+  components:
+    - name: sample-s3
+      type: aws-s3
+      properties:
+        bucket: vela-website-202110191745
+        acl: private
+
+        writeConnectionSecretToRef:
+          name: s3-conn

docs/examples/workflow/notification/app.yaml

@@ -29,6 +29,12 @@ spec:
               msgtype: text
               text:
                 content: Hello KubeVela
+          lark:
+            url:
+              value: <lark-url>
+            message:
+              msg_type: "text"
+              content: "{\"text\":\" Hello KubeVela\"}"
           slack:
             url:
               # use url in secret

docs/examples/workflow/source-to-image/step-definition.yaml

@@ -10,46 +10,69 @@ spec:
         import ("vela/op")
 
         parameter: {
-           repoUrl: string
-           dockerfile: string
-           image: string
+          // +usage=Specify the SSH URL of git repository for your source codes, e.g. git@git.woa.com:my-git-repo/demo.git
+          repoUrl: string
+
+          // +usage=Specify the branch which you want to be checked out and built
+          branch: string
+
+          // +usage=Specify the filename of Dockerfile under the root folder in your git repository
+          dockerfile: string
+
+          // +usage=Specify the secret name for the docker repository in your namespace in your K8S cluster
+          dockerSecret: string
+
+          // +usage=Specify the address where the image built is pushed into
+          image: string
         }
 
-        let pushImage=image
-
         build: op.#Task & {
-                name:      "\(context.name)-\(context.stepId)"
-                namespace: context.namespace
+          name:      "\(context.name)-build-\(context.stepSessionID)"
+          namespace: context.namespace
 
-                // Declare workspaces that used to share data.
-                workspace: {
-                        "code-dir": {}
-                }
+          toolImage: "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/entrypoint:v0.27.2"
+          baseImage: "busybox:1.34"
 
-                steps: [
-                        // git clone code repo.
-                        {
-                                name:  "git-clone"
-                                image: "git-image-with-pull-ssh"
-                                workspaceMounts: [{workspace: workspace["code-dir"], mountPath: "/data/code"}]
-                                script: """
-                #! /bin/bash
-                git clone \(repourl) /data/code
-                """
-                        },
-                        // build and push image.
-                        {
-                                name:  "build-image"
-                                image: "gcr.io/kaniko-project/executor:v1.3.0"
-                                workspaceMounts: [{workspace: workspace["code-dir"], mountPath: "/data/build"}]
-                                script: """
-                #! /bin/bash
-                /kaniko/executor --dockerfile=/data/build/\(dockerfile) --context=/data/build --destination=\(pushImage)
-                """
-                        }]
+          // Declare workspaces that used to share data.
+          workspaces: {
+            "code-dir": {}
+          }
+
+          secrets: {
+            "\(parameter.dockerSecret)": {
+              items: [{
+                  key: ".dockerconfigjson"
+                  path: "config.json"
+              }]
+            }
+          }
+
+          steps: [
+            // git clone code repo.
+            {
+              name:  "git-clone"
+              image: "bitnami/git:2.34.1"
+              workspaceMounts: [{workspace: workspaces["code-dir"], mountPath: "/data/code"}]
+              script: """
+              #!/bin/bash
+              git clone -b \(parameter.branch)  \(parameter.repoUrl) /data/code
+              """
+            },
+            // build and push image.
+            {
+              name:  "build-image"
+              image: "gcr.io/kaniko-project/executor:debug"
+              workspaceMounts: [{workspace: workspaces["code-dir"], mountPath: "/data/build"}]
+              secretMounts: [{secret: secrets["\(parameter.dockerSecret)"], mountPath: "/kaniko/.docker/"}]
+              script: """
+              #!/busybox/sh
+              /kaniko/executor --dockerfile=/data/build/\(parameter.dockerfile) --context=/data/build --destination=\(parameter.image)
+              """
+            }]
         }
 
         // wait until deployment ready
         wait: op.#ConditionalWait & {
-           continue: build.do.status.phase == "successed"
+          continue: build.apply.value.status.phase == "Succeeded"
         }
+

e2e/addon/addon_test.go

@@ -47,7 +47,13 @@ var _ = Describe("Addon Test", func() {
 		It("Enable addon test-addon", func() {
 			output, err := e2e.Exec("vela addon enable test-addon")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Successfully enable addon"))
+			Expect(output).To(ContainSubstring("enabled Successfully."))
+		})
+
+		It("Upgrade addon test-addon", func() {
+			output, err := e2e.Exec("vela addon upgrade test-addon")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("enabled Successfully."))
 		})
 
 		It("Disable addon test-addon", func() {
@@ -62,7 +68,7 @@ var _ = Describe("Addon Test", func() {
 		It("Enable addon with input", func() {
 			output, err := e2e.LongTimeExec("vela addon enable test-addon example=redis", 300*time.Second)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Successfully enable addon"))
+			Expect(output).To(ContainSubstring("enabled Successfully."))
 		})
 
 		It("Disable addon test-addon", func() {
@@ -90,12 +96,12 @@ var _ = Describe("Addon Test", func() {
 		})
 
 		It("Add test addon registry", func() {
-			output, err := e2e.LongTimeExec("vela addon registry add my-repo --type=git --gitUrl=https://github.com/oam-dev/catalog --path=/experimental/addons", 600*time.Second)
+			output, err := e2e.LongTimeExec("vela addon registry add my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/experimental/addons", 600*time.Second)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).To(ContainSubstring("Successfully add an addon registry my-repo"))
 
 			Eventually(func() error {
-				output, err := e2e.LongTimeExec("vela addon registry update my-repo --type=git --gitUrl=https://github.com/oam-dev/catalog --path=/addons", 300*time.Second)
+				output, err := e2e.LongTimeExec("vela addon registry update my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/addons", 300*time.Second)
 				if err != nil {
 					return err
 				}

e2e/application/application_test.go

@@ -46,9 +46,9 @@ var (
 
 var _ = ginkgo.Describe("Test Vela Application", func() {
 	e2e.JsonAppFileContext("json appfile apply", jsonAppFile)
-	e2e.EnvSetContext("env set", "default")
+	e2e.EnvSetContext("env set default", "default")
 	e2e.DeleteEnvFunc("env delete", envName)
-	e2e.EnvInitContext("env init", envName)
+	e2e.EnvInitContext("env init env-application", envName)
 	e2e.EnvSetContext("env set", envName)
 	e2e.JsonAppFileContext("deploy app-basic", appbasicJsonAppFile)
 	ApplicationExecContext("exec -- COMMAND", applicationName)
@@ -185,7 +185,7 @@ var ApplicationDeleteWithWaitOptions = func(context string, appName string) bool
 			cli := fmt.Sprintf("vela delete %s --wait", appName)
 			output, err := e2e.ExecAndTerminate(cli)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(output).To(gomega.ContainSubstring("deleted from namespace"))
+			gomega.Expect(output).To(gomega.ContainSubstring("deleted"))
 		})
 	})
 }
@@ -225,7 +225,7 @@ var ApplicationDeleteWithForceOptions = func(context string, appName string) boo
 			cli = fmt.Sprintf("vela delete %s --force", appName)
 			output, err = e2e.ExecAndTerminate(cli)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(output).To(gomega.ContainSubstring("deleted from namespace"))
+			gomega.Expect(output).To(gomega.ContainSubstring("deleted"))
 		})
 	})
 }

e2e/application/vela.yaml

@@ -2,11 +2,9 @@ createTime: "0001-01-01T00:00:00Z"
 name: initmyapp
 services:
   mysvc:
-    addRevisionLabel: false
     cpu: "0.5"
     image: nginx:latest
     imagePullPolicy: Always
     memory: 200M
-    port: 80
     type: webservice
 updateTime: "0001-01-01T00:00:00Z"

e2e/commonContext.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/Netflix/go-expect"
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 )
@@ -31,9 +32,29 @@ var (
 		return ginkgo.Context(context, func() {
 			ginkgo.It("should print environment initiation successful message", func() {
 				cli := fmt.Sprintf("vela env init %s", envName)
-				output, err := Exec(cli)
+				var answer = "default"
+				if envName != "env-application" {
+					answer = "vela-system"
+				}
+				output, err := InteractiveExec(cli, func(c *expect.Console) {
+					data := []struct {
+						q, a string
+					}{
+						{
+							q: "Would you like to choose an existing namespaces as your env?",
+							a: answer,
+						},
+					}
+					for _, qa := range data {
+						_, err := c.ExpectString(qa.q)
+						gomega.Expect(err).NotTo(gomega.HaveOccurred())
+						_, err = c.SendLine(qa.a)
+						gomega.Expect(err).NotTo(gomega.HaveOccurred())
+					}
+					c.ExpectEOF()
+				})
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				expectedOutput := fmt.Sprintf("environment %s created", envName)
+				expectedOutput := fmt.Sprintf("environment %s with namespace %s created", envName, answer)
 				gomega.Expect(output).To(gomega.ContainSubstring(expectedOutput))
 			})
 		})
@@ -45,7 +66,7 @@ var (
 				cli := fmt.Sprintf("vela env init %s --namespace %s", envName, namespace)
 				output, err := Exec(cli)
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				expectedOutput := fmt.Sprintf("environment %s created", envName)
+				expectedOutput := fmt.Sprintf("environment %s with namespace %s created", envName, namespace)
 				gomega.Expect(output).To(gomega.ContainSubstring(expectedOutput))
 			})
 		})
@@ -92,8 +113,7 @@ var (
 				cli := fmt.Sprintf("vela env sw %s", envName)
 				output, err := Exec(cli)
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				expectedOutput := fmt.Sprintf("Set environment succeed, current environment is %s", envName)
-				gomega.Expect(output).To(gomega.ContainSubstring(expectedOutput))
+				gomega.Expect(output).To(gomega.ContainSubstring(envName))
 			})
 		})
 	}
@@ -109,17 +129,6 @@ var (
 			})
 		})
 	}
-	EnvDeleteCurrentUsingContext = func(context string, envName string) bool {
-		return ginkgo.Context(context, func() {
-			ginkgo.It("should delete all envs", func() {
-				cli := fmt.Sprintf("vela env delete %s", envName)
-				output, err := Exec(cli)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				expectedOutput := fmt.Sprintf("Error: you can't delete current using environment %s", envName)
-				gomega.Expect(output).To(gomega.ContainSubstring(expectedOutput))
-			})
-		})
-	}
 
 	WorkloadDeleteContext = func(context string, applicationName string) bool {
 		return ginkgo.Context(context, func() {

e2e/env/env_test.go

@@ -29,8 +29,8 @@ var (
 )
 
 var _ = ginkgo.Describe("Env", func() {
-	e2e.EnvInitContext("env init", envName)
-	e2e.EnvInitContext("env init another one", envName2)
+	e2e.EnvInitWithNamespaceOptionContext("env init env-hello --namespace heelo", envName, "heelo")
+	e2e.EnvInitWithNamespaceOptionContext("env init another one --namespace heelo2", envName2, "heelo2")
 	e2e.EnvShowContext("env show", envName)
 	e2e.EnvSetContext("env set", envName)
 
@@ -46,5 +46,4 @@ var _ = ginkgo.Describe("Env", func() {
 	})
 
 	e2e.EnvDeleteContext("env delete", envName2)
-	e2e.EnvDeleteCurrentUsingContext("env delete currently using one", envName)
 })

e2e/plugin/plugin_test.go

@@ -119,25 +119,25 @@ var _ = Describe("Test Kubectl Plugin", func() {
 	Context("Test kubectl vela show", func() {
 		It("Test show componentDefinition reference", func() {
 			cdName := "test-show-task"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", cdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", cdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring(showCdResult))
 		})
 		It("Test show traitDefinition reference", func() {
 			tdName := "test-sidecar"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", tdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", tdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring(showTdResult))
 		})
 		It("Test show componentDefinition use Helm Charts as Workload", func() {
 			cdName := "test-webapp-chart"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", cdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", cdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring("Properties"))
 		})
 		It("Test show componentDefinition def with raw Kube mode", func() {
 			cdName := "kube-worker"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", cdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", cdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring("image"))
 			Expect(output).Should(ContainSubstring("The value will be applied to fields: [spec.template.spec.containers[0].image]."))
@@ -146,26 +146,26 @@ var _ = Describe("Test Kubectl Plugin", func() {
 		})
 		It("Test show traitDefinition def with raw Kube mode", func() {
 			tdName := "service-kube"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", tdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", tdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring("targetPort"))
 			Expect(output).Should(ContainSubstring("target port num for service provider."))
 		})
 		It("Test show traitDefinition def with cue single map parameter", func() {
 			tdName := "annotations"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", tdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", tdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).Should(ContainSubstring("map[string]string"))
 		})
 		It("Test show webservice def with cue ignore annotation ", func() {
 			tdName := "webservice"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", tdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", tdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).ShouldNot(ContainSubstring("addRevisionLabel"))
 		})
 		It("Test show webservice def with cue ignore annotation ", func() {
 			tdName := "mywebservice"
-			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s", tdName))
+			output, err := e2e.Exec(fmt.Sprintf("kubectl-vela show %s -n default", tdName))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).ShouldNot(ContainSubstring("addRevisionLabel"))
 			Expect(output).ShouldNot(ContainSubstring("mySecretKey"))

go.mod

@@ -70,7 +70,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	gotest.tools v2.2.0+incompatible
 	helm.sh/helm/v3 v3.6.1
-	istio.io/api v0.0.0-20210128181506-0c4b8e54850f
 	istio.io/client-go v0.0.0-20210128182905-ee2edd059e02
 	k8s.io/api v0.22.1
 	k8s.io/apiextensions-apiserver v0.22.1

hack/docgen/REDAME.md

@@ -0,0 +1,31 @@
+# KubeVela.io CLI Reference Doc
+
+1. step up these two projects in the same folder.
+
+```shell
+$ tree -L 1
+.
+├── kubevela
+└── kubevela.io
+```
+
+2. Run generate command in kubevela root dir.
+
+```shell
+cd kubevela/
+go run ./hack/docgen/gen.go
+```
+
+3. Update more docs such as i18n zh
+
+```shell
+$ go run ./hack/docgen/gen.go ../kubevela.io/i18n/zh/docusaurus-plugin-content-docs/current/cli
+scanning rootPath of CLI docs for replace:  ../kubevela.io/i18n/zh/docusaurus-plugin-content-docs/current/cli
+```
+
+4. Then you can check the difference in kubevela.io.
+
+```shell
+cd ../kubevela.io
+git status
+```

hack/docgen/gen.go

@@ -17,16 +17,156 @@ limitations under the License.
 package main
 
 import (
+	"fmt"
+	"io"
+	"io/fs"
+	"io/ioutil"
 	"log"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
 
+	"github.com/spf13/cobra"
+
+	"github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/references/cli"
 
 	"github.com/spf13/cobra/doc"
 )
 
+// PrintCLIByTag print custom defined index
+func PrintCLIByTag(cmd *cobra.Command, all []*cobra.Command, tag string) string {
+	var result string
+	pl := cli.PrintList{}
+	for _, c := range all {
+		if !c.IsAvailableCommand() || c.IsAdditionalHelpTopicCommand() {
+			continue
+		}
+		if val, ok := c.Annotations[types.TagCommandType]; !ok || val != tag {
+			continue
+		}
+		cname := cmd.Name() + " " + c.Name()
+		link := cname
+		link = strings.Replace(link, " ", "_", -1)
+		pl = append(pl, cli.Printable{Order: c.Annotations[types.TagCommandOrder], Long: fmt.Sprintf("* [%s](%s)\t - %s\n", cname, link, c.Long)})
+
+	}
+
+	sort.Sort(pl)
+
+	for _, v := range pl {
+		result += v.Long
+	}
+	result += "\n"
+	return result
+}
+
+// GenMarkdownTreeForIndex will generate the markdown doc for vela index
+func GenMarkdownTreeForIndex(cmd *cobra.Command, dir string) error {
+	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".md"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if _, err = io.WriteString(f, "---\ntitle: CLI Commands\n---\n\n\n"); err != nil {
+		return err
+	}
+	for _, tp := range []string{types.TypeStart, types.TypeApp, types.TypeCD, types.TypeExtension, types.TypeSystem} {
+		// write header of type
+		_, err = io.WriteString(f, "## "+tp+"\n\n")
+		if err != nil {
+			return err
+		}
+		str := PrintCLIByTag(cmd, cmd.Commands(), tp)
+		// write header of type
+		_, err = io.WriteString(f, str)
+		if err != nil {
+			return err
+		}
+	}
+	_, err = io.WriteString(f, "###### Auto generated by [script in KubeVela](https://github.com/oam-dev/kubevela/tree/master/hack/docgen).")
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func main() {
+
+	rootPath := "../kubevela.io/docs/cli/"
+	if len(os.Args) > 1 {
+		rootPath = os.Args[1]
+	}
+	fmt.Println("scanning rootPath of CLI docs for replace: ", rootPath)
 	vela := cli.NewCommand()
-	err := doc.GenMarkdownTree(vela, "./docs/en/cli/")
+	err := doc.GenMarkdownTree(vela, rootPath)
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = GenMarkdownTreeForIndex(vela, rootPath)
+	if err != nil {
+		log.Fatal("generate docs for vela index fail", err)
+	}
+	err = filepath.Walk(rootPath, func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		lines := strings.Split(string(data), "\n")
+		if len(lines) < 1 {
+			return nil
+		}
+
+		// check first line to make sure it's autogenerated docs
+		firstL := lines[0]
+		if !strings.HasPrefix(firstL, "## vela") {
+			return nil
+		}
+
+		// find the last line and add some link.
+		var lastIdx int
+		for idx := len(lines) - 1; idx >= 0; idx-- {
+			if strings.Contains(lines[idx], "Auto generated") {
+				lastIdx = idx
+				break
+			}
+		}
+		if lastIdx == 0 {
+			return nil
+		}
+		lastL := lines[lastIdx]
+		lines[lastIdx] = "#### Go Back to [CLI Commands](vela) Homepage.\n\n\n" + lastL + ", refer to [script in KubeVela](https://github.com/oam-dev/kubevela/tree/master/hack/docgen)."
+
+		// update the title format
+		title := strings.TrimPrefix(firstL, "## ")
+
+		lines[0] = "---"
+		newlines := []string{"---", "title: " + title}
+
+		for idx, line := range lines {
+			if strings.Contains(line, "[vela](vela.md)") {
+				lines[idx] = ""
+				continue
+			}
+			if strings.Contains(line, ".md") && strings.Contains(line, "](") {
+				lines[idx] = strings.Replace(line, ".md", "", -1)
+			}
+		}
+
+		newlines = append(newlines, lines...)
+		newcontent := strings.Join(newlines, "\n")
+		return ioutil.WriteFile(path, []byte(newcontent), info.Mode())
+	})
 	if err != nil {
 		log.Fatal(err)
 	}

hack/references/generate.go

@@ -21,13 +21,28 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/oam-dev/kubevela/apis/types"
+	"github.com/oam-dev/kubevela/pkg/utils/common"
 	"github.com/oam-dev/kubevela/references/plugins"
 )
 
 func main() {
 	ref := &plugins.MarkdownReference{}
 	ctx := context.Background()
-	if err := ref.GenerateReferenceDocs(ctx, plugins.BaseRefPath); err != nil {
+	path := plugins.BaseRefPath
+
+	if len(os.Args) == 2 {
+		ref.DefinitionName = os.Args[1]
+		path = plugins.KubeVelaIOTerraformPath
+	}
+
+	c, err := common.InitBaseRestConfig()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	if err := ref.GenerateReferenceDocs(ctx, c, path, types.DefaultKubeVelaNS); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}

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

@@ -677,113 +677,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services
@@ -2324,324 +2217,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      rolloutPlan:
-                        description: RolloutPlan is the details on how to rollout
-                          the resources The controller simply replace the old resources
-                          with the new one if there is no rollout plan involved
-                        properties:
-                          batchPartition:
-                            description: All pods in the batches up to the batchPartition
-                              (included) will have the target resource specification
-                              while the rest still have the source resource This is
-                              designed for the operators to manually rollout Default
-                              is the the number of batches which will rollout all
-                              the batches
-                            format: int32
-                            type: integer
-                          canaryMetric:
-                            description: CanaryMetric provides a way for the rollout
-                              process to automatically check certain metrics before
-                              complete the process
-                            items:
-                              description: CanaryMetric holds the reference to metrics
-                                used for canary analysis
-                              properties:
-                                interval:
-                                  description: Interval represents the windows size
-                                  type: string
-                                metricsRange:
-                                  description: Range value accepted for this metric
-                                  properties:
-                                    max:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Maximum value
-                                      x-kubernetes-int-or-string: true
-                                    min:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      description: Minimum value
-                                      x-kubernetes-int-or-string: true
-                                  type: object
-                                name:
-                                  description: Name of the metric
-                                  type: string
-                                templateRef:
-                                  description: TemplateRef references a metric template
-                                    object
-                                  properties:
-                                    apiVersion:
-                                      description: API version of the referent.
-                                      type: string
-                                    fieldPath:
-                                      description: 'If referring to a piece of an
-                                        object instead of an entire object, this string
-                                        should contain a valid JSON/Go field access
-                                        statement, such as desiredState.manifest.containers[2].
-                                        For example, if the object reference is to
-                                        a container within a pod, this would take
-                                        on a value like: "spec.containers{name}" (where
-                                        "name" refers to the name of the container
-                                        that triggered the event) or if no container
-                                        name is specified "spec.containers[2]" (container
-                                        with index 2 in this pod). This syntax is
-                                        chosen only to have some well-defined way
-                                        of referencing a part of an object. TODO:
-                                        this design is not final and this field is
-                                        subject to change in the future.'
-                                      type: string
-                                    kind:
-                                      description: 'Kind of the referent. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                      type: string
-                                    name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                      type: string
-                                    namespace:
-                                      description: 'Namespace of the referent. More
-                                        info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                      type: string
-                                    resourceVersion:
-                                      description: 'Specific resourceVersion to which
-                                        this reference is made, if any. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                      type: string
-                                    uid:
-                                      description: 'UID of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                      type: string
-                                  type: object
-                              required:
-                              - name
-                              type: object
-                            type: array
-                          numBatches:
-                            description: The number of batches, default = 1
-                            format: int32
-                            type: integer
-                          paused:
-                            description: Paused the rollout, default is false
-                            type: boolean
-                          rolloutBatches:
-                            description: The exact distribution among batches. its
-                              size has to be exactly the same as the NumBatches (if
-                              set) The total number cannot exceed the targetSize or
-                              the size of the source resource We will IGNORE the last
-                              batch's replica field if it's a percentage since round
-                              errors can lead to inaccurate sum We highly recommend
-                              to leave the last batch's replica field empty
-                            items:
-                              description: RolloutBatch is used to describe how the
-                                each batch rollout should be
-                              properties:
-                                batchRolloutWebhooks:
-                                  description: RolloutWebhooks provides a way for
-                                    the batch rollout to interact with an external
-                                    process
-                                  items:
-                                    description: RolloutWebhook holds the reference
-                                      to external checks used for canary analysis
-                                    properties:
-                                      expectedStatus:
-                                        description: ExpectedStatus contains all the
-                                          expected http status code that we will accept
-                                          as success
-                                        items:
-                                          type: integer
-                                        type: array
-                                      metadata:
-                                        additionalProperties:
-                                          type: string
-                                        description: Metadata (key-value pairs) for
-                                          this webhook
-                                        type: object
-                                      method:
-                                        description: Method the HTTP call method,
-                                          default is POST
-                                        type: string
-                                      name:
-                                        description: Name of this webhook
-                                        type: string
-                                      type:
-                                        description: Type of this webhook
-                                        type: string
-                                      url:
-                                        description: URL address of this webhook
-                                        type: string
-                                    required:
-                                    - name
-                                    - type
-                                    - url
-                                    type: object
-                                  type: array
-                                canaryMetric:
-                                  description: CanaryMetric provides a way for the
-                                    batch rollout process to automatically check certain
-                                    metrics before moving to the next batch
-                                  items:
-                                    description: CanaryMetric holds the reference
-                                      to metrics used for canary analysis
-                                    properties:
-                                      interval:
-                                        description: Interval represents the windows
-                                          size
-                                        type: string
-                                      metricsRange:
-                                        description: Range value accepted for this
-                                          metric
-                                        properties:
-                                          max:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Maximum value
-                                            x-kubernetes-int-or-string: true
-                                          min:
-                                            anyOf:
-                                            - type: integer
-                                            - type: string
-                                            description: Minimum value
-                                            x-kubernetes-int-or-string: true
-                                        type: object
-                                      name:
-                                        description: Name of the metric
-                                        type: string
-                                      templateRef:
-                                        description: TemplateRef references a metric
-                                          template object
-                                        properties:
-                                          apiVersion:
-                                            description: API version of the referent.
-                                            type: string
-                                          fieldPath:
-                                            description: 'If referring to a piece
-                                              of an object instead of an entire object,
-                                              this string should contain a valid JSON/Go
-                                              field access statement, such as desiredState.manifest.containers[2].
-                                              For example, if the object reference
-                                              is to a container within a pod, this
-                                              would take on a value like: "spec.containers{name}"
-                                              (where "name" refers to the name of
-                                              the container that triggered the event)
-                                              or if no container name is specified
-                                              "spec.containers[2]" (container with
-                                              index 2 in this pod). This syntax is
-                                              chosen only to have some well-defined
-                                              way of referencing a part of an object.
-                                              TODO: this design is not final and this
-                                              field is subject to change in the future.'
-                                            type: string
-                                          kind:
-                                            description: 'Kind of the referent. More
-                                              info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                            type: string
-                                          name:
-                                            description: 'Name of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                            type: string
-                                          namespace:
-                                            description: 'Namespace of the referent.
-                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                            type: string
-                                          resourceVersion:
-                                            description: 'Specific resourceVersion
-                                              to which this reference is made, if
-                                              any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                            type: string
-                                          uid:
-                                            description: 'UID of the referent. More
-                                              info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                            type: string
-                                        type: object
-                                    required:
-                                    - name
-                                    type: object
-                                  type: array
-                                instanceInterval:
-                                  description: The wait time, in seconds, between
-                                    instances upgrades, default = 0
-                                  format: int32
-                                  type: integer
-                                maxUnavailable:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: MaxUnavailable is the max allowed number
-                                    of pods that is unavailable during the upgrade.
-                                    We will mark the batch as ready as long as there
-                                    are less or equal number of pods unavailable than
-                                    this number. default = 0
-                                  x-kubernetes-int-or-string: true
-                                podList:
-                                  description: The list of Pods to get upgraded it
-                                    is mutually exclusive with the Replicas field
-                                  items:
-                                    type: string
-                                  type: array
-                                replicas:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  description: 'Replicas is the number of pods to
-                                    upgrade in this batch it can be an absolute number
-                                    (ex: 5) or a percentage of total pods we will
-                                    ignore the percentage of the last batch to just
-                                    fill the gap it is mutually exclusive with the
-                                    PodList field'
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            type: array
-                          rolloutStrategy:
-                            description: RolloutStrategy defines strategies for the
-                              rollout plan The default is IncreaseFirstRolloutStrategyType
-                            type: string
-                          rolloutWebhooks:
-                            description: RolloutWebhooks provide a way for the rollout
-                              to interact with an external process
-                            items:
-                              description: RolloutWebhook holds the reference to external
-                                checks used for canary analysis
-                              properties:
-                                expectedStatus:
-                                  description: ExpectedStatus contains all the expected
-                                    http status code that we will accept as success
-                                  items:
-                                    type: integer
-                                  type: array
-                                metadata:
-                                  additionalProperties:
-                                    type: string
-                                  description: Metadata (key-value pairs) for this
-                                    webhook
-                                  type: object
-                                method:
-                                  description: Method the HTTP call method, default
-                                    is POST
-                                  type: string
-                                name:
-                                  description: Name of this webhook
-                                  type: string
-                                type:
-                                  description: Type of this webhook
-                                  type: string
-                                url:
-                                  description: URL address of this webhook
-                                  type: string
-                              required:
-                              - name
-                              - type
-                              - url
-                              type: object
-                            type: array
-                          targetSize:
-                            description: The size of the target resource. The default
-                              is the same as the size of the source resource.
-                            format: int32
-                            type: integer
-                        type: object
                       workflow:
                         description: 'Workflow defines how to customize the control
                           logic. If workflow is specified, Vela won''t apply any resource,
@@ -2937,113 +2512,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                      rollout:
-                        description: AppRolloutStatus defines the observed state of
-                          AppRollout
-                        properties:
-                          LastSourceAppRevision:
-                            description: LastSourceAppRevision contains the name of
-                              the app that we need to upgrade from. We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          batchRollingState:
-                            description: BatchRollingState only meaningful when the
-                              Status is rolling
-                            type: string
-                          conditions:
-                            description: Conditions of the resource.
-                            items:
-                              description: A Condition that may apply to a resource.
-                              properties:
-                                lastTransitionTime:
-                                  description: LastTransitionTime is the last time
-                                    this condition transitioned from one status to
-                                    another.
-                                  format: date-time
-                                  type: string
-                                message:
-                                  description: A Message containing details about
-                                    this condition's last transition from one status
-                                    to another, if any.
-                                  type: string
-                                reason:
-                                  description: A Reason for this condition's last
-                                    transition from one status to another.
-                                  type: string
-                                status:
-                                  description: Status of this condition; is it currently
-                                    True, False, or Unknown?
-                                  type: string
-                                type:
-                                  description: Type of this condition. At most one
-                                    of each condition type may apply to a resource
-                                    at any point in time.
-                                  type: string
-                              required:
-                              - lastTransitionTime
-                              - reason
-                              - status
-                              - type
-                              type: object
-                            type: array
-                          currentBatch:
-                            description: The current batch the rollout is working
-                              on/blocked it starts from 0
-                            format: int32
-                            type: integer
-                          lastAppliedPodTemplateIdentifier:
-                            description: lastAppliedPodTemplateIdentifier is a string
-                              that uniquely represent the last pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources We update this field
-                              only after a successful rollout
-                            type: string
-                          lastTargetAppRevision:
-                            description: LastUpgradedTargetAppRevision contains the
-                              name of the app that we upgraded to We will restart
-                              the rollout if this is not the same as the spec
-                            type: string
-                          rollingState:
-                            description: RollingState is the Rollout State
-                            type: string
-                          rolloutOriginalSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          rolloutTargetSize:
-                            description: RolloutTargetSize is the size of the target
-                              resources. This is determined once the initial spec
-                              verification and does not change until the rollout is
-                              restarted
-                            format: int32
-                            type: integer
-                          targetGeneration:
-                            description: NewPodTemplateIdentifier is a string that
-                              uniquely represent the new pod template each workload
-                              type could use different ways to identify that so we
-                              cannot compare between resources
-                            type: string
-                          upgradedReadyReplicas:
-                            description: UpgradedReadyReplicas is the number of Pods
-                              upgraded by the rollout controller that have a Ready
-                              Condition.
-                            format: int32
-                            type: integer
-                          upgradedReplicas:
-                            description: UpgradedReplicas is the number of Pods upgraded
-                              by the rollout controller
-                            format: int32
-                            type: integer
-                        required:
-                        - currentBatch
-                        - lastTargetAppRevision
-                        - rollingState
-                        - upgradedReadyReplicas
-                        - upgradedReplicas
-                        type: object
                       services:
                         description: Services record the status of the application
                           services

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

@@ -617,107 +617,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app
-                      that we need to upgrade from. We will restart the rollout if
-                      this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status
-                      is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition
-                            transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's
-                            last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition
-                            from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True,
-                            False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each
-                            condition type may apply to a resource at any point in
-                            time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked
-                      it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that
-                      uniquely represent the last pod template each workload type
-                      could use different ways to identify that so we cannot compare
-                      between resources We update this field only after a successful
-                      rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of
-                      the app that we upgraded to We will restart the rollout if this
-                      is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources.
-                      This is determined once the initial spec verification and does
-                      not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources.
-                      This is determined once the initial spec verification and does
-                      not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely
-                      represent the new pod template each workload type could use
-                      different ways to identify that so we cannot compare between
-                      resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded
-                      by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by
-                      the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:
@@ -1135,303 +1034,6 @@ spec:
                   - type
                   type: object
                 type: array
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources
-                  The controller simply replace the old resources with the new one
-                  if there is no rollout plan involved
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition
-                      (included) will have the target resource specification while
-                      the rest still have the source resource This is designed for
-                      the operators to manually rollout Default is the the number
-                      of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process
-                      to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used
-                        for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead
-                                of an entire object, this string should contain a
-                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
-                                For example, if the object reference is to a container
-                                within a pod, this would take on a value like: "spec.containers{name}"
-                                (where "name" refers to the name of the container
-                                that triggered the event) or if no container name
-                                is specified "spec.containers[2]" (container with
-                                index 2 in this pod). This syntax is chosen only to
-                                have some well-defined way of referencing a part of
-                                an object. TODO: this design is not final and this
-                                field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info:
-                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this
-                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                              type: string
-                          type: object
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has
-                      to be exactly the same as the NumBatches (if set) The total
-                      number cannot exceed the targetSize or the size of the source
-                      resource We will IGNORE the last batch's replica field if it's
-                      a percentage since round errors can lead to inaccurate sum We
-                      highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch
-                        rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch
-                            rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external
-                              checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected
-                                  http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default
-                                  is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout
-                            process to automatically check certain metrics before
-                            moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics
-                              used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template
-                                  object
-                                properties:
-                                  apiVersion:
-                                    description: API version of the referent.
-                                    type: string
-                                  fieldPath:
-                                    description: 'If referring to a piece of an object
-                                      instead of an entire object, this string should
-                                      contain a valid JSON/Go field access statement,
-                                      such as desiredState.manifest.containers[2].
-                                      For example, if the object reference is to a
-                                      container within a pod, this would take on a
-                                      value like: "spec.containers{name}" (where "name"
-                                      refers to the name of the container that triggered
-                                      the event) or if no container name is specified
-                                      "spec.containers[2]" (container with index 2
-                                      in this pod). This syntax is chosen only to
-                                      have some well-defined way of referencing a
-                                      part of an object. TODO: this design is not
-                                      final and this field is subject to change in
-                                      the future.'
-                                    type: string
-                                  kind:
-                                    description: 'Kind of the referent. More info:
-                                      https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                  name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                  namespace:
-                                    description: 'Namespace of the referent. More
-                                      info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                    type: string
-                                  resourceVersion:
-                                    description: 'Specific resourceVersion to which
-                                      this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                    type: string
-                                  uid:
-                                    description: 'UID of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                    type: string
-                                type: object
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances
-                            upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of
-                            pods that is unavailable during the upgrade. We will mark
-                            the batch as ready as long as there are less or equal
-                            number of pods unavailable than this number. default =
-                            0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually
-                            exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade
-                            in this batch it can be an absolute number (ex: 5) or
-                            a percentage of total pods we will ignore the percentage
-                            of the last batch to just fill the gap it is mutually
-                            exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout
-                      plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to
-                      interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external
-                        checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http
-                            status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the
-                      same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
               workflow:
                 description: 'Workflow defines how to customize the control logic.
                   If workflow is specified, Vela won''t apply any resource, but provide
@@ -1710,107 +1312,6 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              rollout:
-                description: AppRolloutStatus defines the observed state of AppRollout
-                properties:
-                  LastSourceAppRevision:
-                    description: LastSourceAppRevision contains the name of the app
-                      that we need to upgrade from. We will restart the rollout if
-                      this is not the same as the spec
-                    type: string
-                  batchRollingState:
-                    description: BatchRollingState only meaningful when the Status
-                      is rolling
-                    type: string
-                  conditions:
-                    description: Conditions of the resource.
-                    items:
-                      description: A Condition that may apply to a resource.
-                      properties:
-                        lastTransitionTime:
-                          description: LastTransitionTime is the last time this condition
-                            transitioned from one status to another.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A Message containing details about this condition's
-                            last transition from one status to another, if any.
-                          type: string
-                        reason:
-                          description: A Reason for this condition's last transition
-                            from one status to another.
-                          type: string
-                        status:
-                          description: Status of this condition; is it currently True,
-                            False, or Unknown?
-                          type: string
-                        type:
-                          description: Type of this condition. At most one of each
-                            condition type may apply to a resource at any point in
-                            time.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - reason
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  currentBatch:
-                    description: The current batch the rollout is working on/blocked
-                      it starts from 0
-                    format: int32
-                    type: integer
-                  lastAppliedPodTemplateIdentifier:
-                    description: lastAppliedPodTemplateIdentifier is a string that
-                      uniquely represent the last pod template each workload type
-                      could use different ways to identify that so we cannot compare
-                      between resources We update this field only after a successful
-                      rollout
-                    type: string
-                  lastTargetAppRevision:
-                    description: LastUpgradedTargetAppRevision contains the name of
-                      the app that we upgraded to We will restart the rollout if this
-                      is not the same as the spec
-                    type: string
-                  rollingState:
-                    description: RollingState is the Rollout State
-                    type: string
-                  rolloutOriginalSize:
-                    description: RolloutTargetSize is the size of the target resources.
-                      This is determined once the initial spec verification and does
-                      not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  rolloutTargetSize:
-                    description: RolloutTargetSize is the size of the target resources.
-                      This is determined once the initial spec verification and does
-                      not change until the rollout is restarted
-                    format: int32
-                    type: integer
-                  targetGeneration:
-                    description: NewPodTemplateIdentifier is a string that uniquely
-                      represent the new pod template each workload type could use
-                      different ways to identify that so we cannot compare between
-                      resources
-                    type: string
-                  upgradedReadyReplicas:
-                    description: UpgradedReadyReplicas is the number of Pods upgraded
-                      by the rollout controller that have a Ready Condition.
-                    format: int32
-                    type: integer
-                  upgradedReplicas:
-                    description: UpgradedReplicas is the number of Pods upgraded by
-                      the rollout controller
-                    format: int32
-                    type: integer
-                required:
-                - currentBatch
-                - lastTargetAppRevision
-                - rollingState
-                - upgradedReadyReplicas
-                - upgradedReplicas
-                type: object
               services:
                 description: Services record the status of the application services
                 items:

makefiles/build.mk

@@ -0,0 +1,26 @@
+
+.PHONY: vela-cli
+vela-cli:
+	$(GOBUILD_ENV) go build -o bin/vela -a -ldflags $(LDFLAGS) ./references/cmd/cli/main.go
+
+.PHONY: kubectl-vela
+kubectl-vela:
+	$(GOBUILD_ENV) go build -o bin/kubectl-vela -a -ldflags $(LDFLAGS) ./cmd/plugin/main.go
+
+# Build the docker image
+.PHONY: docker-build
+docker-build: docker-build-core docker-build-apiserver
+	@$(OK)
+
+.PHONY: docker-build-core
+docker-build-core:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_CORE_IMAGE) .
+
+.PHONY: docker-build-apiserver
+docker-build-apiserver:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_APISERVER_IMAGE) -f Dockerfile.apiserver .
+
+# Build the runtime docker image
+.PHONY: docker-build-runtime-rollout
+docker-build-runtime-rollout:
+	docker build --build-arg=VERSION=$(VELA_VERSION) --build-arg=GITVERSION=$(GIT_COMMIT) -t $(VELA_RUNTIME_ROLLOUT_IMAGE) -f runtime/rollout/Dockerfile .

makefiles/const.mk

@@ -0,0 +1,51 @@
+SHELL := /bin/bash
+
+GOBUILD_ENV = GO111MODULE=on CGO_ENABLED=0
+GOX         = go run github.com/mitchellh/gox
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
+DIST_DIRS   := find * -type d -exec
+
+TIME_LONG	= `date +%Y-%m-%d' '%H:%M:%S`
+TIME_SHORT	= `date +%H:%M:%S`
+TIME		= $(TIME_SHORT)
+
+BLUE         := $(shell printf "\033[34m")
+YELLOW       := $(shell printf "\033[33m")
+RED          := $(shell printf "\033[31m")
+GREEN        := $(shell printf "\033[32m")
+CNone        := $(shell printf "\033[0m")
+
+INFO	= echo ${TIME} ${BLUE}[ .. ]${CNone}
+WARN	= echo ${TIME} ${YELLOW}[WARN]${CNone}
+ERR		= echo ${TIME} ${RED}[FAIL]${CNone}
+OK		= echo ${TIME} ${GREEN}[ OK ]${CNone}
+FAIL	= (echo ${TIME} ${RED}[FAIL]${CNone} && false)
+
+
+
+# Vela version
+VELA_VERSION ?= master
+# Repo info
+GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
+GIT_COMMIT_LONG     ?= $(shell git rev-parse HEAD)
+VELA_VERSION_KEY    := github.com/oam-dev/kubevela/version.VelaVersion
+VELA_GITVERSION_KEY := github.com/oam-dev/kubevela/version.GitRevision
+LDFLAGS             ?= "-s -w -X $(VELA_VERSION_KEY)=$(VELA_VERSION) -X $(VELA_GITVERSION_KEY)=$(GIT_COMMIT)"
+
+
+
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+# Image URL to use all building/pushing image targets
+VELA_CORE_IMAGE      ?= vela-core:latest
+VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
+VELA_APISERVER_IMAGE      ?= apiserver:latest
+VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest
+VELA_RUNTIME_ROLLOUT_TEST_IMAGE  ?= vela-runtime-rollout-test:$(GIT_COMMIT)
+RUNTIME_CLUSTER_CONFIG ?= /tmp/worker.kubeconfig
+RUNTIME_CLUSTER_NAME ?= worker

makefiles/dependency.mk

@@ -0,0 +1,73 @@
+
+GOLANGCILINT_VERSION ?= v1.38.0
+
+.PHONY: golangci
+golangci:
+ifneq ($(shell which golangci-lint),)
+	@$(OK) golangci-lint is already installed
+GOLANGCILINT=$(shell which golangci-lint)
+else ifeq (, $(shell which $(GOBIN)/golangci-lint))
+	@{ \
+	set -e ;\
+	echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCILINT_VERSION) ;\
+	echo 'Successfully installed' ;\
+	}
+GOLANGCILINT=$(GOBIN)/golangci-lint
+else
+	@$(OK) golangci-lint is already installed
+GOLANGCILINT=$(GOBIN)/golangci-lint
+endif
+
+.PHONY: staticchecktool
+staticchecktool:
+ifeq (, $(shell which staticcheck))
+	@{ \
+	set -e ;\
+	echo 'installing honnef.co/go/tools/cmd/staticcheck ' ;\
+	GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck ;\
+	}
+STATICCHECK=$(GOBIN)/staticcheck
+else
+STATICCHECK=$(shell which staticcheck)
+endif
+
+.PHONY: goimports
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	}
+GOIMPORTS=$(GOBIN)/goimports
+else
+GOIMPORTS=$(shell which goimports)
+endif
+
+.PHONY: installcue
+installcue:
+ifeq (, $(shell which cue))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u cuelang.org/go/cmd/cue ;\
+	}
+CUE=$(GOBIN)/cue
+else
+CUE=$(shell which cue)
+endif
+
+KUSTOMIZE_VERSION ?= 3.8.2
+
+.PHONY: kustomize
+kustomize:
+ifeq (, $(shell kustomize version | grep $(KUSTOMIZE_VERSION)))
+	@{ \
+	set -eo pipefail ;\
+	echo 'installing kustomize-v$(KUSTOMIZE_VERSION) into $(GOBIN)' ;\
+	curl -sS https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash -s $(KUSTOMIZE_VERSION) $(GOBIN);\
+	echo 'Install succeed' ;\
+	}
+KUSTOMIZE=$(GOBIN)/kustomize
+else
+KUSTOMIZE=$(shell which kustomize)
+endif

makefiles/develop.mk

@@ -0,0 +1,32 @@
+
+# Run apiserver for velaux(UI)
+.PHONY: run-apiserver
+run-apiserver:
+	go run ./cmd/apiserver/main.go
+
+# Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
+.PHONY: core-install
+core-install: manifests
+	kubectl apply -f hack/namespace.yaml
+	kubectl apply -f charts/vela-core/crds/
+	@$(OK) install succeed
+
+# Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
+.PHONY: core-uninstall
+core-uninstall: manifests
+	kubectl delete -f charts/vela-core/crds/
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+.PHONY: run
+run:
+	go run ./cmd/core/main.go --application-revision-limit 5
+
+# Run against the configured Kubernetes cluster in ~/.kube/config with debug logs
+.PHONY: core-debug-run
+core-debug-run: fmt vet manifests
+	go run ./cmd/core/main.go --log-debug=true
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+.PHONY: core-run
+core-run: fmt vet manifests
+	go run ./cmd/core/main.go

makefiles/e2e.mk

@@ -0,0 +1,80 @@
+
+.PHONY: e2e-setup-core
+e2e-setup-core:
+	sh ./hack/e2e/modify_charts.sh
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
+	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
+	go run ./e2e/addon/mock &
+
+.PHONY: setup-runtime-e2e-cluster
+setup-runtime-e2e-cluster:
+	helm upgrade --install --create-namespace --namespace vela-system --kubeconfig=$(RUNTIME_CLUSTER_CONFIG) --set image.pullPolicy=IfNotPresent --set image.repository=vela-runtime-rollout-test --set image.tag=$(GIT_COMMIT) --wait vela-rollout ./runtime/rollout/charts
+
+.PHONY: e2e-setup
+e2e-setup:
+	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.9.0/kruise-chart.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
+	sh ./hack/e2e/modify_charts.sh
+	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
+	helm upgrade --install --create-namespace --namespace oam-runtime-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait oam-runtime ./charts/oam-runtime
+	go run ./e2e/addon/mock &
+	bin/vela addon enable fluxcd
+	bin/vela addon enable terraform
+	bin/vela addon enable terraform-alibaba ALICLOUD_ACCESS_KEY=xxx ALICLOUD_SECRET_KEY=yyy ALICLOUD_REGION=cn-beijing
+	ginkgo version
+	ginkgo -v -r e2e/setup
+
+	timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $$? -eq 0 ] ; then break; else sleep 5; fi;done'
+	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
+	kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
+
+.PHONY: e2e-api-test
+e2e-api-test:
+	# Run e2e test
+	ginkgo -v -skipPackage capability,setup,application -r e2e
+	ginkgo -v -r e2e/application
+
+ADDONSERVER = $(shell pgrep vela_addon_mock_server)
+
+
+.PHONY: e2e-apiserver-test
+e2e-apiserver-test:
+	pkill vela_addon_mock_server || true
+	go run ./e2e/addon/mock/vela_addon_mock_server.go &
+	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_apiserver_test.out ./test/e2e-apiserver-test
+	@$(OK) tests pass
+
+.PHONY: e2e-test
+e2e-test:
+	# Run e2e test
+	ginkgo -v  --skip="rollout related e2e-test." ./test/e2e-test
+	@$(OK) tests pass
+
+.PHONY: e2e-addon-test
+e2e-addon-test:
+	cp bin/vela /tmp/
+	ginkgo -v ./test/e2e-addon-test
+	@$(OK) tests pass
+
+.PHONY: e2e-rollout-test
+e2e-rollout-test:
+	ginkgo -v  --focus="rollout related e2e-test." ./test/e2e-test
+	@$(OK) tests pass
+
+.PHONY: e2e-multicluster-test
+e2e-multicluster-test:
+	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_multicluster_test.out ./test/e2e-multicluster-test
+	@$(OK) tests pass
+
+.PHONY: e2e-cleanup
+e2e-cleanup:
+	# Clean up
+	rm -rf ~/.vela
+
+.PHONY: end-e2e-core
+end-e2e-core:
+	sh ./hack/e2e/end_e2e_core.sh
+
+.PHONY: end-e2e
+end-e2e:
+	sh ./hack/e2e/end_e2e.sh

makefiles/release.mk

@@ -0,0 +1,28 @@
+
+.PHONY: cross-build
+cross-build:
+	rm -rf _bin
+	go get github.com/mitchellh/gox@v0.4.0
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/vela/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./references/cmd/cli
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/kubectl-vela/{{.OS}}-{{.Arch}}/kubectl-vela" -osarch='$(TARGETS)' ./cmd/plugin
+	$(GOBUILD_ENV) $(GOX) -ldflags $(LDFLAGS) -parallel=2 -output="_bin/apiserver/{{.OS}}-{{.Arch}}/apiserver" -osarch="$(TARGETS)" ./cmd/apiserver
+
+
+.PHONY: compress
+compress:
+	( \
+		echo "\n## Release Info\nVERSION: $(VELA_VERSION)" >> README.md && \
+		echo "GIT_COMMIT: $(GIT_COMMIT_LONG)\n" >> README.md && \
+		cd _bin/vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
+		cd ../kubectl-vela && \
+		$(DIST_DIRS) cp ../../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r kubectl-vela-{}.zip {} \; && \
+		cd .. && \
+		sha256sum vela/vela-* kubectl-vela/kubectl-vela-* > sha256sums.txt \
+	)

pkg/addon/addon.go

@@ -42,6 +42,7 @@ import (
 	k8syaml "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 	types2 "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/util/retry"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
@@ -102,10 +103,23 @@ var (
 	CLIMetaOptions = ListOptions{}
 )
 
+const (
+	// ObservabilityAddon is the name of the observability addon
+	ObservabilityAddon = "observability"
+	// ObservabilityAddonEndpointComponent is the endpoint component name of the observability addon
+	ObservabilityAddonEndpointComponent = "grafana"
+	// ObservabilityAddonDomainArg is the domain argument name of the observability addon
+	ObservabilityAddonDomainArg = "domain"
+	// LocalAddonRegistryName is the addon-registry name for those installed by local dir
+	LocalAddonRegistryName = "local"
+)
+
 // ObservabilityEnvironment contains the Observability addon's domain for each cluster
 type ObservabilityEnvironment struct {
-	Cluster string
-	Domain  string
+	Cluster           string
+	Domain            string
+	LoadBalancerIP    string
+	ServiceExternalIP string
 }
 
 // ObservabilityEnvBindingValues is a list of ObservabilityEnvironment and will be used to render observability-env-binding.yaml
@@ -125,14 +139,6 @@ const (
             placement:
               clusterSelector:
                 name: {{.Cluster}}
-            patch:
-              components:
-                - name: grafana
-                  type: helm
-                  traits:
-                    - type: pure-ingress
-                      properties:
-                        domain: {{.Domain}}
           {{ end }}
         {{ end }}`
 
@@ -178,7 +184,7 @@ func GetPatternFromItem(it Item, r AsyncReader, rootPath string) string {
 }
 
 // ListAddonUIDataFromReader list addons from AsyncReader
-func ListAddonUIDataFromReader(r AsyncReader, registryMeta map[string]SourceMeta, opt ListOptions) ([]*UIData, error) {
+func ListAddonUIDataFromReader(r AsyncReader, registryMeta map[string]SourceMeta, registryName string, opt ListOptions) ([]*UIData, error) {
 	var addons []*UIData
 	var err error
 	var wg sync.WaitGroup
@@ -196,6 +202,7 @@ func ListAddonUIDataFromReader(r AsyncReader, registryMeta map[string]SourceMeta
 				errCh <- err
 				return
 			}
+			addonRes.RegistryName = registryName
 			l.Lock()
 			addons = append(addons, addonRes)
 			l.Unlock()
@@ -460,6 +467,10 @@ func RenderApp(ctx context.Context, addon *InstallPackage, config *rest.Config,
 	}
 	app.Labels = util.MergeMapOverrideWithDst(app.Labels, map[string]string{oam.LabelAddonName: addon.Name})
 	for _, namespace := range addon.NeedNamespace {
+		// vela-system must exist before rendering vela addon
+		if namespace == types.DefaultKubeVelaNS {
+			continue
+		}
 		comp := common2.ApplicationComponent{
 			Type:       "raw",
 			Name:       fmt.Sprintf("%s-namespace", namespace),
@@ -480,7 +491,7 @@ func RenderApp(ctx context.Context, addon *InstallPackage, config *rest.Config,
 		if err != nil {
 			return nil, ErrRenderCueTmpl
 		}
-		if addon.Name == "observability" && strings.HasSuffix(comp.Name, ".cue") {
+		if addon.Name == ObservabilityAddon && strings.HasSuffix(comp.Name, ".cue") {
 			comp.Name = strings.Split(comp.Name, ".cue")[0]
 		}
 		app.Spec.Components = append(app.Spec.Components, *comp)
@@ -500,26 +511,35 @@ func RenderApp(ctx context.Context, addon *InstallPackage, config *rest.Config,
 				Name: "deploy-runtime",
 				Type: "deploy2runtime",
 			})
-	case addon.Name == "observability":
-		arg, ok := args["domain"]
-		if !ok {
-			return nil, ErrorNoDomain
+	case addon.Name == ObservabilityAddon:
+		clusters, err := allocateDomainForAddon(ctx, k8sClient)
+		if err != nil {
+			return nil, err
 		}
-		domain := arg.(string)
-		policies, err := preparePolicies4Observability(ctx, k8sClient, domain)
+
+		policies, err := preparePolicies4Observability(clusters)
 		if err != nil {
 			return nil, errors.Wrap(err, "fail to render the policies for Add-on Observability")
 		}
 		app.Spec.Policies = policies
 
-		app.Spec.Workflow = &v1beta1.Workflow{
-			Steps: []v1beta1.WorkflowStep{{
-				Name: "deploy-control-plane",
-				Type: "apply-application-in-parallel",
-			}},
+		if len(clusters) > 0 {
+			app.Spec.Workflow = &v1beta1.Workflow{
+				Steps: []v1beta1.WorkflowStep{{
+					Name: "deploy-control-plane",
+					Type: "apply-application-in-parallel",
+				}},
+			}
+		} else {
+			app.Spec.Workflow = &v1beta1.Workflow{
+				Steps: []v1beta1.WorkflowStep{{
+					Name: "deploy-control-plane",
+					Type: "apply-application",
+				}},
+			}
 		}
 
-		workflowSteps, err := prepareWorkflow4Observability(ctx, k8sClient, domain)
+		workflowSteps, err := prepareWorkflow4Observability(clusters)
 		if err != nil {
 			return nil, errors.Wrap(err, "fail to prepare the workflow for Add-on Observability")
 		}
@@ -607,7 +627,7 @@ func RenderDefinitionSchema(addon *InstallPackage) ([]*unstructured.Unstructured
 	return schemaConfigmaps, nil
 }
 
-func allocateDomainForAddon(ctx context.Context, k8sClient client.Client, domain string) ([]ObservabilityEnvironment, error) {
+func allocateDomainForAddon(ctx context.Context, k8sClient client.Client) ([]ObservabilityEnvironment, error) {
 	secrets, err := multicluster.ListExistingClusterSecrets(ctx, k8sClient)
 	if err != nil {
 		klog.Error(err, "failed to list existing cluster secrets")
@@ -618,22 +638,18 @@ func allocateDomainForAddon(ctx context.Context, k8sClient client.Client, domain
 
 	for i, secret := range secrets {
 		cluster := secret.Name
-		domain := fmt.Sprintf("%s.%s", cluster, domain)
 		envs[i] = ObservabilityEnvironment{
 			Cluster: cluster,
-			Domain:  domain,
 		}
 	}
 
 	return envs, nil
 }
 
-func preparePolicies4Observability(ctx context.Context, k8sClient client.Client, domain string) ([]v1beta1.AppPolicy, error) {
-	clusters, err := allocateDomainForAddon(ctx, k8sClient, domain)
-	if err != nil {
-		return nil, err
+func preparePolicies4Observability(clusters []ObservabilityEnvironment) ([]v1beta1.AppPolicy, error) {
+	if clusters == nil {
+		return nil, nil
 	}
-
 	envProperties, err := render(clusters, ObservabilityEnvBindingEnvTmpl)
 	if err != nil {
 		return nil, err
@@ -659,12 +675,7 @@ func preparePolicies4Observability(ctx context.Context, k8sClient client.Client,
 	return policies, nil
 }
 
-func prepareWorkflow4Observability(ctx context.Context, k8sClient client.Client, domain string) ([]v1beta1.WorkflowStep, error) {
-	clusters, err := allocateDomainForAddon(ctx, k8sClient, domain)
-	if err != nil {
-		return nil, err
-	}
-
+func prepareWorkflow4Observability(clusters []ObservabilityEnvironment) ([]v1beta1.WorkflowStep, error) {
 	envBindingWorkflow, err := render(clusters, ObservabilityWorkflow4EnvBindingTmpl)
 	if err != nil {
 		return nil, err
@@ -868,7 +879,7 @@ func (h *Installer) enableAddon(addon *InstallPackage) error {
 	}
 	// we shouldn't put continue func into dispatchAddonResource, because the re-apply app maybe already update app and
 	// the suspend will set with false automatically
-	if err := h.continueIfSuspend(); err != nil {
+	if err := h.continueOrRestartWorkflow(); err != nil {
 		return err
 	}
 	return nil
@@ -882,7 +893,7 @@ func (h *Installer) loadInstallPackage(name string) (*InstallPackage, error) {
 
 	meta, ok := metas[name]
 	if !ok {
-		return nil, errors.Wrapf(err, "fail to find the addon meta of %s", name)
+		return nil, ErrNotExist
 	}
 	var uiData *UIData
 	uiData, err = h.cache.GetUIData(*h.r, name)
@@ -946,6 +957,8 @@ func (h *Installer) dispatchAddonResource(addon *InstallPackage) error {
 	}
 	app.Name = appName
 
+	app.SetLabels(util.MergeMapOverrideWithDst(app.GetLabels(), map[string]string{oam.LabelAddonRegistry: h.r.Name}))
+
 	defs, err := RenderDefinitions(h.addon, h.config)
 	if err != nil {
 		return errors.Wrap(err, "render addon definitions fail")
@@ -989,17 +1002,39 @@ func (h *Installer) dispatchAddonResource(addon *InstallPackage) error {
 	return nil
 }
 
-func (h *Installer) continueIfSuspend() error {
+// this func will handle such two case
+// 1. if last apply failed an workflow have suspend, this func will continue the workflow
+// 2. restart the workflow, if the new cluster have been added in KubeVela
+func (h *Installer) continueOrRestartWorkflow() error {
 	app, err := FetchAddonRelatedApp(h.ctx, h.cli, h.addon.Name)
 	if err != nil {
 		return err
 	}
-	if app.Status.Workflow != nil && app.Status.Workflow.Suspend {
-		mergePatch := client.MergeFrom(app.DeepCopy())
-		app.Status.Workflow.Suspend = false
-		if err := h.cli.Status().Patch(h.ctx, app, mergePatch); err != nil {
-			return err
-		}
+
+	switch {
+	// this case means user add a new cluster and user want to restart workflow to dispatch addon resources to new cluster
+	// re-apply app won't help app restart workflow
+	case app.Status.Phase == common2.ApplicationRunning:
+		// we can use retry on conflict here in CLI, because we want to update the status in this CLI operation.
+		return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
+			if err = h.cli.Get(h.ctx, client.ObjectKey{Namespace: app.Namespace, Name: app.Name}, app); err != nil {
+				return
+			}
+			app.Status.Workflow = nil
+			return h.cli.Status().Update(h.ctx, app)
+		})
+	// this case means addon last installation meet some error and workflow has been suspended by app controller
+	// re-apply app won't help app workflow continue
+	case app.Status.Workflow != nil && app.Status.Workflow.Suspend:
+		// we can use retry on conflict here in CLI, because we want to update the status in this CLI operation.
+		return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
+			if err = h.cli.Get(h.ctx, client.ObjectKey{Namespace: app.Namespace, Name: app.Name}, app); err != nil {
+				return
+			}
+			mergePatch := client.MergeFrom(app.DeepCopy())
+			app.Status.Workflow.Suspend = false
+			return h.cli.Status().Patch(h.ctx, app, mergePatch)
+		})
 	}
 	return nil
 }

pkg/addon/addon_suite_test.go

@@ -40,7 +40,7 @@ var _ = Describe("Addon test", func() {
 		Expect(k8sClient.Delete(ctx, &app)).Should(BeNil())
 	})
 
-	It("continueIfSuspend func test", func() {
+	It("continueOrRestartWorkflow func test", func() {
 		app = v1beta1.Application{}
 		Expect(yaml.Unmarshal([]byte(appYaml), &app)).Should(BeNil())
 		app.SetNamespace(testns)
@@ -69,7 +69,7 @@ var _ = Describe("Addon test", func() {
 			}
 
 			h := Installer{ctx: ctx, cli: k8sClient, addon: &InstallPackage{Meta: Meta{Name: "test-app"}}}
-			if err := h.continueIfSuspend(); err != nil {
+			if err := h.continueOrRestartWorkflow(); err != nil {
 				return err
 			}
 			return nil
@@ -87,6 +87,54 @@ var _ = Describe("Addon test", func() {
 		}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
 	})
 
+	It("continueOrRestartWorkflow func test, test restart workflow", func() {
+		app = v1beta1.Application{}
+		Expect(yaml.Unmarshal([]byte(appYaml), &app)).Should(BeNil())
+		app.SetNamespace(testns)
+		Expect(k8sClient.Create(ctx, &app)).Should(BeNil())
+
+		Eventually(func() error {
+			checkApp := &v1beta1.Application{}
+			if err := k8sClient.Get(ctx, types2.NamespacedName{Namespace: app.Namespace, Name: app.Name}, checkApp); err != nil {
+				return err
+			}
+			appPatch := client.MergeFrom(checkApp.DeepCopy())
+			checkApp.Status.Workflow = &common.WorkflowStatus{Message: "someMessage", AppRevision: "test-revision"}
+			checkApp.Status.Phase = common.ApplicationRunning
+			if err := k8sClient.Status().Patch(ctx, checkApp, appPatch); err != nil {
+				return err
+			}
+			return nil
+		}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
+
+		Eventually(func() error {
+			checkApp := &v1beta1.Application{}
+			if err := k8sClient.Get(ctx, types2.NamespacedName{Namespace: app.Namespace, Name: app.Name}, checkApp); err != nil {
+				return err
+			}
+			if checkApp.Status.Phase != common.ApplicationRunning {
+				return fmt.Errorf("app haven't not running")
+			}
+
+			h := Installer{ctx: ctx, cli: k8sClient, addon: &InstallPackage{Meta: Meta{Name: "test-app"}}}
+			if err := h.continueOrRestartWorkflow(); err != nil {
+				return err
+			}
+			return nil
+		}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
+
+		Eventually(func() error {
+			checkApp := &v1beta1.Application{}
+			if err := k8sClient.Get(ctx, types2.NamespacedName{Namespace: app.Namespace, Name: app.Name}, checkApp); err != nil {
+				return err
+			}
+			if checkApp.Status.Workflow != nil {
+				return fmt.Errorf("app workflow havenot been restart")
+			}
+			return nil
+		}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
+	})
+
 	It(" FetchAddonRelatedApp func test", func() {
 		app = v1beta1.Application{}
 		Expect(yaml.Unmarshal([]byte(legacyAppYaml), &app)).Should(BeNil())

pkg/addon/addon_test.go

@@ -34,12 +34,14 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
+	"github.com/oam-dev/kubevela/apis/types"
 )
 
 var paths = []string{
@@ -120,9 +122,11 @@ func testReaderFunc(t *testing.T, reader AsyncReader) {
 	assert.True(t, len(uiData.Definitions) > 0)
 
 	// test get ui data
-	uiDataList, err := ListAddonUIDataFromReader(reader, registryMeta, UIMetaOptions)
+	rName := "KubeVela"
+	uiDataList, err := ListAddonUIDataFromReader(reader, registryMeta, rName, UIMetaOptions)
 	assert.True(t, strings.Contains(err.Error(), "#parameter.example: preference mark not allowed at this position"))
 	assert.Equal(t, len(uiDataList), 3)
+	assert.Equal(t, uiDataList[0].RegistryName, rName)
 
 	// test get install package
 	installPkg, err := GetInstallPackageFromReader(reader, &testAddonMeta, uiData)
@@ -151,11 +155,9 @@ func TestRender(t *testing.T) {
 			envs: []ObservabilityEnvironment{
 				{
 					Cluster: "c1",
-					Domain:  "a.com",
 				},
 				{
 					Cluster: "c2",
-					Domain:  "b.com",
 				},
 			},
 			tmpl: ObservabilityEnvBindingEnvTmpl,
@@ -166,27 +168,11 @@ func TestRender(t *testing.T) {
             placement:
               clusterSelector:
                 name: c1
-            patch:
-              components:
-                - name: grafana
-                  type: helm
-                  traits:
-                    - type: pure-ingress
-                      properties:
-                        domain: a.com
           
           - name: c2
             placement:
               clusterSelector:
                 name: c2
-            patch:
-              components:
-                - name: grafana
-                  type: helm
-                  traits:
-                    - type: pure-ingress
-                      properties:
-                        domain: b.com
           
         `,
 
@@ -196,11 +182,9 @@ func TestRender(t *testing.T) {
 			envs: []ObservabilityEnvironment{
 				{
 					Cluster: "c1",
-					Domain:  "a.com",
 				},
 				{
 					Cluster: "c2",
-					Domain:  "b.com",
 				},
 			},
 			tmpl: ObservabilityWorkflow4EnvBindingTmpl,
@@ -242,6 +226,17 @@ func TestRenderApp(t *testing.T) {
 	assert.Equal(t, len(app.Spec.Components), 2)
 }
 
+func TestRenderAppWithNeedNamespace(t *testing.T) {
+	addon := baseAddon
+	addon.NeedNamespace = append(addon.NeedNamespace, types.DefaultKubeVelaNS)
+	app, err := RenderApp(ctx, &addon, nil, nil, map[string]interface{}{})
+	assert.NoError(t, err, "render app fail")
+	assert.Equal(t, len(app.Spec.Components), 2)
+	for _, c := range app.Spec.Components {
+		assert.NotEqual(t, types.DefaultKubeVelaNS+"-namespace", c.Name, "namespace vela-system should not be rendered")
+	}
+}
+
 func TestRenderDeploy2RuntimeAddon(t *testing.T) {
 	addonDeployToRuntime := baseAddon
 	addonDeployToRuntime.Meta.DeployTo = &DeployTo{
@@ -324,6 +319,76 @@ func TestGetAddonStatus(t *testing.T) {
 	}
 }
 
+func TestGetAddonStatus4Observability(t *testing.T) {
+	ctx := context.Background()
+
+	addonApplication := &v1beta1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "observability",
+			Namespace: types.DefaultKubeVelaNS,
+		},
+		Status: common.AppStatus{
+			Phase: common.ApplicationRunning,
+		},
+	}
+
+	addonSecret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      Convert2SecName(ObservabilityAddon),
+			Namespace: types.DefaultKubeVelaNS,
+		},
+		Data: map[string][]byte{},
+	}
+
+	addonService := &corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: types.DefaultKubeVelaNS,
+			Name:      ObservabilityAddonEndpointComponent,
+		},
+		Status: corev1.ServiceStatus{
+			LoadBalancer: corev1.LoadBalancerStatus{
+				Ingress: []corev1.LoadBalancerIngress{
+					{
+						IP: "1.2.3.4",
+					},
+				},
+			},
+		},
+	}
+
+	clusterSecret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-secret",
+			Labels: map[string]string{
+				v1alpha12.LabelKeyClusterCredentialType: string(v1alpha12.CredentialTypeX509Certificate),
+			},
+		},
+		Data: map[string][]byte{
+			"test-key": []byte("test-value"),
+		},
+	}
+
+	scheme := runtime.NewScheme()
+	assert.NoError(t, v1beta1.AddToScheme(scheme))
+	assert.NoError(t, corev1.AddToScheme(scheme))
+	k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(addonApplication, addonSecret).Build()
+	addonStatus, err := GetAddonStatus(context.Background(), k8sClient, ObservabilityAddon)
+	assert.NoError(t, err)
+	assert.Equal(t, addonStatus.AddonPhase, enabling)
+
+	// Addon is not installed in multiple clusters
+	k8sClient = fake.NewClientBuilder().WithScheme(scheme).WithObjects(addonApplication, addonSecret, addonService).Build()
+	addonStatus, err = GetAddonStatus(context.Background(), k8sClient, ObservabilityAddon)
+	assert.NoError(t, err)
+	assert.Equal(t, addonStatus.AddonPhase, enabled)
+
+	// Addon is installed in multiple clusters
+	assert.NoError(t, k8sClient.Create(ctx, clusterSecret))
+	addonStatus, err = GetAddonStatus(context.Background(), k8sClient, ObservabilityAddon)
+	assert.NoError(t, err)
+	assert.Equal(t, addonStatus.AddonPhase, enabled)
+}
+
 var baseAddon = InstallPackage{
 	Meta: Meta{
 		Name:          "test-render-cue-definition-addon",
@@ -383,19 +448,7 @@ func TestRenderApp4Observability(t *testing.T) {
 				},
 			},
 			args:        map[string]interface{}{},
-			application: "",
-			err:         ErrorNoDomain,
-		},
-		{
-			addon: InstallPackage{
-				Meta: Meta{
-					Name: "observability",
-				},
-			},
-			args: map[string]interface{}{
-				"domain": "a.com",
-			},
-			application: `{"kind":"Application","apiVersion":"core.oam.dev/v1beta1","metadata":{"name":"addon-observability","namespace":"vela-system","creationTimestamp":null,"labels":{"addons.oam.dev/name":"observability"}},"spec":{"components":[],"policies":[{"name":"domain","type":"env-binding","properties":{"envs":null}}],"workflow":{"steps":[{"name":"deploy-control-plane","type":"apply-application-in-parallel"}]}},"status":{}}`,
+			application: `{"kind":"Application","apiVersion":"core.oam.dev/v1beta1","metadata":{"name":"addon-observability","namespace":"vela-system","creationTimestamp":null,"labels":{"addons.oam.dev/name":"observability"}},"spec":{"components":[],"policies":[{"name":"domain","type":"env-binding","properties":{"envs":null}}],"workflow":{"steps":[{"name":"deploy-control-plane","type":"apply-application"}]}},"status":{}}`,
 		},
 	}
 	for _, tc := range testcases {
@@ -441,10 +494,8 @@ func TestRenderApp4ObservabilityWithK8sData(t *testing.T) {
 					Name: "observability",
 				},
 			},
-			args: map[string]interface{}{
-				"domain": "a.com",
-			},
-			application: `{"kind":"Application","apiVersion":"core.oam.dev/v1beta1","metadata":{"name":"addon-observability","namespace":"vela-system","creationTimestamp":null,"labels":{"addons.oam.dev/name":"observability"}},"spec":{"components":[],"policies":[{"name":"domain","type":"env-binding","properties":{"envs":[{"name":"test-secret","patch":{"components":[{"name":"grafana","traits":[{"properties":{"domain":"test-secret.a.com"},"type":"pure-ingress"}],"type":"helm"}]},"placement":{"clusterSelector":{"name":"test-secret"}}}]}}],"workflow":{"steps":[{"name":"deploy-control-plane","type":"apply-application-in-parallel"},{"name":"test-secret","type":"deploy2env","properties":{"env":"test-secret","parallel":true,"policy":"domain"}}]}},"status":{}}`,
+			args:        map[string]interface{}{},
+			application: `{"kind":"Application","apiVersion":"core.oam.dev/v1beta1","metadata":{"name":"addon-observability","namespace":"vela-system","creationTimestamp":null,"labels":{"addons.oam.dev/name":"observability"}},"spec":{"components":[],"policies":[{"name":"domain","type":"env-binding","properties":{"envs":[{"name":"test-secret","placement":{"clusterSelector":{"name":"test-secret"}}}]}}],"workflow":{"steps":[{"name":"deploy-control-plane","type":"apply-application-in-parallel"},{"name":"test-secret","type":"deploy2env","properties":{"env":"test-secret","parallel":true,"policy":"domain"}}]}},"status":{}}`,
 		},
 	}
 	for _, tc := range testcases {
@@ -499,3 +550,8 @@ func TestGetPatternFromItem(t *testing.T) {
 		assert.Equal(t, res, tc.meetPattern, tc.caseName)
 	}
 }
+
+func TestGitLabReaderNotPanic(t *testing.T) {
+	_, err := NewAsyncReader("https://gitlab.com/test/catalog", "", "addons", "", gitType)
+	assert.EqualError(t, err, "git type repository only support github for now")
+}

pkg/addon/helper.go

@@ -18,14 +18,20 @@ package addon
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 
+	"k8s.io/klog/v2"
+
+	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-
-	commontypes "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	commontypes "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/types"
+	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/utils/apply"
 )
 
@@ -69,6 +75,30 @@ func DisableAddon(ctx context.Context, cli client.Client, name string) error {
 	return nil
 }
 
+// EnableAddonByLocalDir enable an addon from local dir
+func EnableAddonByLocalDir(ctx context.Context, name string, dir string, cli client.Client, applicator apply.Applicator, config *rest.Config, args map[string]interface{}) error {
+	r := localReader{dir: dir, name: name}
+	metas, err := r.ListAddonMeta()
+	if err != nil {
+		return err
+	}
+	meta := metas[r.name]
+	UIData, err := GetUIDataFromReader(r, &meta, UIMetaOptions)
+	if err != nil {
+		return err
+	}
+	pkg, err := GetInstallPackageFromReader(r, &meta, UIData)
+	if err != nil {
+		return err
+	}
+	h := NewAddonInstaller(ctx, cli, applicator, config, &Registry{Name: LocalAddonRegistryName}, args, nil)
+	err = h.enableAddon(pkg)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // GetAddonStatus is genrall func for cli and apiServer get addon status
 func GetAddonStatus(ctx context.Context, cli client.Client, name string) (Status, error) {
 	app, err := FetchAddonRelatedApp(ctx, cli, name)
@@ -78,11 +108,46 @@ func GetAddonStatus(ctx context.Context, cli client.Client, name string) (Status
 		}
 		return Status{}, err
 	}
+
 	if app.Status.Workflow != nil && app.Status.Workflow.Suspend {
 		return Status{AddonPhase: suspend, AppStatus: &app.Status}, nil
 	}
 	switch app.Status.Phase {
 	case commontypes.ApplicationRunning:
+		if name == ObservabilityAddon {
+			var (
+				clusters = make(map[string]map[string]interface{})
+				sec      v1.Secret
+				domain   string
+			)
+			if err = cli.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: Convert2SecName(name)}, &sec); err != nil {
+				klog.ErrorS(err, "failed to get observability secret")
+				return Status{AddonPhase: enabling, AppStatus: &app.Status}, nil
+			}
+
+			if v, ok := sec.Data[ObservabilityAddonDomainArg]; ok {
+				domain = string(v)
+			}
+			observability, err := GetObservabilityAccessibilityInfo(ctx, cli, domain)
+			if err != nil {
+				klog.ErrorS(err, "failed to get observability accessibility info")
+				return Status{AddonPhase: enabling, AppStatus: &app.Status}, nil
+			}
+
+			for _, o := range observability {
+				var access = fmt.Sprintf("No loadBalancer found, visiting by using 'vela port-forward %s", ObservabilityAddon)
+				if o.LoadBalancerIP != "" {
+					access = fmt.Sprintf("Visiting URL: %s, IP: %s", o.Domain, o.LoadBalancerIP)
+				}
+				clusters[o.Cluster] = map[string]interface{}{
+					"domain":            o.Domain,
+					"loadBalancerIP":    o.LoadBalancerIP,
+					"access":            access,
+					"serviceExternalIP": o.ServiceExternalIP,
+				}
+			}
+			return Status{AddonPhase: enabled, AppStatus: &app.Status, Clusters: clusters}, nil
+		}
 		return Status{AddonPhase: enabled, AppStatus: &app.Status}, nil
 	case commontypes.ApplicationDeleting:
 		return Status{AddonPhase: disabling, AppStatus: &app.Status}, nil
@@ -91,8 +156,60 @@ func GetAddonStatus(ctx context.Context, cli client.Client, name string) (Status
 	}
 }
 
+// GetObservabilityAccessibilityInfo will get the accessibility info of addon in local cluster and multiple clusters
+func GetObservabilityAccessibilityInfo(ctx context.Context, k8sClient client.Client, domain string) ([]ObservabilityEnvironment, error) {
+	domains, err := allocateDomainForAddon(ctx, k8sClient)
+	if err != nil {
+		return nil, err
+	}
+
+	obj := new(unstructured.Unstructured)
+	obj.SetKind("Service")
+	obj.SetAPIVersion("v1")
+	key := client.ObjectKeyFromObject(obj)
+	key.Namespace = types.DefaultKubeVelaNS
+	key.Name = ObservabilityAddonEndpointComponent
+	for i, d := range domains {
+		if err != nil {
+			return nil, err
+		}
+		readCtx := multicluster.ContextWithClusterName(ctx, d.Cluster)
+		if err := k8sClient.Get(readCtx, key, obj); err != nil {
+			return nil, err
+		}
+		var svc v1.Service
+		data, err := obj.MarshalJSON()
+		if err != nil {
+			return nil, err
+		}
+		if err := json.Unmarshal(data, &svc); err != nil {
+			return nil, err
+		}
+		if svc.Status.LoadBalancer.Ingress != nil && len(svc.Status.LoadBalancer.Ingress) == 1 {
+			domains[i].ServiceExternalIP = svc.Status.LoadBalancer.Ingress[0].IP
+		}
+	}
+	// set domain for the cluster if there is no child clusters
+	if len(domains) == 0 {
+		var svc v1.Service
+		if err := k8sClient.Get(ctx, client.ObjectKey{Name: ObservabilityAddonEndpointComponent, Namespace: types.DefaultKubeVelaNS}, &svc); err != nil {
+			return nil, err
+		}
+		if svc.Status.LoadBalancer.Ingress != nil && len(svc.Status.LoadBalancer.Ingress) == 1 {
+			domains = []ObservabilityEnvironment{
+				{
+					ServiceExternalIP: svc.Status.LoadBalancer.Ingress[0].IP,
+				},
+			}
+		}
+	}
+	return domains, nil
+}
+
 // Status contain addon phase and related app status
 type Status struct {
 	AddonPhase string
 	AppStatus  *commontypes.AppStatus
+	// the status of multiple clusters
+	Clusters map[string]map[string]interface{} `json:"clusters,omitempty"`
 }

pkg/addon/reader_github.go

@@ -48,6 +48,9 @@ func (g *gitReader) ListAddonMeta() (map[string]SourceMeta, error) {
 	}
 	for _, item := range items {
 		// single addon
+		if item.GetType() != DirType {
+			continue
+		}
 		addonName := path.Base(item.GetPath())
 		addonMeta, err := g.listAddonMeta(g.RelativePath(item))
 		if err != nil {

pkg/addon/reader_local.go

@@ -0,0 +1,67 @@
+/*
+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 addon
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+)
+
+type localReader struct {
+	dir  string
+	name string
+}
+
+func (l localReader) ListAddonMeta() (map[string]SourceMeta, error) {
+	metas := SourceMeta{Name: l.name}
+	if err := recursiveFetchFiles(l.dir, &metas); err != nil {
+		return nil, err
+	}
+	return map[string]SourceMeta{l.name: metas}, nil
+}
+
+func (l localReader) ReadFile(path string) (string, error) {
+	file := strings.TrimPrefix(path, l.name+"/")
+	b, err := ioutil.ReadFile(filepath.Clean(filepath.Join(l.dir, file)))
+	if err != nil {
+		return "", err
+	}
+	return string(b), nil
+}
+
+func (l localReader) RelativePath(item Item) string {
+	return filepath.Join(l.name, strings.TrimPrefix(item.GetPath()+"/", l.dir))
+}
+
+func recursiveFetchFiles(path string, metas *SourceMeta) error {
+	files, err := ioutil.ReadDir(path)
+	if err != nil {
+		return err
+	}
+	for _, file := range files {
+		if file.IsDir() {
+			if err := recursiveFetchFiles(fmt.Sprintf("%s/%s", path, file.Name()), metas); err != nil {
+				return err
+			}
+		} else {
+			metas.Items = append(metas.Items, OSSItem{tp: "file", path: fmt.Sprintf("%s/%s", path, file.Name()), name: file.Name()})
+		}
+	}
+	return nil
+}

pkg/addon/reader_local_test.go

@@ -0,0 +1,62 @@
+/*
+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 addon
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLocalReader(t *testing.T) {
+	r := localReader{name: "local", dir: "./testdata/local"}
+	m, err := r.ListAddonMeta()
+	assert.NoError(t, err)
+	assert.Equal(t, len(m["local"].Items), 2)
+
+	file, err := r.ReadFile("metadata.yaml")
+	assert.NoError(t, err)
+	assert.Equal(t, file, metaFile)
+
+	file, err = r.ReadFile("resources/parameter.cue")
+	assert.NoError(t, err)
+	assert.Equal(t, true, strings.Contains(file, parameterFile))
+}
+
+const (
+	metaFile = `name: test-local-addon
+version: 1.0.0
+description: This is a addon for test when install addon from local
+icon: https://www.terraform.io/assets/images/logo-text-8c3ba8a6.svg
+url: https://terraform.io/
+
+tags: []
+
+deployTo:
+  control_plane: true
+  runtime_cluster: false
+
+dependencies: []
+
+invisible: false`
+
+	parameterFile = `parameter: {
+	// test wrong parameter
+	example: *"default"
+}`
+)

pkg/addon/source.go

@@ -127,8 +127,8 @@ func NewAsyncReader(baseURL, bucket, subPath, token string, rdType ReaderType) (
 			return nil, errors.New("addon registry invalid")
 		}
 		u.Path = path.Join(u.Path, subPath)
-		tp, content, err := utils.Parse(u.String())
-		if err != nil || tp != utils.TypeGithub {
+		_, content, err := utils.Parse(u.String())
+		if err != nil {
 			return nil, err
 		}
 		gith := createGitHelper(content, token)
@@ -191,7 +191,7 @@ func (r *Registry) ListUIData(registryAddonMeta map[string]SourceMeta, opt ListO
 	if err != nil {
 		return nil, err
 	}
-	return ListAddonUIDataFromReader(reader, registryAddonMeta, opt)
+	return ListAddonUIDataFromReader(reader, registryAddonMeta, r.Name, opt)
 }
 
 // GetInstallPackage get install package which is all needed to enable an addon from addon registry

pkg/addon/suite_test.go

@@ -22,11 +22,11 @@ import (
 	"time"
 
 	v12 "k8s.io/api/core/v1"
+	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func(done Done) {
 	scheme = runtime.NewScheme()
 	Expect(coreoam.AddToScheme(scheme)).NotTo(HaveOccurred())
 	Expect(clientgoscheme.AddToScheme(scheme)).NotTo(HaveOccurred())
-	Expect(v1beta1.AddToScheme(scheme)).NotTo(HaveOccurred())
+	Expect(crdv1.AddToScheme(scheme)).NotTo(HaveOccurred())
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
 	Expect(err).ToNot(HaveOccurred())
 	Expect(k8sClient).ToNot(BeNil())

pkg/addon/testdata/local/metadata.yaml

@@ -0,0 +1,15 @@
+name: test-local-addon
+version: 1.0.0
+description: This is a addon for test when install addon from local
+icon: https://www.terraform.io/assets/images/logo-text-8c3ba8a6.svg
+url: https://terraform.io/
+
+tags: []
+
+deployTo:
+  control_plane: true
+  runtime_cluster: false
+
+dependencies: []
+
+invisible: false

pkg/addon/testdata/local/resources/parameter.cue

@@ -0,0 +1,4 @@
+parameter: {
+	// test wrong parameter
+	example: *"default"
+}

pkg/addon/type.go

@@ -36,6 +36,7 @@ type UIData struct {
 	Definitions    []ElementFile `json:"definitions"`
 	CUEDefinitions []ElementFile `json:"CUEDefinitions"`
 	Parameters     string        `json:"parameters"`
+	RegistryName   string        `json:"registryName"`
 }
 
 // InstallPackage contains all necessary files that can be installed for an addon

pkg/apiserver/datastore/datastore.go

@@ -41,6 +41,9 @@ var (
 
 	// ErrIndexInvalid Error that entity index is invalid
 	ErrIndexInvalid = NewDBError(fmt.Errorf("entity index is invalid"))
+
+	// ErrEntityInvalid Error that entity is invalid
+	ErrEntityInvalid = NewDBError(fmt.Errorf("entity is invalid"))
 )
 
 // DBError datastore error
@@ -123,13 +126,13 @@ type ListOptions struct {
 
 // DataStore datastore interface
 type DataStore interface {
-	// add entity to database, Name() and TableName() can't return zero value.
+	// Add adds entity to database, Name() and TableName() can't return zero value.
 	Add(ctx context.Context, entity Entity) error
 
-	// batch add entity to database, Name() and TableName() can't return zero value.
-	BatchAdd(ctx context.Context, entitys []Entity) error
+	// BatchAdd will adds batched entities to database, Name() and TableName() can't return zero value.
+	BatchAdd(ctx context.Context, entities []Entity) error
 
-	// Update entity to database, Name() and TableName() can't return zero value.
+	// Put will update entity to database, Name() and TableName() can't return zero value.
 	Put(ctx context.Context, entity Entity) error
 
 	// Delete entity from database, Name() and TableName() can't return zero value.

pkg/apiserver/datastore/kubeapi/kubeapi.go

@@ -59,7 +59,7 @@ func New(ctx context.Context, cfg datastore.Config) (datastore.DataStore, error)
 		if err := kubeClient.Create(ctx, &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:        cfg.Database,
-				Annotations: map[string]string{"description": "For kubevela apiserver metadata storage."},
+				Annotations: map[string]string{"description": "For KubeVela API Server metadata storage."},
 			}}); err != nil {
 			return nil, fmt.Errorf("create namespace failure %w", err)
 		}
@@ -247,10 +247,15 @@ func newBySortOptionConfigMap(items []corev1.ConfigMap, sortBy []datastore.SortO
 		data := item.BinaryData["data"]
 		for _, op := range sortBy {
 			res := gjson.Get(string(data), op.Key)
-			if res.Type == gjson.Number {
+			switch res.Type {
+			case gjson.Number:
 				m[op.Key] = res.Num
-			} else {
-				m[op.Key] = res.Raw
+			default:
+				if !res.Time().IsZero() {
+					m[op.Key] = res.Time()
+				} else {
+					m[op.Key] = res.Raw
+				}
 			}
 		}
 		s.objects[i] = m
@@ -271,25 +276,28 @@ func (b bySortOptionConfigMap) Less(i, j int) bool {
 	for _, op := range b.sortBy {
 		x := b.objects[i][op.Key]
 		y := b.objects[j][op.Key]
-		_x, xok := x.(float64)
-		_y, yok := y.(float64)
-		var lt, gt bool
+		_x, xok := x.(time.Time)
+		_y, yok := y.(time.Time)
+		var xScore, yScore float64
 		if xok && yok {
-			lt, gt = _x < _y, _x > _y
+			xScore = float64(_x.UnixNano())
+			yScore = float64(_y.UnixNano())
 		}
 		if !xok && !yok {
-			lt, gt = x.(string) < y.(string), x.(string) > y.(string)
+			_x, xok := x.(float64)
+			_y, yok := y.(float64)
+			if xok && yok {
+				xScore = _x
+				yScore = _y
+			}
 		}
-		if xok != yok {
-			lt, gt = false, false
-		}
-		if !lt && !gt {
+		if xScore == yScore {
 			continue
 		}
 		if op.Order == datastore.SortOrderAscending {
-			return lt
+			return xScore < yScore
 		}
-		return gt
+		return xScore > yScore
 	}
 	return true
 }

pkg/apiserver/datastore/kubeapi/kubeapi_test.go

@@ -95,14 +95,14 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 	It("Test batch add function", func() {
 		var datas = []datastore.Entity{
 			&model.Application{Name: "kubevela-app-2", Description: "this is demo 2"},
-			&model.Application{Namespace: "test-namespace", Name: "kubevela-app-3", Description: "this is demo 3"},
-			&model.Application{Namespace: "test-namespace2", Name: "kubevela-app-4", Description: "this is demo 4"},
+			&model.Application{Name: "kubevela-app-3", Description: "this is demo 3"},
+			&model.Application{Name: "kubevela-app-4", Description: "this is demo 4"},
 		}
 		err := kubeStore.BatchAdd(context.TODO(), datas)
 		Expect(err).ToNot(HaveOccurred())
 
 		var datas2 = []datastore.Entity{
-			&model.Application{Namespace: "test-namespace", Name: "can-delete", Description: "this is demo can-delete"},
+			&model.Application{Name: "can-delete", Description: "this is demo can-delete"},
 			&model.Application{Name: "kubevela-app-2", Description: "this is demo 2"},
 		}
 		err = kubeStore.BatchAdd(context.TODO(), datas2)
@@ -124,17 +124,17 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 	})
 	It("Test index", func() {
 		var app = model.Application{
-			Namespace: "test",
+			Name: "test",
 		}
 		selector, err := labels.Parse(fmt.Sprintf("table=%s", app.TableName()))
 		Expect(err).ToNot(HaveOccurred())
-		Expect(cmp.Diff(app.Index()["namespace"], "test")).Should(BeEmpty())
+		Expect(cmp.Diff(app.Index()["name"], "test")).Should(BeEmpty())
 		for k, v := range app.Index() {
 			rq, err := labels.NewRequirement(k, selection.Equals, []string{v})
 			Expect(err).ToNot(HaveOccurred())
 			selector = selector.Add(*rq)
 		}
-		Expect(cmp.Diff(selector.String(), "namespace=test,table=vela_application")).Should(BeEmpty())
+		Expect(cmp.Diff(selector.String(), "name=test,table=vela_application")).Should(BeEmpty())
 	})
 	It("Test list function", func() {
 		var app model.Application
@@ -157,12 +157,6 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 		Expect(err).ShouldNot(HaveOccurred())
 		diff = cmp.Diff(len(list), 4)
 		Expect(diff).Should(BeEmpty())
-
-		app.Namespace = "test-namespace"
-		list, err = kubeStore.List(context.TODO(), &app, nil)
-		Expect(err).ShouldNot(HaveOccurred())
-		diff = cmp.Diff(len(list), 1)
-		Expect(diff).Should(BeEmpty())
 	})
 
 	It("Test list clusters with sort and fuzzy query", func() {
@@ -175,14 +169,26 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 			Expect(kubeStore.Add(context.TODO(), &model.Cluster{Name: name})).Should(Succeed())
 			time.Sleep(time.Millisecond * 100)
 		}
-		entities, err := kubeStore.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{SortBy: []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderAscending}}})
+		entities, err := kubeStore.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderAscending}}})
 		Expect(err).Should(Succeed())
 		Expect(len(entities)).Should(Equal(3))
 		for i, name := range []string{"first", "second", "third"} {
 			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
 		}
+
 		entities, err = kubeStore.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
-			SortBy:   []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderDescending}},
+			SortBy:   []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
+			Page:     1,
+			PageSize: 2,
+		})
+		Expect(err).Should(Succeed())
+		Expect(len(entities)).Should(Equal(2))
+		for i, name := range []string{"third", "second"} {
+			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
+		}
+
+		entities, err = kubeStore.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
+			SortBy:   []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
 			Page:     2,
 			PageSize: 2,
 		})
@@ -192,7 +198,7 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
 		}
 		entities, err = kubeStore.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
-			SortBy: []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderDescending}},
+			SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
 			FilterOptions: datastore.FilterOptions{
 				Queries: []datastore.FuzzyQueryOption{{Key: "name", Query: "ir"}},
 			},
@@ -210,11 +216,6 @@ var _ = Describe("Test kubeapi datastore driver", func() {
 		Expect(err).ShouldNot(HaveOccurred())
 		Expect(count).Should(Equal(int64(4)))
 
-		app.Namespace = "test-namespace"
-		count, err = kubeStore.Count(context.TODO(), &app, nil)
-		Expect(err).ShouldNot(HaveOccurred())
-		Expect(count).Should(Equal(int64(1)))
-
 		count, err = kubeStore.Count(context.TODO(), &model.Cluster{}, &datastore.FilterOptions{
 			Queries: []datastore.FuzzyQueryOption{{Key: "name", Query: "ir"}},
 		})

pkg/apiserver/datastore/mongodb/mongodb.go

@@ -37,6 +37,9 @@ type mongodb struct {
 	database string
 }
 
+// PrimaryKey primary key
+const PrimaryKey = "_name"
+
 // New new mongodb datastore instance
 func New(ctx context.Context, cfg datastore.Config) (datastore.DataStore, error) {
 	if !strings.HasPrefix(cfg.URL, "mongodb://") {
@@ -67,8 +70,13 @@ func (m *mongodb) Add(ctx context.Context, entity datastore.Entity) error {
 	if err := m.Get(ctx, entity); err == nil {
 		return datastore.ErrRecordExist
 	}
+	model, err := convertToMap(entity)
+	if err != nil {
+		return datastore.ErrEntityInvalid
+	}
+	model[PrimaryKey] = entity.PrimaryKey()
 	collection := m.client.Database(m.database).Collection(entity.TableName())
-	_, err := collection.InsertOne(ctx, entity)
+	_, err = collection.InsertOne(ctx, model)
 	if err != nil {
 		return datastore.NewDBError(err)
 	}
@@ -203,7 +211,7 @@ func (m *mongodb) List(ctx context.Context, entity datastore.Entity, op *datasto
 	if entity.Index() != nil {
 		for k, v := range entity.Index() {
 			filter = append(filter, bson.E{
-				Key:   k,
+				Key:   strings.ToLower(k),
 				Value: v,
 			})
 		}
@@ -219,7 +227,11 @@ func (m *mongodb) List(ctx context.Context, entity datastore.Entity, op *datasto
 	if op != nil && len(op.SortBy) > 0 {
 		_d := bson.D{}
 		for _, sortOp := range op.SortBy {
-			_d = append(_d, bson.E{Key: strings.ToLower(sortOp.Key), Value: int(sortOp.Order)})
+			key := strings.ToLower(sortOp.Key)
+			if key == "createtime" || key == "updatetime" {
+				key = "basemodel." + key
+			}
+			_d = append(_d, bson.E{Key: key, Value: int(sortOp.Order)})
 		}
 		findOptions.SetSort(_d)
 	}
@@ -275,9 +287,21 @@ func (m *mongodb) Count(ctx context.Context, entity datastore.Entity, filterOpti
 }
 
 func makeNameFilter(name string) bson.D {
-	return bson.D{{Key: "name", Value: name}}
+	return bson.D{{Key: PrimaryKey, Value: name}}
 }
 
 func makeEntityUpdate(entity interface{}) bson.M {
 	return bson.M{"$set": entity}
 }
+
+func convertToMap(model interface{}) (bson.M, error) {
+	b, err := bson.Marshal(model)
+	if err != nil {
+		return nil, err
+	}
+	var re = make(bson.M)
+	if err := bson.Unmarshal(b, &re); err != nil {
+		return nil, err
+	}
+	return re, nil
+}

pkg/apiserver/datastore/mongodb/mongodb_test.go

@@ -26,6 +26,8 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver/datastore"
 	"github.com/oam-dev/kubevela/pkg/apiserver/model"
@@ -35,7 +37,11 @@ var mongodbDriver datastore.DataStore
 var _ = BeforeSuite(func(done Done) {
 	rand.Seed(time.Now().UnixNano())
 	By("bootstrapping mongodb test environment")
-	var err error
+	clientOpts := options.Client().ApplyURI("mongodb://localhost:27017")
+	client, err := mongo.Connect(context.TODO(), clientOpts)
+	Expect(err).ToNot(HaveOccurred())
+	client.Database("kubevela").Drop(context.TODO())
+
 	mongodbDriver, err = New(context.TODO(), datastore.Config{
 		URL:      "mongodb://localhost:27017",
 		Database: "kubevela",
@@ -63,14 +69,16 @@ var _ = Describe("Test mongodb datastore driver", func() {
 	It("Test batch add function", func() {
 		var datas = []datastore.Entity{
 			&model.Application{Name: "kubevela-app-2", Description: "this is demo 2"},
-			&model.Application{Namespace: "test-namespace", Name: "kubevela-app-3", Description: "this is demo 3"},
-			&model.Application{Namespace: "test-namespace2", Name: "kubevela-app-4", Description: "this is demo 4"},
+			&model.Application{Name: "kubevela-app-3", Description: "this is demo 3"},
+			&model.Application{Name: "kubevela-app-4", Description: "this is demo 4"},
+			&model.Workflow{Name: "kubevela-app-workflow", AppPrimaryKey: "kubevela-app-2", Description: "this is workflow"},
+			&model.ApplicationTrigger{Name: "kubevela-app-trigger", AppPrimaryKey: "kubevela-app-2", Token: "token-test", Description: "this is demo 4"},
 		}
 		err := mongodbDriver.BatchAdd(context.TODO(), datas)
 		Expect(err).ToNot(HaveOccurred())
 
 		var datas2 = []datastore.Entity{
-			&model.Application{Namespace: "test-namespace", Name: "can-delete", Description: "this is demo can-delete"},
+			&model.Application{Name: "can-delete", Description: "this is demo can-delete"},
 			&model.Application{Name: "kubevela-app-2", Description: "this is demo 2"},
 		}
 		err = mongodbDriver.BatchAdd(context.TODO(), datas2)
@@ -84,6 +92,12 @@ var _ = Describe("Test mongodb datastore driver", func() {
 		Expect(err).Should(BeNil())
 		diff := cmp.Diff(app.Description, "default")
 		Expect(diff).Should(BeEmpty())
+
+		workflow := &model.Workflow{Name: "kubevela-app-workflow", AppPrimaryKey: "kubevela-app-2"}
+		err = mongodbDriver.Get(context.TODO(), workflow)
+		Expect(err).Should(BeNil())
+		diff = cmp.Diff(workflow.Description, "this is workflow")
+		Expect(diff).Should(BeEmpty())
 	})
 
 	It("Test put function", func() {
@@ -112,8 +126,10 @@ var _ = Describe("Test mongodb datastore driver", func() {
 		diff = cmp.Diff(len(list), 4)
 		Expect(diff).Should(BeEmpty())
 
-		app.Namespace = "test-namespace"
-		list, err = mongodbDriver.List(context.TODO(), &app, nil)
+		var workflow = model.Workflow{
+			AppPrimaryKey: "kubevela-app-2",
+		}
+		list, err = mongodbDriver.List(context.TODO(), &workflow, nil)
 		Expect(err).ShouldNot(HaveOccurred())
 		diff = cmp.Diff(len(list), 1)
 		Expect(diff).Should(BeEmpty())
@@ -129,14 +145,25 @@ var _ = Describe("Test mongodb datastore driver", func() {
 			Expect(mongodbDriver.Add(context.TODO(), &model.Cluster{Name: name})).Should(Succeed())
 			time.Sleep(time.Millisecond * 100)
 		}
-		entities, err := mongodbDriver.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{SortBy: []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderAscending}}})
+		entities, err := mongodbDriver.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
+			SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderAscending}}})
 		Expect(err).Should(Succeed())
 		Expect(len(entities)).Should(Equal(3))
 		for i, name := range []string{"first", "second", "third"} {
 			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
 		}
 		entities, err = mongodbDriver.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
-			SortBy:   []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderDescending}},
+			SortBy:   []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
+			Page:     1,
+			PageSize: 2,
+		})
+		Expect(err).Should(Succeed())
+		Expect(len(entities)).Should(Equal(2))
+		for i, name := range []string{"third", "second"} {
+			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
+		}
+		entities, err = mongodbDriver.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
+			SortBy:   []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
 			Page:     2,
 			PageSize: 2,
 		})
@@ -146,7 +173,7 @@ var _ = Describe("Test mongodb datastore driver", func() {
 			Expect(entities[i].(*model.Cluster).Name).Should(Equal(name))
 		}
 		entities, err = mongodbDriver.List(context.TODO(), &model.Cluster{}, &datastore.ListOptions{
-			SortBy: []datastore.SortOption{{Key: "model.createTime", Order: datastore.SortOrderDescending}},
+			SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}},
 			FilterOptions: datastore.FilterOptions{
 				Queries: []datastore.FuzzyQueryOption{{Key: "name", Query: "ir"}},
 			},
@@ -164,11 +191,6 @@ var _ = Describe("Test mongodb datastore driver", func() {
 		Expect(err).ShouldNot(HaveOccurred())
 		Expect(count).Should(Equal(int64(4)))
 
-		app.Namespace = "test-namespace"
-		count, err = mongodbDriver.Count(context.TODO(), &app, nil)
-		Expect(err).ShouldNot(HaveOccurred())
-		Expect(count).Should(Equal(int64(1)))
-
 		count, err = mongodbDriver.Count(context.TODO(), &model.Cluster{}, &datastore.FilterOptions{
 			Queries: []datastore.FuzzyQueryOption{{Key: "name", Query: "ir"}},
 		})
@@ -213,5 +235,13 @@ var _ = Describe("Test mongodb datastore driver", func() {
 		err = mongodbDriver.Delete(context.TODO(), &app)
 		equal := cmp.Equal(err, datastore.ErrRecordNotExist, cmpopts.EquateErrors())
 		Expect(equal).Should(BeTrue())
+
+		workflow := model.Workflow{Name: "kubevela-app-workflow", AppPrimaryKey: "kubevela-app-2", Description: "this is workflow"}
+		err = mongodbDriver.Delete(context.TODO(), &workflow)
+		Expect(err).ShouldNot(HaveOccurred())
+
+		trigger := model.ApplicationTrigger{Name: "kubevela-app-trigger", AppPrimaryKey: "kubevela-app-2", Token: "token-test", Description: "this is demo 4"}
+		err = mongodbDriver.Delete(context.TODO(), &trigger)
+		Expect(err).ShouldNot(HaveOccurred())
 	})
 })

pkg/apiserver/model/application.go

@@ -24,16 +24,15 @@ import (
 )
 
 func init() {
-	RegistModel(&ApplicationComponent{}, &ApplicationPolicy{}, &Application{}, &ApplicationRevision{})
+	RegistModel(&ApplicationComponent{}, &ApplicationPolicy{}, &Application{}, &ApplicationRevision{}, &ApplicationTrigger{})
 }
 
 // Application application delivery model
 type Application struct {
-	Model
+	BaseModel
 	Name        string            `json:"name"`
 	Alias       string            `json:"alias"`
 	Project     string            `json:"project"`
-	Namespace   string            `json:"namespace"`
 	Description string            `json:"description"`
 	Icon        string            `json:"icon"`
 	Labels      map[string]string `json:"labels,omitempty"`
@@ -55,9 +54,6 @@ func (a *Application) Index() map[string]string {
 	if a.Name != "" {
 		index["name"] = a.Name
 	}
-	if a.Namespace != "" {
-		index["namespace"] = a.Namespace
-	}
 	if a.Project != "" {
 		index["project"] = a.Project
 	}
@@ -78,7 +74,7 @@ type ComponentSelector struct {
 
 // ApplicationComponent component database model
 type ApplicationComponent struct {
-	Model
+	BaseModel
 	AppPrimaryKey string            `json:"appPrimaryKey"`
 	Description   string            `json:"description,omitempty"`
 	Labels        map[string]string `json:"labels,omitempty"`
@@ -128,7 +124,7 @@ func (a *ApplicationComponent) Index() map[string]string {
 
 // ApplicationPolicy app policy
 type ApplicationPolicy struct {
-	Model
+	BaseModel
 	AppPrimaryKey string      `json:"appPrimaryKey"`
 	Name          string      `json:"name"`
 	Description   string      `json:"description"`
@@ -192,7 +188,7 @@ var RevisionStatusRollback = "rollback"
 
 // ApplicationRevision be created when an application initiates deployment and describes the phased version of the application.
 type ApplicationRevision struct {
-	Model
+	BaseModel
 	AppPrimaryKey   string `json:"appPrimaryKey"`
 	Version         string `json:"version"`
 	RollbackVersion string `json:"rollbackVersion,omitempty"`
@@ -215,6 +211,58 @@ type ApplicationRevision struct {
 	WorkflowName string `json:"workflowName"`
 	// EnvName is the env name of this application revision
 	EnvName string `json:"envName"`
+	// CodeInfo is the code info of this application revision
+	CodeInfo *CodeInfo `json:"codeInfo,omitempty"`
+	// ImageInfo is the image info of this application revision
+	ImageInfo *ImageInfo `json:"imageInfo,omitempty"`
+}
+
+// CodeInfo is the code info for webhook request
+type CodeInfo struct {
+	// Commit is the commit hash
+	Commit string `json:"commit,omitempty"`
+	// Branch is the branch name
+	Branch string `json:"branch,omitempty"`
+	// User is the user name
+	User string `json:"user,omitempty"`
+}
+
+// ImageInfo is the image info for webhook request
+type ImageInfo struct {
+	// Type is the image type, ACR or Harbor or DockerHub
+	Type string `json:"type"`
+	// Resource is the image resource
+	Resource *ImageResource `json:"resource,omitempty"`
+	// Repository is the image repository
+	Repository *ImageRepository `json:"repository,omitempty"`
+}
+
+// ImageResource is the image resource
+type ImageResource struct {
+	// Digest is the image digest
+	Digest string `json:"digest"`
+	// Tag is the image tag
+	Tag string `json:"tag"`
+	// URL is the image url
+	URL string `json:"url"`
+	// CreateTime is the image create time
+	CreateTime time.Time `json:"createTime,omitempty"`
+}
+
+// ImageRepository is the image repository
+type ImageRepository struct {
+	// Name is the image repository name
+	Name string `json:"name"`
+	// Namespace is the image repository namespace
+	Namespace string `json:"namespace"`
+	// FullName is the image repository full name
+	FullName string `json:"fullName"`
+	// Region is the image repository region
+	Region string `json:"region,omitempty"`
+	// Type is the image repository type, public or private
+	Type string `json:"type"`
+	// CreateTime is the image repository create time
+	CreateTime time.Time `json:"createTime,omitempty"`
 }
 
 // TableName return custom table name
@@ -253,3 +301,73 @@ func (a *ApplicationRevision) Index() map[string]string {
 	}
 	return index
 }
+
+// ApplicationTrigger is the model for trigger
+type ApplicationTrigger struct {
+	BaseModel
+	AppPrimaryKey string `json:"appPrimaryKey"`
+	WorkflowName  string `json:"workflowName,omitempty"`
+	Name          string `json:"name"`
+	Alias         string `json:"alias,omitempty"`
+	Description   string `json:"description,omitempty"`
+	Token         string `json:"token"`
+	Type          string `json:"type"`
+	PayloadType   string `json:"payloadType"`
+}
+
+const (
+	// PayloadTypeCustom is the payload type custom
+	PayloadTypeCustom = "custom"
+	// PayloadTypeDockerhub is the payload type dockerhub
+	PayloadTypeDockerhub = "dockerhub"
+	// PayloadTypeACR is the payload type acr
+	PayloadTypeACR = "acr"
+	// PayloadTypeHarbor is the payload type harbor
+	PayloadTypeHarbor = "harbor"
+	// PayloadTypeJFrog is the payload type jfrog
+	PayloadTypeJFrog = "jfrog"
+
+	// ComponentTypeWebservice is the component type webservice
+	ComponentTypeWebservice = "webservice"
+	// ComponentTypeWorker is the component type worker
+	ComponentTypeWorker = "worker"
+	// ComponentTypeTask is the component type task
+	ComponentTypeTask = "task"
+)
+
+const (
+	// HarborEventTypePushArtifact is the event type PUSH_ARTIFACT
+	HarborEventTypePushArtifact = "PUSH_ARTIFACT"
+	// JFrogEventTypePush is push event type of jfrog webhook
+	JFrogEventTypePush = "pushed"
+	// JFrogDomainDocker is webhook domain of jfrog docker
+	JFrogDomainDocker = "docker"
+)
+
+// TableName return custom table name
+func (w *ApplicationTrigger) TableName() string {
+	return tableNamePrefix + "trigger"
+}
+
+// PrimaryKey return custom primary key
+func (w *ApplicationTrigger) PrimaryKey() string {
+	return w.Token
+}
+
+// Index return custom index
+func (w *ApplicationTrigger) Index() map[string]string {
+	index := make(map[string]string)
+	if w.AppPrimaryKey != "" {
+		index["appPrimaryKey"] = w.AppPrimaryKey
+	}
+	if w.Token != "" {
+		index["token"] = w.Token
+	}
+	if w.Name != "" {
+		index["name"] = w.Name
+	}
+	if w.Type != "" {
+		index["type"] = w.Type
+	}
+	return index
+}

pkg/apiserver/model/cluster.go

@@ -52,7 +52,7 @@ var (
 
 // Cluster describes the model of cluster in apiserver
 type Cluster struct {
-	Model            `json:"model"`
+	BaseModel
 	Name             string            `json:"name"`
 	Alias            string            `json:"alias"`
 	Description      string            `json:"description"`

pkg/apiserver/model/env.go

@@ -0,0 +1,63 @@
+/*
+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 model
+
+func init() {
+	RegistModel(&Env{})
+}
+
+// Env models the data of env in database
+type Env struct {
+	BaseModel
+	Name        string `json:"name"`
+	Alias       string `json:"alias"`
+	Description string `json:"description,omitempty"`
+
+	// Project defines the project this Env belongs to
+	Project string `json:"project"`
+	// Namespace defines the K8s namespace of the Env in control plane
+	Namespace string `json:"namespace"`
+
+	// Targets defines the name of delivery target that belongs to this env
+	// In one project, a delivery target can only belong to one env.
+	Targets []string `json:"targets,omitempty"`
+}
+
+// TableName return custom table name
+func (p *Env) TableName() string {
+	return tableNamePrefix + "env"
+}
+
+// PrimaryKey return custom primary key
+func (p *Env) PrimaryKey() string {
+	return p.Name
+}
+
+// Index return custom index
+func (p *Env) Index() map[string]string {
+	index := make(map[string]string)
+	if p.Name != "" {
+		index["name"] = p.Name
+	}
+	if p.Namespace != "" {
+		index["namespace"] = p.Namespace
+	}
+	if p.Project != "" {
+		index["project"] = p.Project
+	}
+	return index
+}

pkg/apiserver/model/envbinding.go

@@ -24,14 +24,25 @@ func init() {
 
 // EnvBinding application env binding
 type EnvBinding struct {
-	Model
-	AppPrimaryKey     string             `json:"appPrimaryKey"`
-	Name              string             `json:"name"`
-	Alias             string             `json:"alias"`
-	Description       string             `json:"description,omitempty"`
-	TargetNames       []string           `json:"targetNames"`
-	ComponentSelector *ComponentSelector `json:"componentSelector"`
-	//TODO: componentPatchs
+	BaseModel
+	AppPrimaryKey   string           `json:"appPrimaryKey"`
+	Name            string           `json:"name"`
+	ComponentsPatch []ComponentPatch `json:"componentsPatchs"`
+}
+
+// ComponentPatch Define differential patches for components in the environment.
+type ComponentPatch struct {
+	Name        string       `json:"name"`
+	Properties  *JSONStruct  `json:"properties,omitempty"`
+	Disable     bool         `json:"disable"`
+	TraitsPatch []TraitPatch `json:"traitsPatch,omitempty"`
+}
+
+// TraitPatch Define differential patches for traits in the environment.
+type TraitPatch struct {
+	Type       string      `json:"type"`
+	Properties *JSONStruct `json:"properties,omitempty"`
+	Disable    bool        `json:"disable"`
 }
 
 // TableName return custom table name