Fix: rollout workload namespace not aligned with rollout (#3107)

Signed-off-by: Somefive <yd219913@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 }}

.gitignore

@@ -41,6 +41,7 @@ references/cmd/cli/fake/source.go
 references/cmd/cli/fake/chart_source.go
 charts/vela-core/crds/_.yaml
 .test_vela
+tmp/
 
 .vela/
 

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
@@ -53,7 +13,7 @@ test: vet lint staticcheck unit-test-core
 	@$(OK) unit-tests pass
 
 unit-test-core:
-	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... | grep -v apiserver)
+	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... ./apis/... | grep -v apiserver)
 	go test $(shell go list ./references/... | grep -v apiserver)
 unit-test-apiserver:
 	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/...  | grep -E 'apiserver|velaql')
@@ -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,89 +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) --set multicluster.enabled=true --wait kubevela ./charts/vela-core
-	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
-
-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
-	bin/vela addon enable fluxcd
-	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 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))
@@ -234,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:
@@ -263,26 +102,8 @@ 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 addon
+manifests: installcue kustomize
 	go generate $(foreach t,pkg apis,./$(t)/...)
 	# TODO(yangsoon): kustomize will merge all CRD into a whole file, it may not work if we want patch more than one CRD in this way
 	$(KUSTOMIZE) build config/crd -o config/crd/base/core.oam.dev_applications.yaml
@@ -291,82 +112,13 @@ manifests: installcue kustomize addon
 	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
@@ -374,6 +126,3 @@ check-license-header:
 def-install:
 	./hack/utils/installdefinition.sh
 
-# generate addons to auto-gen and charts
-addon:
-	go run ./vela-templates/gen_addons.go

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

@@ -21,6 +21,7 @@ import (
 	"errors"
 
 	"github.com/oam-dev/terraform-controller/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -28,6 +29,7 @@ import (
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 // Kube defines the encapsulation in raw Kubernetes resource format
@@ -191,12 +193,16 @@ const (
 	ApplicationRunning ApplicationPhase = "running"
 	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
 	ApplicationUnhealthy ApplicationPhase = "unhealthy"
+	// ApplicationDeleting means application is being deleted
+	ApplicationDeleting ApplicationPhase = "deleting"
 )
 
 // WorkflowState is a string that mark the workflow state
 type WorkflowState string
 
 const (
+	// WorkflowStateInitializing means the workflow is in initial state
+	WorkflowStateInitializing WorkflowState = "initializing"
 	// WorkflowStateTerminated means workflow is terminated manually, and it won't be started unless the spec changed.
 	WorkflowStateTerminated WorkflowState = "terminated"
 	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
@@ -283,8 +289,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
@@ -293,6 +297,7 @@ type AppStatus struct {
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`
 
+	// Deprecated
 	// ResourceTracker record the status of the ResourceTracker
 	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
 
@@ -322,6 +327,7 @@ type PolicyStatus struct {
 type WorkflowStatus struct {
 	AppRevision string       `json:"appRevision,omitempty"`
 	Mode        WorkflowMode `json:"mode"`
+	Message     string       `json:"message,omitempty"`
 
 	Suspend    bool `json:"suspend"`
 	Terminated bool `json:"terminated"`
@@ -346,7 +352,7 @@ type WorkflowStepPhase string
 const (
 	// WorkflowStepPhaseSucceeded will make the controller run the next step.
 	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
-	// WorkflowStepPhaseFailed will make the controller stop the workflow and report error in `message`.
+	// WorkflowStepPhaseFailed will report error in `message`.
 	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
 	// WorkflowStepPhaseStopped will make the controller stop the workflow.
 	WorkflowStepPhaseStopped WorkflowStepPhase = "stopped"
@@ -476,6 +482,48 @@ const (
 	WorkflowResourceCreator ResourceCreatorRole = "workflow"
 )
 
+// OAMObjectReference defines the object reference for an oam resource
+type OAMObjectReference struct {
+	Component string `json:"component,omitempty"`
+	Trait     string `json:"trait,omitempty"`
+	Env       string `json:"env,omitempty"`
+}
+
+// Equal check if two references are equal
+func (in OAMObjectReference) Equal(r OAMObjectReference) bool {
+	return in.Component == r.Component && in.Trait == r.Trait && in.Env == r.Env
+}
+
+// AddLabelsToObject add labels to object if properties are not empty
+func (in OAMObjectReference) AddLabelsToObject(obj client.Object) {
+	labels := obj.GetLabels()
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	if in.Component != "" {
+		labels[oam.LabelAppComponent] = in.Component
+	}
+	if in.Trait != "" {
+		labels[oam.TraitTypeLabel] = in.Trait
+	}
+	if in.Env != "" {
+		labels[oam.LabelAppEnv] = in.Env
+	}
+	obj.SetLabels(labels)
+}
+
+// NewOAMObjectReferenceFromObject create OAMObjectReference from object
+func NewOAMObjectReferenceFromObject(obj client.Object) OAMObjectReference {
+	if labels := obj.GetLabels(); labels != nil {
+		return OAMObjectReference{
+			Component: labels[oam.LabelAppComponent],
+			Trait:     labels[oam.TraitTypeLabel],
+			Env:       labels[oam.LabelAppEnv],
+		}
+	}
+	return OAMObjectReference{}
+}
+
 // ClusterObjectReference defines the object reference with cluster.
 type ClusterObjectReference struct {
 	Cluster                string              `json:"cluster,omitempty"`

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

@@ -0,0 +1,60 @@
+/*
+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 common
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+func TestOAMObjectReference(t *testing.T) {
+	r := require.New(t)
+	o1 := OAMObjectReference{
+		Component: "component",
+		Trait:     "trait",
+		Env:       "env",
+	}
+	obj := &unstructured.Unstructured{}
+	o2 := NewOAMObjectReferenceFromObject(obj)
+	r.False(o2.Equal(o1))
+	o1.AddLabelsToObject(obj)
+	r.Equal(3, len(obj.GetLabels()))
+	o3 := NewOAMObjectReferenceFromObject(obj)
+	r.True(o1.Equal(o3))
+	o3.Component = "comp"
+	r.False(o3.Equal(o1))
+
+	r.True(o1.Equal(*o1.DeepCopy()))
+	o4 := OAMObjectReference{}
+	o1.DeepCopyInto(&o4)
+	r.True(o4.Equal(o1))
+}
+
+func TestClusterObjectReference(t *testing.T) {
+	r := require.New(t)
+	o1 := ClusterObjectReference{
+		Cluster:         "cluster",
+		ObjectReference: v1.ObjectReference{Kind: "kind"},
+	}
+	o2 := *o1.DeepCopy()
+	r.True(o1.Equal(o2))
+	o2.Cluster = "c"
+	r.False(o2.Equal(o1))
+}

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))
@@ -407,6 +402,21 @@ func (in *KubeParameter) DeepCopy() *KubeParameter {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OAMObjectReference) DeepCopyInto(out *OAMObjectReference) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OAMObjectReference.
+func (in *OAMObjectReference) DeepCopy() *OAMObjectReference {
+	if in == nil {
+		return nil
+	}
+	out := new(OAMObjectReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PolicyStatus) DeepCopyInto(out *PolicyStatus) {
 	*out = *in

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

@@ -0,0 +1,27 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+const (
+	// ApplyOncePolicyType refers to the type of configuration drift policy
+	ApplyOncePolicyType = "apply-once"
+)
+
+// ApplyOncePolicySpec defines the spec of preventing configuration drift
+type ApplyOncePolicySpec struct {
+	Enable bool `json:"enable"`
+}

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

@@ -25,9 +25,6 @@ import (
 const (
 	// EnvBindingPolicyType refers to the type of EnvBinding
 	EnvBindingPolicyType = "env-binding"
-
-	// GarbageCollectPolicyType refers to the type of garbage-collect
-	GarbageCollectPolicyType = "garbage-collect"
 )
 
 // EnvTraitPatch is the patch to trait
@@ -48,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/v1alpha1/garbagecollect_types.go

@@ -0,0 +1,81 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
+)
+
+const (
+	// GarbageCollectPolicyType refers to the type of garbage-collect
+	GarbageCollectPolicyType = "garbage-collect"
+)
+
+// GarbageCollectPolicySpec defines the spec of configuration drift
+type GarbageCollectPolicySpec struct {
+	// KeepLegacyResource if is set, outdated versioned resourcetracker will not be recycled automatically
+	// outdated resources will be kept until resourcetracker be deleted manually
+	KeepLegacyResource bool `json:"keepLegacyResource,omitempty"`
+
+	// Rules defines list of rules to control gc strategy at resource level
+	// if one resource is controlled by multiple rules, first rule will be used
+	Rules []GarbageCollectPolicyRule `json:"rules,omitempty"`
+}
+
+// GarbageCollectPolicyRule defines a single garbage-collect policy rule
+type GarbageCollectPolicyRule struct {
+	Selector GarbageCollectPolicyRuleSelector `json:"selector"`
+	Strategy GarbageCollectStrategy           `json:"strategy"`
+}
+
+// GarbageCollectPolicyRuleSelector select the targets of the rule
+type GarbageCollectPolicyRuleSelector struct {
+	TraitTypes []string `json:"traitTypes"`
+}
+
+// GarbageCollectStrategy the strategy for target resource to recycle
+type GarbageCollectStrategy string
+
+const (
+	// GarbageCollectStrategyNever do not recycle target resource, leave it
+	GarbageCollectStrategyNever GarbageCollectStrategy = "never"
+	// GarbageCollectStrategyOnAppDelete do not recycle target resource until application is deleted
+	// this means the resource will be kept even it is not used in the latest version
+	GarbageCollectStrategyOnAppDelete GarbageCollectStrategy = "onAppDelete"
+	// GarbageCollectStrategyOnAppUpdate recycle target resource when it is not inUse
+	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
+)
+
+// FindStrategy find gc strategy for target resource
+func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
+	for _, rule := range in.Rules {
+		var traitType string
+		if manifest.GetLabels() != nil {
+			traitType = manifest.GetLabels()[oam.TraitTypeLabel]
+		}
+		if traitType != "" {
+			for _, _traitType := range rule.Selector.TraitTypes {
+				if _traitType == traitType {
+					return &rule.Strategy
+				}
+			}
+		}
+	}
+	return nil
+}

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

@@ -0,0 +1,83 @@
+/*
+Copyright 2021 The KubeVela Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
+)
+
+func TestGarbageCollectPolicySpec_FindStrategy(t *testing.T) {
+	testCases := map[string]struct {
+		rules          []GarbageCollectPolicyRule
+		input          *unstructured.Unstructured
+		notFound       bool
+		expectStrategy GarbageCollectStrategy
+	}{
+		"trait rule match": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input: &unstructured.Unstructured{Object: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
+				},
+			}},
+			expectStrategy: GarbageCollectStrategyNever,
+		},
+		"trait rule mismatch": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input:    &unstructured.Unstructured{Object: map[string]interface{}{}},
+			notFound: true,
+		},
+		"trait rule multiple match": {
+			rules: []GarbageCollectPolicyRule{{
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyOnAppDelete,
+			}, {
+				Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"a"}},
+				Strategy: GarbageCollectStrategyNever,
+			}},
+			input: &unstructured.Unstructured{Object: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{oam.TraitTypeLabel: "a"},
+				},
+			}},
+			expectStrategy: GarbageCollectStrategyOnAppDelete,
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			r := require.New(t)
+			spec := GarbageCollectPolicySpec{Rules: tc.rules}
+			strategy := spec.FindStrategy(tc.input)
+			if tc.notFound {
+				r.Nil(strategy)
+			} else {
+				r.Equal(tc.expectStrategy, *strategy)
+			}
+		})
+	}
+}

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

@@ -26,6 +26,21 @@ import (
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplyOncePolicySpec) DeepCopyInto(out *ApplyOncePolicySpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplyOncePolicySpec.
+func (in *ApplyOncePolicySpec) DeepCopy() *ApplyOncePolicySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplyOncePolicySpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterConnection) DeepCopyInto(out *ClusterConnection) {
 	*out = *in
@@ -246,6 +261,64 @@ func (in *EnvTraitPatch) DeepCopy() *EnvTraitPatch {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicyRule) DeepCopyInto(out *GarbageCollectPolicyRule) {
+	*out = *in
+	in.Selector.DeepCopyInto(&out.Selector)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRule.
+func (in *GarbageCollectPolicyRule) DeepCopy() *GarbageCollectPolicyRule {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicyRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicyRuleSelector) DeepCopyInto(out *GarbageCollectPolicyRuleSelector) {
+	*out = *in
+	if in.TraitTypes != nil {
+		in, out := &in.TraitTypes, &out.TraitTypes
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRuleSelector.
+func (in *GarbageCollectPolicyRuleSelector) DeepCopy() *GarbageCollectPolicyRuleSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicyRuleSelector)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GarbageCollectPolicySpec) DeepCopyInto(out *GarbageCollectPolicySpec) {
+	*out = *in
+	if in.Rules != nil {
+		in, out := &in.Rules, &out.Rules
+		*out = make([]GarbageCollectPolicyRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicySpec.
+func (in *GarbageCollectPolicySpec) DeepCopy() *GarbageCollectPolicySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(GarbageCollectPolicySpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NamespaceSelector) DeepCopyInto(out *NamespaceSelector) {
 	*out = *in

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

@@ -22,7 +22,6 @@ import (
 
 	"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 +85,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

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.go

@@ -1,146 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/interfaces"
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// An ResourceTracker represents a tracker for track cross namespace resources
-// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
-type ResourceTracker struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Status ResourceTrackerStatus `json:"status,omitempty"`
-}
-
-// ResourceTrackerStatus define the status of resourceTracker
-type ResourceTrackerStatus struct {
-	TrackedResources []common.ClusterObjectReference `json:"trackedResources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ResourceTrackerList contains a list of ResourceTracker
-type ResourceTrackerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ResourceTracker `json:"items"`
-}
-
-// ToOwnerReference convert ResourceTracker into owner reference for other resource to refer
-func (in *ResourceTracker) ToOwnerReference() *metav1.OwnerReference {
-	return &metav1.OwnerReference{
-		APIVersion:         SchemeGroupVersion.String(),
-		Kind:               ResourceTrackerKind,
-		Name:               in.Name,
-		UID:                in.UID,
-		Controller:         pointer.BoolPtr(true),
-		BlockOwnerDeletion: pointer.BoolPtr(true),
-	}
-}
-
-// AddOwnerReferenceToTrackerResource add resourcetracker as owner reference to target object, return true if already exists (outdated)
-func (in *ResourceTracker) AddOwnerReferenceToTrackerResource(rsc interfaces.ObjectOwner) bool {
-	ownerRefs := []metav1.OwnerReference{*in.ToOwnerReference()}
-	exists := false
-	for _, owner := range rsc.GetOwnerReferences() {
-		// delete the old resourceTracker owner
-		if owner.Kind == ResourceTrackerKind && owner.APIVersion == SchemeGroupVersion.String() {
-			exists = true
-			continue
-		}
-		if owner.Controller != nil && *owner.Controller && owner.UID != in.UID {
-			owner.Controller = pointer.BoolPtr(false)
-		}
-		ownerRefs = append(ownerRefs, owner)
-	}
-	rsc.SetOwnerReferences(ownerRefs)
-	return exists
-}
-
-func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectReference) bool {
-	for _, _rsc := range in.Status.TrackedResources {
-		if _rsc.Equal(ref) {
-			return true
-		}
-	}
-	in.Status.TrackedResources = append(in.Status.TrackedResources, ref)
-	return false
-}
-
-// AddTrackedResource add new object reference into tracked resources, return if already exists
-func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
-	return in.addClusterObjectReference(common.ClusterObjectReference{
-		ObjectReference: v1.ObjectReference{
-			APIVersion: rsc.GetAPIVersion(),
-			Kind:       rsc.GetKind(),
-			Name:       rsc.GetName(),
-			Namespace:  rsc.GetNamespace(),
-			UID:        rsc.GetUID(),
-		},
-	})
-}
-
-// AddTrackedCluster add resourcetracker in remote cluster into tracked resources, return if already exists
-func (in *ResourceTracker) AddTrackedCluster(clusterName string) bool {
-	if clusterName == "" {
-		return true
-	}
-	return in.addClusterObjectReference(common.ClusterObjectReference{
-		Cluster: clusterName,
-		ObjectReference: v1.ObjectReference{
-			APIVersion: SchemeGroupVersion.String(),
-			Kind:       ResourceTrackerKind,
-			Name:       in.GetName(),
-		},
-	})
-}
-
-// GetTrackedClusters return remote clusters recorded in the resource tracker
-func (in *ResourceTracker) GetTrackedClusters() (clusters []string) {
-	for _, ref := range in.Status.TrackedResources {
-		if ref.APIVersion == SchemeGroupVersion.String() && ref.Kind == ResourceTrackerKind && ref.Name == in.Name && ref.Cluster != "" {
-			clusters = append(clusters, ref.Cluster)
-		}
-	}
-	return
-}
-
-// IsLifeLong check if resourcetracker shares the same whole life with the entire application
-func (in *ResourceTracker) IsLifeLong() bool {
-	_, ok := in.GetAnnotations()[oam.AnnotationResourceTrackerLifeLong]
-	return ok
-}
-
-// SetLifeLong set life long to resource tracker
-func (in *ResourceTracker) SetLifeLong() {
-	in.SetAnnotations(map[string]string{oam.AnnotationResourceTrackerLifeLong: "true"})
-}

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

@@ -0,0 +1,278 @@
+/*
+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 (
+	"encoding/json"
+	"reflect"
+	"strings"
+
+	errors2 "github.com/pkg/errors"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/interfaces"
+	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/utils/errors"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// An ResourceTracker represents a tracker for track cross namespace resources
+// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.type`
+// +kubebuilder:printcolumn:name="APP",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/name']`
+// +kubebuilder:printcolumn:name="APP-NS",type=string,JSONPath=`.metadata.labels['app\.oam\.dev\/namespace']`
+// +kubebuilder:printcolumn:name="APP-GEN",type=number,JSONPath=`.spec.applicationGeneration`
+// +kubebuilder:resource:scope=Cluster,categories={oam},shortName=rt
+type ResourceTracker struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ResourceTrackerSpec   `json:"spec,omitempty"`
+	Status ResourceTrackerStatus `json:"status,omitempty"`
+}
+
+// ResourceTrackerType defines the type of resourceTracker
+type ResourceTrackerType string
+
+const (
+	// ResourceTrackerTypeRoot means resources in this resourceTracker will only be recycled when application is deleted
+	ResourceTrackerTypeRoot = ResourceTrackerType("root")
+	// ResourceTrackerTypeVersioned means resources in this resourceTracker will be recycled when this version is unused and this resource is not managed by latest RT
+	ResourceTrackerTypeVersioned = ResourceTrackerType("versioned")
+	// ResourceTrackerTypeComponentRevision stores all component revisions used
+	ResourceTrackerTypeComponentRevision = ResourceTrackerType("component-revision")
+)
+
+// ResourceTrackerSpec define the spec of resourceTracker
+type ResourceTrackerSpec struct {
+	Type                  ResourceTrackerType `json:"type,omitempty"`
+	ApplicationGeneration int64               `json:"applicationGeneration"`
+	ManagedResources      []ManagedResource   `json:"managedResources,omitempty"`
+}
+
+// ManagedResource define the resource to be managed by ResourceTracker
+type ManagedResource struct {
+	common.ClusterObjectReference `json:",inline"`
+	common.OAMObjectReference     `json:",inline"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Data *runtime.RawExtension `json:"raw,omitempty"`
+	// Deleted marks the resource to be deleted
+	Deleted bool `json:"deleted,omitempty"`
+}
+
+// Equal check if two managed resource equals
+func (in ManagedResource) Equal(r ManagedResource) bool {
+	if !in.ClusterObjectReference.Equal(r.ClusterObjectReference) {
+		return false
+	}
+	if !in.OAMObjectReference.Equal(r.OAMObjectReference) {
+		return false
+	}
+	return reflect.DeepEqual(in.Data, r.Data)
+}
+
+// DisplayName readable name for locating resource
+func (in ManagedResource) DisplayName() string {
+	s := in.Kind + " " + in.Name
+	if in.Namespace != "" || in.Cluster != "" {
+		s += " ("
+		if in.Cluster != "" {
+			s += "Cluster: " + in.Cluster
+			if in.Namespace != "" {
+				s += ", "
+			}
+		}
+		if in.Namespace != "" {
+			s += "Namespace: " + in.Namespace
+		}
+		s += ")"
+	}
+	return s
+}
+
+// NamespacedName namespacedName
+func (in ManagedResource) NamespacedName() types.NamespacedName {
+	return types.NamespacedName{Namespace: in.Namespace, Name: in.Name}
+}
+
+// ResourceKey computes the key for managed resource, resources with the same key points to the same resource
+func (in ManagedResource) ResourceKey() string {
+	gv, kind := in.GroupVersionKind().ToAPIVersionAndKind()
+	return strings.Join([]string{gv, kind, in.Cluster, in.Namespace, in.Name}, "/")
+}
+
+// ComponentKey computes the key for the component which managed resource belongs to
+func (in ManagedResource) ComponentKey() string {
+	return strings.Join([]string{in.Env, in.Component}, "/")
+}
+
+// UnmarshalTo unmarshal ManagedResource into target object
+func (in ManagedResource) UnmarshalTo(obj interface{}) error {
+	if in.Data == nil || in.Data.Raw == nil {
+		return errors.ManagedResourceHasNoDataError{}
+	}
+	return json.Unmarshal(in.Data.Raw, obj)
+}
+
+// ToUnstructured converts managed resource into unstructured
+func (in ManagedResource) ToUnstructured() *unstructured.Unstructured {
+	obj := &unstructured.Unstructured{}
+	obj.SetGroupVersionKind(in.GroupVersionKind())
+	obj.SetName(in.Name)
+	if in.Namespace != "" {
+		obj.SetNamespace(in.Namespace)
+	}
+	oam.SetCluster(obj, in.Cluster)
+	return obj
+}
+
+// ToUnstructuredWithData converts managed resource into unstructured and unmarshal data
+func (in ManagedResource) ToUnstructuredWithData() (*unstructured.Unstructured, error) {
+	obj := in.ToUnstructured()
+	if err := in.UnmarshalTo(obj); err != nil {
+		if errors2.Is(err, errors.ManagedResourceHasNoDataError{}) {
+			return nil, err
+		}
+	}
+	return obj, nil
+}
+
+// ResourceTrackerStatus define the status of resourceTracker
+// For backward-compatibility
+type ResourceTrackerStatus struct {
+	// Deprecated
+	TrackedResources []common.ClusterObjectReference `json:"trackedResources,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ResourceTrackerList contains a list of ResourceTracker
+type ResourceTrackerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ResourceTracker `json:"items"`
+}
+
+func (in *ResourceTracker) findMangedResourceIndex(mr ManagedResource) int {
+	for i, _mr := range in.Spec.ManagedResources {
+		if mr.ClusterObjectReference.Equal(_mr.ClusterObjectReference) {
+			return i
+		}
+	}
+	return -1
+}
+
+// AddManagedResource add object to managed resources, if exists, update
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) (updated bool) {
+	gvk := rsc.GetObjectKind().GroupVersionKind()
+	mr := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{
+			ObjectReference: v1.ObjectReference{
+				APIVersion: gvk.GroupVersion().String(),
+				Kind:       gvk.Kind,
+				Name:       rsc.GetName(),
+				Namespace:  rsc.GetNamespace(),
+			},
+			Cluster: oam.GetCluster(rsc),
+		},
+		OAMObjectReference: common.NewOAMObjectReferenceFromObject(rsc),
+		Deleted:            false,
+	}
+	if !metaOnly {
+		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) (updated bool) {
+	gvk := rsc.GetObjectKind().GroupVersionKind()
+	mr := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{
+			ObjectReference: v1.ObjectReference{
+				APIVersion: gvk.GroupVersion().String(),
+				Kind:       gvk.Kind,
+				Name:       rsc.GetName(),
+				Namespace:  rsc.GetNamespace(),
+			},
+			Cluster: oam.GetCluster(rsc),
+		},
+		Deleted: true,
+	}
+	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
+		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 {
+		if !remove {
+			in.Spec.ManagedResources = append(in.Spec.ManagedResources, mr)
+		}
+	}
+	return true
+}
+
+// addClusterObjectReference
+// Deprecated
+func (in *ResourceTracker) addClusterObjectReference(ref common.ClusterObjectReference) bool {
+	for _, _rsc := range in.Status.TrackedResources {
+		if _rsc.Equal(ref) {
+			return true
+		}
+	}
+	in.Status.TrackedResources = append(in.Status.TrackedResources, ref)
+	return false
+}
+
+// AddTrackedResource add new object reference into tracked resources, return if already exists
+// Deprecated
+func (in *ResourceTracker) AddTrackedResource(rsc interfaces.TrackableResource) bool {
+	return in.addClusterObjectReference(common.ClusterObjectReference{
+		ObjectReference: v1.ObjectReference{
+			APIVersion: rsc.GetAPIVersion(),
+			Kind:       rsc.GetKind(),
+			Name:       rsc.GetName(),
+			Namespace:  rsc.GetNamespace(),
+			UID:        rsc.GetUID(),
+		},
+	})
+}

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

@@ -0,0 +1,184 @@
+/*
+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 (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	v12 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/utils/pointer"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/utils/errors"
+)
+
+func TestManagedResource_DeepCopyEqual(t *testing.T) {
+	r := require.New(t)
+	mr := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
+		OAMObjectReference:     common.OAMObjectReference{Component: "component"},
+		Data:                   &runtime.RawExtension{Raw: []byte("data")},
+	}
+	r.True(mr.Equal(*mr.DeepCopy()))
+}
+
+func TestManagedResource_Equal(t *testing.T) {
+	testCases := map[string]struct {
+		input1 ManagedResource
+		input2 ManagedResource
+		equal  bool
+	}{
+		"equal": {
+			input1: ManagedResource{
+				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
+				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
+				Data:                   &runtime.RawExtension{Raw: []byte("data")},
+			},
+			input2: ManagedResource{
+				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
+				OAMObjectReference:     common.OAMObjectReference{Component: "component"},
+				Data:                   &runtime.RawExtension{Raw: []byte("data")},
+			},
+			equal: true,
+		},
+		"ClusterObjectReference not equal": {
+			input1: ManagedResource{
+				ClusterObjectReference: common.ClusterObjectReference{Cluster: "cluster"},
+			},
+			input2: ManagedResource{
+				ClusterObjectReference: common.ClusterObjectReference{Cluster: "c"},
+			},
+			equal: false,
+		},
+		"OAMObjectReference not equal": {
+			input1: ManagedResource{
+				OAMObjectReference: common.OAMObjectReference{Component: "component"},
+			},
+			input2: ManagedResource{
+				OAMObjectReference: common.OAMObjectReference{Component: "c"},
+			},
+			equal: false,
+		},
+		"Data content not equal": {
+			input1: ManagedResource{
+				Data: &runtime.RawExtension{Raw: []byte("data")},
+			},
+			input2: ManagedResource{
+				Data: &runtime.RawExtension{Raw: []byte("d")},
+			},
+			equal: false,
+		},
+		"one data empty, one data not empty": {
+			input1: ManagedResource{Data: nil},
+			input2: ManagedResource{
+				Data: &runtime.RawExtension{Raw: []byte("d")},
+			},
+			equal: false,
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			r := require.New(t)
+			r.Equal(tc.equal, tc.input1.Equal(tc.input2))
+			r.Equal(tc.equal, tc.input2.Equal(tc.input1))
+		})
+	}
+}
+
+func TestManagedResourceKeys(t *testing.T) {
+	r := require.New(t)
+	input := ManagedResource{
+		ClusterObjectReference: common.ClusterObjectReference{
+			Cluster: "cluster",
+			ObjectReference: v1.ObjectReference{
+				Namespace:  "namespace",
+				Name:       "name",
+				APIVersion: v12.SchemeGroupVersion.String(),
+				Kind:       "Deployment",
+			},
+		},
+		OAMObjectReference: common.OAMObjectReference{
+			Env:       "env",
+			Component: "component",
+			Trait:     "trait",
+		},
+	}
+	r.Equal("namespace/name", input.NamespacedName().String())
+	r.Equal("apps/v1/Deployment/cluster/namespace/name", input.ResourceKey())
+	r.Equal("env/component", input.ComponentKey())
+	r.Equal("Deployment name (Cluster: cluster, Namespace: namespace)", input.DisplayName())
+	var deploy1, deploy2 v12.Deployment
+	deploy1.Spec.Replicas = pointer.Int32(5)
+	bs, err := json.Marshal(deploy1)
+	r.NoError(err)
+	r.ErrorIs(input.UnmarshalTo(&deploy2), errors.ManagedResourceHasNoDataError{})
+	_, err = input.ToUnstructuredWithData()
+	r.ErrorIs(err, errors.ManagedResourceHasNoDataError{})
+	input.Data = &runtime.RawExtension{Raw: bs}
+	r.NoError(input.UnmarshalTo(&deploy2))
+	r.Equal(deploy1, deploy2)
+	obj := input.ToUnstructured()
+	r.Equal("Deployment", obj.GetKind())
+	r.Equal("apps/v1", obj.GetAPIVersion())
+	r.Equal("name", obj.GetName())
+	r.Equal("namespace", obj.GetNamespace())
+	r.Equal("cluster", oam.GetCluster(obj))
+	obj, err = input.ToUnstructuredWithData()
+	r.NoError(err)
+	val, correct, err := unstructured.NestedInt64(obj.Object, "spec", "replicas")
+	r.NoError(err)
+	r.True(correct)
+	r.Equal(int64(5), val)
+}
+
+func TestResourceTracker_ManagedResource(t *testing.T) {
+	r := require.New(t)
+	input := &ResourceTracker{}
+	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
+	input.AddManagedResource(&deploy1, true)
+	r.Equal(1, len(input.Spec.ManagedResources))
+	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
+	input.AddManagedResource(&cm2, false)
+	r.Equal(2, len(input.Spec.ManagedResources))
+	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
+	input.AddManagedResource(&pod3, false)
+	r.Equal(3, len(input.Spec.ManagedResources))
+	deploy1.Spec.Replicas = pointer.Int32(5)
+	input.AddManagedResource(&deploy1, false)
+	r.Equal(3, len(input.Spec.ManagedResources))
+	input.DeleteManagedResource(&cm2, false)
+	r.Equal(3, len(input.Spec.ManagedResources))
+	r.True(input.Spec.ManagedResources[1].Deleted)
+	input.DeleteManagedResource(&cm2, true)
+	r.Equal(2, len(input.Spec.ManagedResources))
+	input.DeleteManagedResource(&deploy1, true)
+	r.Equal(1, len(input.Spec.ManagedResources))
+	input.DeleteManagedResource(&pod3, true)
+	r.Equal(0, len(input.Spec.ManagedResources))
+	secret4 := v1.Secret{ObjectMeta: v13.ObjectMeta{Name: "secret4"}}
+	input.DeleteManagedResource(&secret4, true)
+	r.Equal(0, len(input.Spec.ManagedResources))
+	input.DeleteManagedResource(&secret4, false)
+	r.Equal(1, len(input.Spec.ManagedResources))
+}

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
@@ -790,87 +468,23 @@ func (in *DefinitionRevisionSpec) DeepCopy() *DefinitionRevisionSpec {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HTTPMatchRequest) DeepCopyInto(out *HTTPMatchRequest) {
+func (in *ManagedResource) DeepCopyInto(out *ManagedResource) {
 	*out = *in
-	if in.URI != nil {
-		in, out := &in.URI, &out.URI
-		*out = new(URIMatch)
-		**out = **in
+	out.ClusterObjectReference = in.ClusterObjectReference
+	out.OAMObjectReference = in.OAMObjectReference
+	if in.Data != nil {
+		in, out := &in.Data, &out.Data
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPMatchRequest.
-func (in *HTTPMatchRequest) DeepCopy() *HTTPMatchRequest {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManagedResource.
+func (in *ManagedResource) DeepCopy() *ManagedResource {
 	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 *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)
+	out := new(ManagedResource)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -981,6 +595,7 @@ func (in *ResourceTracker) DeepCopyInto(out *ResourceTracker) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }
 
@@ -1034,6 +649,28 @@ func (in *ResourceTrackerList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ResourceTrackerSpec) DeepCopyInto(out *ResourceTrackerSpec) {
+	*out = *in
+	if in.ManagedResources != nil {
+		in, out := &in.ManagedResources, &out.ManagedResources
+		*out = make([]ManagedResource, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerSpec.
+func (in *ResourceTrackerSpec) DeepCopy() *ResourceTrackerSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ResourceTrackerSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
 	*out = *in
@@ -1133,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
@@ -1286,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

@@ -20,13 +20,10 @@ import (
 	"encoding/json"
 
 	"cuelang.org/go/cue"
-	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-	"github.com/oam-dev/kubevela/pkg/apiserver/rest/utils"
 )
 
 // Source record the source of Capability
@@ -182,56 +179,10 @@ 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"`
 	KubeParameter []common.KubeParameter `json:"kubeparameter,omitempty"`
 }
-
-// Addon contains all information represent an addon
-type Addon struct {
-	AddonMeta
-
-	APISchema *openapi3.Schema     `json:"schema"`
-	UISchema  []*utils.UIParameter `json:"uiSchema"`
-
-	// More details about the addon, e.g. README
-	Detail        string               `json:"detail,omitempty"`
-	Definitions   []AddonElementFile   `json:"definitions"`
-	Parameters    string               `json:"parameters"`
-	CUETemplates  []AddonElementFile   `json:"cue_templates"`
-	YAMLTemplates []AddonElementFile   `json:"yaml_templates,omitempty"`
-	DefSchemas    []AddonElementFile   `json:"def_schemas,omitempty"`
-	AppTemplate   *v1beta1.Application `json:"app_template"`
-}
-
-// AddonMeta defines the format for a single addon
-type AddonMeta struct {
-	Name          string             `json:"name" validate:"required"`
-	Version       string             `json:"version"`
-	Description   string             `json:"description"`
-	Icon          string             `json:"icon"`
-	URL           string             `json:"url,omitempty"`
-	Tags          []string           `json:"tags,omitempty"`
-	DeployTo      *AddonDeployTo     `json:"deployTo,omitempty"`
-	Dependencies  []*AddonDependency `json:"dependencies,omitempty"`
-	NeedNamespace []string           `json:"needNamespace,omitempty"`
-	Invisible     bool               `json:"invisible"`
-}
-
-// AddonDeployTo defines where the addon to deploy to
-type AddonDeployTo struct {
-	ControlPlane   bool `json:"control_plane"`
-	RuntimeCluster bool `json:"runtime_cluster"`
-}
-
-// AddonDependency defines the other addons it depends on
-type AddonDependency struct {
-	Name string `json:"name,omitempty"`
-}
-
-// AddonElementFile can be addon's definition or addon's component
-type AddonElementFile struct {
-	Data string
-	Name string
-}

apis/types/event.go

@@ -18,13 +18,14 @@ package types
 
 // reason for Application
 const (
-	ReasonParsed      = "Parsed"
-	ReasonRendered    = "Rendered"
-	ReasonRevisoned   = "Revisioned"
-	ReasonApplied     = "Applied"
-	ReasonHealthCheck = "HealthChecked"
-	ReasonDeployed    = "Deployed"
-	ReasonRollout     = "Rollout"
+	ReasonParsed          = "Parsed"
+	ReasonRendered        = "Rendered"
+	ReasonPolicyGenerated = "PolicyGenerated"
+	ReasonRevisoned       = "Revisioned"
+	ReasonApplied         = "Applied"
+	ReasonHealthCheck     = "HealthChecked"
+	ReasonDeployed        = "Deployed"
+	ReasonRollout         = "Rollout"
 
 	ReasonFailedParse       = "FailedParse"
 	ReasonFailedRender      = "FailedRender"
@@ -32,6 +33,7 @@ const (
 	ReasonFailedWorkflow    = "FailedWorkflow"
 	ReasonFailedApply       = "FailedApply"
 	ReasonFailedHealthCheck = "FailedHealthCheck"
+	ReasonFailedStateKeep   = "FailedStateKeep"
 	ReasonFailedGC          = "FailedGC"
 	ReasonFailedRollout     = "FailedRollout"
 )
@@ -40,6 +42,7 @@ const (
 const (
 	MessageParsed           = "Parsed successfully"
 	MessageRendered         = "Rendered successfully"
+	MessagePolicyGenerated  = "Policy generated successfully"
 	MessageRevisioned       = "Revisioned successfully"
 	MessageApplied          = "Applied successfully"
 	MessageWorkflowFinished = "Workflow finished"

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

@@ -640,7 +640,8 @@ spec:
                           type: object
                         type: array
                       resourceTracker:
-                        description: ResourceTracker record the status of the ResourceTracker
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -676,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
@@ -985,6 +879,8 @@ spec:
                             type: object
                           finished:
                             type: boolean
+                          message:
+                            type: string
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string
@@ -2321,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,
@@ -2897,7 +2475,8 @@ spec:
                           type: object
                         type: array
                       resourceTracker:
-                        description: ResourceTracker record the status of the ResourceTracker
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -2933,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
@@ -3242,6 +2714,8 @@ spec:
                             type: object
                           finished:
                             type: boolean
+                          message:
+                            type: string
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string

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

@@ -461,7 +461,7 @@ spec:
                   type: object
                 type: array
               resourceTracker:
-                description: ResourceTracker record the status of the ResourceTracker
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -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:
@@ -667,6 +591,8 @@ spec:
                     type: object
                   finished:
                     type: boolean
+                  message:
+                    type: string
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string
@@ -874,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:
@@ -1285,7 +983,7 @@ spec:
                   type: object
                 type: array
               resourceTracker:
-                description: ResourceTracker record the status of the ResourceTracker
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -1309,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:
@@ -1491,6 +1113,8 @@ spec:
                     type: object
                   finished:
                     type: boolean
+                  message:
+                    type: string
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string

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/crds/core.oam.dev_resourcetrackers.yaml

@@ -15,11 +15,24 @@ spec:
     listKind: ResourceTrackerList
     plural: resourcetrackers
     shortNames:
-    - tracker
+    - rt
     singular: resourcetracker
   scope: Cluster
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: TYPE
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/name']
+      name: APP
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/namespace']
+      name: APP-NS
+      type: string
+    - jsonPath: .spec.applicationGeneration
+      name: APP-GEN
+      type: number
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: An ResourceTracker represents a tracker for track cross namespace
@@ -37,10 +50,80 @@ spec:
             type: string
           metadata:
             type: object
+          spec:
+            description: ResourceTrackerSpec define the spec of resourceTracker
+            properties:
+              applicationGeneration:
+                format: int64
+                type: integer
+              managedResources:
+                items:
+                  description: ManagedResource define the resource to be managed by
+                    ResourceTracker
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    cluster:
+                      type: string
+                    component:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
+                    deleted:
+                      description: Deleted marks the resource to be deleted
+                      type: boolean
+                    env:
+                      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
+                    raw:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    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
+                    trait:
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
+              type:
+                description: ResourceTrackerType defines the type of resourceTracker
+                type: string
+            required:
+            - applicationGeneration
+            type: object
           status:
             description: ResourceTrackerStatus define the status of resourceTracker
+              For backward-compatibility
             properties:
               trackedResources:
+                description: Deprecated
                 items:
                   description: ClusterObjectReference defines the object reference
                     with cluster.

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/addon_registry.yaml

@@ -9,7 +9,8 @@ data:
     "name": "KubeVela",
     "oss": {
       "end_point": "https://addons.kubevela.net",
-      "bucket": ""
+      "bucket": "",
+      "path": ""
     }
   }
 }'

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

@@ -1,261 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
-          traffic.
-      name: istio
-      namespace: vela-system
-    spec:
-      components:
-      - name: ns-istio-system
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: istio-system
-        type: raw
-      - name: istio
-        properties:
-          chart: istio
-          repoType: helm
-          url: https://charts.kubevela.net/addons
-          version: 1.11.1
-        type: helm
-      - name: canary-rollout
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: WorkflowStepDefinition
-          metadata:
-            name: canary-rollout
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: |-
-                  import ("vela/op")
-
-                  parameter: {
-                          batchPartition: int
-                          traffic: weightedTargets: [...{
-                                  revision: string
-                                  weight:   int
-                          }]
-                  }
-
-                  comps__: op.#Load
-                  compNames__: [ for name, c in comps__.value {name}]
-                  comp__: compNames__[0]
-
-                  apply: op.#ApplyComponent & {
-                          value: comps__.value[comp__]
-                          patch: {
-                                  traits: "rollout": {
-                                         spec: rolloutPlan: batchPartition: parameter.batchPartition
-                                  }
-
-                                  traits: "virtualService": {
-                                          spec:
-                                             // +patchStrategy=retainKeys
-                                             http: [
-                                                  {
-                                                          route: [
-                                                                  for i, t in parameter.traffic.weightedTargets {
-                                                                          destination: {
-                                                                                  host:   comp__
-                                                                                  subset: t.revision
-                                                                          }
-                                                                          weight: t.weight
-                                                                  }]
-                                                  },
-                                          ]
-                                  }
-
-                                  traits: "destinationRule": {
-                                           // +patchStrategy=retainKeys
-                                           spec: {
-                                             host: comp__
-                                             subsets: [
-                                                  for i, t in parameter.traffic.weightedTargets {
-                                                          name: t.revision
-                                                          labels: {"app.oam.dev/revision": t.revision}
-                                                  },
-                                          ]}
-                                  }
-                          }
-                  }
-
-                  applyRemaining: op.#ApplyRemaining & {
-                      exceptions: [comp__]
-                  }
-        type: raw
-      - name: istio-gateway
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: use istio to manage in-cluster traffic
-            name: istio-gateway
-            namespace: vela-system
-          spec:
-            appliesToWorkloads:
-            - deployments.apps
-            podDisruptive: true
-            schematic:
-              cue:
-                template: "\noutputs: gateway: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
-                  \   kind: \"Gateway\"\n    metadata: {\n        name:      context.name\n
-                  \       namespace: context.namespace\n    }\n    spec: {\n      selector:
-                  {\n        istio: parameter.gateway\n      }\n      servers: [{\n         hosts:
-                  parameter.hosts\n         port: {\n              name: \"http\"\n              number:
-                  80\n              protocol: \"HTTP\"\n         }\n      }]\n    }\n}\n\noutputs:
-                  virtualService: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
-                  \   kind: \"VirtualService\"\n    metadata: {\n         name:      context.name\n
-                  \        namespace: context.namespace\n    }\n    spec: {\n       gateways:
-                  [context.name]\n       hosts: parameter.hosts\n       http:[{\n       match:
-                  [ for i, u in parameter.match { uri: u} ]\n       route: [{destination:
-                  {\n           host: context.name\n           port: number: parameter.port\n
-                  \      }}]\n       }]\n    }\n}\n\nparameter: {\n    hosts: [string]\n
-                  \   gateway: *\"ingressgateway\"|string\n    match: [...#uri]\n    port:
-                  int\n}\n\n#uri: {\n   exact?: string\n   prefix?: string\n} \n"
-        type: raw
-      - name: canary-rollback
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: WorkflowStepDefinition
-          metadata:
-            name: canary-rollback
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: |-
-                  import ("vela/op")
-
-                  parameter: {...}
-
-                  comps: op.#Load
-                  compNames: [ for name, c in comps.value {name}]
-                  firstcomp: compNames[0]
-
-                  rolloutObj: op.#Read & {
-                    value: {
-                      apiVersion: "standard.oam.dev/v1alpha1"
-                      kind:       "Rollout"
-                      metadata: {
-                        name:      firstcomp
-                        namespace: context.namespace
-                      }
-                    }
-                  }
-
-                  _sourceRevision: rolloutObj.value.status.LastSourceRevision
-
-                  apply: op.#ApplyComponent & {
-                    value: comps.value[firstcomp]
-                    patch: {
-                      traits: "rollout": {
-                        spec: {
-                          targetRevisionName: _sourceRevision
-                        }
-                      }
-
-                      traits: "virtualService": {
-                        spec:
-                          // +patchStrategy=retainKeys
-                          http: [
-                            {
-                              route: [{
-                                destination: {
-                                  host:   firstcomp
-                                  subset: _sourceRevision
-                                }
-                                weight: 100
-                              }]
-                            },
-                          ]
-                      }
-
-                      traits: "destinationRule": {
-                        // +patchStrategy=retainKeys
-                        spec: {
-                          host: firstcomp
-                          subsets: [
-                            {
-                              name: _sourceRevision
-                              labels: {"app.oam.dev/revision": _sourceRevision}
-                            },
-                          ]
-                        }
-                      }
-                    }
-                  }
-
-                  applyRemaining: op.#ApplyRemaining & {
-                      exceptions: [firstcomp]
-                  }
-        type: raw
-      - name: canary-traffic
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: use istio to manage traffic
-            name: canary-traffic
-            namespace: vela-system
-          spec:
-            appliesToWorkloads:
-            - deployments.apps
-            podDisruptive: true
-            schematic:
-              cue:
-                template: "outputs: service: {\n\t\tapiVersion: \"v1\"\n\t\tkind:       \"Service\"\n\t\tmetadata:
-                  name: context.name\n\t\tspec: {\n\t\t\tselector: \"app.oam.dev/component\":
-                  context.name\n\t\t\tports: [\n\t\t\t\tfor p in parameter.port {\n\t\t\t\t\tport:
-                  \      p\n\t\t\t\t\ttargetPort: p\n\t\t\t\t},\n\t\t\t]\n\t\t\ttype:
-                  \"ClusterIP\"\n\t\t}\n}\n\noutputs: virtualService: {\n    apiVersion:
-                  \"networking.istio.io/v1alpha3\"\n    kind: \"VirtualService\"\n    metadata:
-                  {\n        name:      context.name\n        namespace: context.namespace\n
-                  \   }\n    spec: {\n       hosts: [context.name]\n       http: [{route:
-                  [\n       {destination: {\n          host: context.name\n          port:
-                  {number: parameter.port[0]}\n       }}]}]\n    }\n}\n\noutputs: destinationRule:
-                  {\n       apiVersion: \"networking.istio.io/v1alpha3\"\n       kind:
-                  \"DestinationRule\"\n       metadata: {\n           name:      context.name\n
-                  \          namespace: context.namespace\n       }\n       spec: {\n
-                  \         host: context.name\n          subsets: [{\n             name:
-                  context.revision\n             labels: {\"app.oam.dev/revision\": context.revision}\n
-                  \         }]\n       }\n}\n\nparameter: {\n   port: [int]\n} \n"
-        type: raw
-      workflow:
-        steps:
-        - name: checking-depends-on
-          properties:
-            name: fluxcd
-            namespace: vela-system
-          type: depends-on-app
-        - name: apply-ns
-          properties:
-            component: ns-istio-system
-          type: apply-component
-        - name: apply-resources
-          type: apply-remaining
-    status: {}
-  detail: |-
-    # istio
-
-    This addon provides istio support for vela rollout.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
-      traffic.
-    addons.oam.dev/name: istio
-  labels:
-    addons.oam.dev/type: istio
-  name: istio
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,186 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
-          automations
-      name: kruise
-      namespace: vela-system
-    spec:
-      components:
-      - name: kruise
-        properties:
-          chart: ./charts/kruise/v0.9.0
-          git:
-            branch: master
-          repoType: git
-          url: https://github.com/openkruise/kruise
-          values:
-            featureGates: PreDownloadImageForInPlaceUpdate=true
-        type: helm
-      - name: cloneset
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Describes long-running, scalable, containerized
-                services that have a stable network endpoint to receive external network
-                traffic from customers. If workload type is skipped for any service defined
-                in Appfile, it will be defaulted to `webservice` type.
-            name: cloneset
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
-                  \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
-                  context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
-                  context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels: {\n\t\t\t\t\"app.oam.dev/component\":
-                  context.name\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:
-                  \ context.name\n\t\t\t\t\timage: parameter.image\n\n\t\t\t\t\tif parameter.cmd
-                  != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif
-                  parameter.args != _|_ {\n\t\t\t\t\t\targs: parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif
-                  parameter.env != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  context.config != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
-                  parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
-                  parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"] != _|_
-                  {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
-                  cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
-                  != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:   parameter.memory\n\t\t\t\t\t\t\trequests:
-                  memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
-                  parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle: {\n\t\t\t\t\t\tif
-                  parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart: exec: command:
-                  parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif parameter.preStop
-                  != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command: parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
-                  parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
-                  parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
-                  [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
-                  parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
-                  parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter: {\n\t//
-                  +usage=Which image would you like to use for your service\n\t// +short=i\n\timage:
-                  string\n\n\t// +usage=Specify image pull policy for your service\n\timagePullPolicy?:
-                  string\n\n\t// +usage=Specify image pull secrets for your service\n\timagePullSecrets?:
-                  [...string]\n\n\t// +usage=Number of CPU units for the service, like
-                  `0.5` (0.5 CPU core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify
-                  the amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
-                  +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
-                  +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
-                  commands will be called immediately after a container is created.\n\tpostStart?:
-                  [...string]\n\n\t// +usage=PreStop is called immediately before a container
-                  is terminated due to an API request or management event such as liveness/startup
-                  probe failure, preemption, resource contention, etc. The handler is
-                  not called if the container crashes or exits. The reason for termination
-                  is passed to the handler. The Pod's termination grace period countdown
-                  begins before the PreStop hooked is executed. Regardless of the outcome
-                  of the handler, the container will eventually terminate within the Pod's
-                  termination grace period. Other management of the container blocks until
-                  the hook completes or until the termination grace period is reached.
-                  More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
-                  [...string]\n\n\t// +usage=Which port do you want customer traffic sent
-                  to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define arguments
-                  by using environment variables\n\tenv?: [...#ENV]\n\n\t// +usage=Cloneset
-                  updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
-                  string\n\n\t// +usage=HostAliases is a list of hosts and IPs that will
-                  be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
-                  [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for assessing
-                  whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
-                  +usage=Instructions for assessing whether the container is in a suitable
-                  state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
-                  {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
-                  value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
-                  a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
-                  +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
-                  {\n\t\t\t// +usage=The name of the secret in the pod's namespace to
-                  select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the secret
-                  to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
-                  {\n\n\t// +usage=Instructions for assessing container health by executing
-                  a command. Either this attribute or the httpGet attribute or the tcpSocket
-                  attribute MUST be specified. This attribute is mutually exclusive with
-                  both the httpGet attribute and the tcpSocket attribute.\n\texec?: {\n\t\t//
-                  +usage=A command to be executed inside the container to assess its health.
-                  Each space delimited token of the command is a separate array element.
-                  Commands exiting 0 are considered to be successful probes, whilst all
-                  other exit codes are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
-                  +usage=Instructions for assessing container health by executing an HTTP
-                  GET request. Either this attribute or the exec attribute or the tcpSocket
-                  attribute MUST be specified. This attribute is mutually exclusive with
-                  both the exec attribute and the tcpSocket attribute.\n\thttpGet?: {\n\t\t//
-                  +usage=The endpoint, relative to the port, to which the HTTP GET request
-                  should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
-                  within the container to which the HTTP GET request should be directed.\n\t\tport:
-                  int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
-                  +usage=Instructions for assessing container health by probing a TCP
-                  socket. Either this attribute or the exec attribute or the httpGet attribute
-                  MUST be specified. This attribute is mutually exclusive with both the
-                  exec attribute and the httpGet attribute.\n\ttcpSocket?: {\n\t\t// +usage=The
-                  TCP socket within the container that should be probed to assess container
-                  health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
-                  container is started before the first probe is initiated.\n\tinitialDelaySeconds:
-                  *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
-                  *10 | int\n\n\t// +usage=Number of seconds after which the probe times
-                  out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
-                  successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
-                  *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
-                  the container is not alive (liveness probe) or not ready (readiness
-                  probe).\n\tfailureThreshold: *3 | int\n} \n"
-            workload:
-              definition:
-                apiVersion: apps.kruise.io/v1alpha1
-                kind: CloneSet
-        type: raw
-      - name: predownloadimage
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: WorkflowStepDefinition
-          metadata:
-            name: predownloadimage
-          spec:
-            schematic:
-              cue:
-                template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
-                  int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
-                  *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
-                  int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
-                  op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
-                  \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
-                  \   }\n    spec: {\n      image: parameter.image\n      parallelism:
-                  parameter.parallel\n      selector: matchLabels: parameter.kvs\n      completionPolicy:
-                  {\n        type: parameter.type\n        activeDeadlineSeconds: parameter.activeDeadlineSeconds\n
-                  \       ttlSecondsAfterFinished: parameter.ttlSecondsAfterFinished\n
-                  \     }\n      pullPolicy: {\n        if parameter.backoffLimit != _|_
-                  {\n          backoffLimit: parameter.backoffLimit\n        }\n        if
-                  parameter.timeoutSeconds != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n
-                  \       }\n      }\n      pullSecrets: parameter.arr\n    }            \n
-                  \ }          \n} \n"
-        type: raw
-      workflow:
-        steps:
-        - name: checking-depends-on
-          properties:
-            name: fluxcd
-            namespace: vela-system
-          type: depends-on-app
-        - name: apply-resources
-          type: apply-application
-    status: {}
-  detail: |-
-    # kruise
-
-    This addon provides [open-kruise](https://github.com/openkruise/kruise) workload.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
-      automations
-    addons.oam.dev/name: kruise
-  labels:
-    addons.oam.dev/type: kruise
-  name: kruise
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,137 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: An out of the box solution for KubeVela observability
-      name: observability
-      namespace: vela-system
-    spec:
-      components:
-      - name: grafana-registration
-        properties:
-          chart: ./chart
-          git:
-            branch: master
-          repoType: git
-          targetNamespace: vela-system
-          url: https://github.com/oam-dev/grafana-registration
-          values:
-            replicaCount: 1
-        type: helm
-      - name: grafana
-        properties:
-          chart: grafana
-          releaseName: grafana
-          repoType: helm
-          targetNamespace: vela-system
-          url: https://charts.kubevela.net/addons
-          version: 6.14.1
-        traits:
-        - properties:
-            domain: '[[ index .Args "grafana-domain" ]]'
-            http:
-              /: 80
-          type: pure-ingress
-        - properties:
-            credentialSecret: grafana
-            credentialSecretNamespace: vela-system
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
-            urls:
-            - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
-            - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
-            - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
-            - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
-          type: import-grafana-dashboard
-        type: helm
-      - name: loki
-        properties:
-          chart: loki-stack
-          releaseName: loki
-          repoType: helm
-          targetNamespace: vela-system
-          url: https://charts.kubevela.net/addons
-          version: 2.4.1
-        traits:
-        - properties:
-            access: proxy
-            credentialSecret: grafana
-            credentialSecretNamespace: vela-system
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
-            name: loki
-            namespace: vela-system
-            service: loki
-            type: loki
-          type: register-grafana-datasource
-        type: helm
-      - name: prometheus-server
-        properties:
-          chart: prometheus
-          releaseName: prometheus
-          repoType: helm
-          targetNamespace: vela-system
-          url: https://charts.kubevela.net/addons
-          values:
-            alertmanager:
-              persistentVolume:
-                enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
-                size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
-                storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
-            server:
-              persistentVolume:
-                enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
-                size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
-                storageClass: '[[ index .Args "server-pvc-class" ]]'
-          version: 14.4.1
-        traits:
-        - properties:
-            access: proxy
-            credentialSecret: grafana
-            credentialSecretNamespace: vela-system
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: vela-system
-            name: prometheus
-            namespace: vela-system
-            service: prometheus-server
-            type: prometheus
-          type: register-grafana-datasource
-        type: helm
-      - name: kube-state-metrics
-        properties:
-          chart: kube-state-metrics
-          repoType: helm
-          targetNamespace: vela-system
-          url: https://charts.kubevela.net/addons
-          values:
-            image:
-              repository: oamdev/kube-state-metrics
-              tag: v2.1.0
-          version: 3.4.1
-        type: helm
-      workflow:
-        steps:
-        - name: checking-depends-on
-          properties:
-            name: fluxcd
-            namespace: vela-system
-          type: depends-on-app
-        - name: apply-resources
-          type: apply-remaining
-    status: {}
-  detail: |-
-    # observability
-
-    This addon expose system and application level metrics for KubeVela.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: An out of the box solution for KubeVela observability
-    addons.oam.dev/name: observability
-  labels:
-    addons.oam.dev/type: observability
-  name: observability
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,519 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: ocm-cluster-manager can deploy an OCM hub cluster
-          environment.
-      name: ocm-cluster-manager
-      namespace: vela-system
-    spec:
-      components:
-      - name: ns-open-cluster-management
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: open-cluster-management
-        type: raw
-      - name: cluster-manager-role-binding
-        properties:
-          apiVersion: rbac.authorization.k8s.io/v1
-          kind: ClusterRoleBinding
-          metadata:
-            name: cluster-manager-role-binding
-          roleRef:
-            apiGroup: rbac.authorization.k8s.io
-            kind: ClusterRole
-            name: cluster-manager-cluster-role
-          subjects:
-          - kind: ServiceAccount
-            name: cluster-manager-service-account
-            namespace: open-cluster-management
-        type: raw
-      - name: cluster-manager-cluster-role
-        properties:
-          apiVersion: rbac.authorization.k8s.io/v1
-          kind: ClusterRole
-          metadata:
-            name: cluster-manager-cluster-role
-          rules:
-          - apiGroups:
-            - ""
-            resources:
-            - configmaps
-            - namespaces
-            - serviceaccounts
-            - services
-            - secrets
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - ""
-            resources:
-            - nodes
-            verbs:
-            - get
-            - list
-            - watch
-          - apiGroups:
-            - authorization.k8s.io
-            resources:
-            - subjectaccessreviews
-            verbs:
-            - create
-          - apiGroups:
-            - ""
-            - events.k8s.io
-            resources:
-            - events
-            verbs:
-            - create
-            - patch
-            - update
-          - apiGroups:
-            - apps
-            resources:
-            - deployments
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - rbac.authorization.k8s.io
-            resources:
-            - clusterrolebindings
-            - rolebindings
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - rbac.authorization.k8s.io
-            resources:
-            - clusterroles
-            - roles
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-            - escalate
-            - bind
-          - apiGroups:
-            - apiextensions.k8s.io
-            resources:
-            - customresourcedefinitions
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - apiregistration.k8s.io
-            resources:
-            - apiservices
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - admissionregistration.k8s.io
-            resources:
-            - validatingwebhookconfigurations
-            - mutatingwebhookconfigurations
-            verbs:
-            - create
-            - get
-            - list
-            - update
-            - watch
-            - patch
-            - delete
-          - apiGroups:
-            - operator.open-cluster-management.io
-            resources:
-            - clustermanagers
-            verbs:
-            - get
-            - list
-            - watch
-            - update
-            - delete
-          - apiGroups:
-            - operator.open-cluster-management.io
-            resources:
-            - clustermanagers/status
-            verbs:
-            - update
-            - patch
-        type: raw
-      - name: cluster-manager-service-account
-        properties:
-          apiVersion: v1
-          kind: ServiceAccount
-          metadata:
-            name: cluster-manager-service-account
-            namespace: open-cluster-management
-        type: raw
-      - name: clustermanagers.operator.open-cluster-management.io
-        properties:
-          apiVersion: apiextensions.k8s.io/v1
-          kind: CustomResourceDefinition
-          metadata:
-            name: clustermanagers.operator.open-cluster-management.io
-          spec:
-            group: operator.open-cluster-management.io
-            names:
-              kind: ClusterManager
-              listKind: ClusterManagerList
-              plural: clustermanagers
-              singular: clustermanager
-            preserveUnknownFields: false
-            scope: Cluster
-            versions:
-            - name: v1
-              schema:
-                openAPIV3Schema:
-                  description: ClusterManager configures the controllers on the hub that
-                    govern registration and work distribution for attached Klusterlets.
-                    ClusterManager will only be deployed in open-cluster-management-hub
-                    namespace.
-                  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: Spec represents a desired deployment configuration
-                        of controllers that govern registration and work distribution
-                        for attached Klusterlets.
-                      properties:
-                        placementImagePullSpec:
-                          default: quay.io/open-cluster-management/placement
-                          description: PlacementImagePullSpec represents the desired image
-                            configuration of placement controller/webhook installed on
-                            hub.
-                          type: string
-                        registrationImagePullSpec:
-                          default: quay.io/open-cluster-management/registration
-                          description: RegistrationImagePullSpec represents the desired
-                            image of registration controller/webhook installed on hub.
-                          type: string
-                        workImagePullSpec:
-                          default: quay.io/open-cluster-management/work
-                          description: WorkImagePullSpec represents the desired image
-                            configuration of work controller/webhook installed on hub.
-                          type: string
-                      type: object
-                    status:
-                      description: Status represents the current status of controllers
-                        that govern the lifecycle of managed clusters.
-                      properties:
-                        conditions:
-                          description: 'Conditions contain the different condition statuses
-                            for this ClusterManager. Valid condition types are: Applied:
-                            Components in hub are applied. Available: Components in hub
-                            are available and ready to serve. Progressing: Components
-                            in hub are in a transitioning state. Degraded: Components
-                            in hub do not match the desired configuration and only provide
-                            degraded service.'
-                          items:
-                            description: "Condition contains details for one aspect of
-                              the current state of this API Resource. --- This struct
-                              is intended for direct use as an array at the field path
-                              .status.conditions.  For example, type FooStatus struct{
-                              \    // Represents the observations of a foo's current state.
-                              \    // Known .status.conditions.type are: \"Available\",
-                              \"Progressing\", and \"Degraded\"     // +patchMergeKey=type
-                              \    // +patchStrategy=merge     // +listType=map     //
-                              +listMapKey=type     Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                              patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
-                              \n     // other fields }"
-                            properties:
-                              lastTransitionTime:
-                                description: lastTransitionTime is the last time the condition
-                                  transitioned from one status to another. This should
-                                  be when the underlying condition changed.  If that is
-                                  not known, then using the time when the API field changed
-                                  is acceptable.
-                                format: date-time
-                                type: string
-                              message:
-                                description: message is a human readable message indicating
-                                  details about the transition. This may be an empty string.
-                                maxLength: 32768
-                                type: string
-                              observedGeneration:
-                                description: observedGeneration represents the .metadata.generation
-                                  that the condition was set based upon. For instance,
-                                  if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration
-                                  is 9, the condition is out of date with respect to the
-                                  current state of the instance.
-                                format: int64
-                                minimum: 0
-                                type: integer
-                              reason:
-                                description: reason contains a programmatic identifier
-                                  indicating the reason for the condition's last transition.
-                                  Producers of specific condition types may define expected
-                                  values and meanings for this field, and whether the
-                                  values are considered a guaranteed API. The value should
-                                  be a CamelCase string. This field may not be empty.
-                                maxLength: 1024
-                                minLength: 1
-                                pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                                type: string
-                              status:
-                                description: status of the condition, one of True, False,
-                                  Unknown.
-                                enum:
-                                - "True"
-                                - "False"
-                                - Unknown
-                                type: string
-                              type:
-                                description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                                  --- Many .condition.type values are consistent across
-                                  resources like Available, but because arbitrary conditions
-                                  can be useful (see .node.status.conditions), the ability
-                                  to deconflict is important. The regex it matches is
-                                  (dns1123SubdomainFmt/)?(qualifiedNameFmt)
-                                maxLength: 316
-                                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                                type: string
-                            required:
-                            - lastTransitionTime
-                            - message
-                            - reason
-                            - status
-                            - type
-                            type: object
-                          type: array
-                        generations:
-                          description: Generations are used to determine when an item
-                            needs to be reconciled or has changed in a way that needs
-                            a reaction.
-                          items:
-                            description: GenerationStatus keeps track of the generation
-                              for a given resource so that decisions about forced updates
-                              can be made. The definition matches the GenerationStatus
-                              defined in github.com/openshift/api/v1
-                            properties:
-                              group:
-                                description: group is the group of the resource that you're
-                                  tracking
-                                type: string
-                              lastGeneration:
-                                description: lastGeneration is the last generation of
-                                  the resource that controller applies
-                                format: int64
-                                type: integer
-                              name:
-                                description: name is the name of the resource that you're
-                                  tracking
-                                type: string
-                              namespace:
-                                description: namespace is where the resource that you're
-                                  tracking is
-                                type: string
-                              resource:
-                                description: resource is the resource type of the resource
-                                  that you're tracking
-                                type: string
-                              version:
-                                description: version is the version of the resource that
-                                  you're tracking
-                                type: string
-                            type: object
-                          type: array
-                        observedGeneration:
-                          description: ObservedGeneration is the last generation change
-                            you've dealt with
-                          format: int64
-                          type: integer
-                        relatedResources:
-                          description: RelatedResources are used to track the resources
-                            that are related to this ClusterManager.
-                          items:
-                            description: RelatedResourceMeta represents the resource that
-                              is managed by an operator
-                            properties:
-                              group:
-                                description: group is the group of the resource that you're
-                                  tracking
-                                type: string
-                              name:
-                                description: name is the name of the resource that you're
-                                  tracking
-                                type: string
-                              namespace:
-                                description: namespace is where the thing you're tracking
-                                  is
-                                type: string
-                              resource:
-                                description: resource is the resource type of the resource
-                                  that you're tracking
-                                type: string
-                              version:
-                                description: version is the version of the thing you're
-                                  tracking
-                                type: string
-                            type: object
-                          type: array
-                      type: object
-                  type: object
-              served: true
-              storage: true
-              subresources:
-                status: {}
-          status:
-            acceptedNames:
-              kind: ""
-              plural: ""
-            conditions: []
-            storedVersions: []
-        type: raw
-      - name: cluster-manager-hub
-        properties:
-          apiVersion: operator.open-cluster-management.io/v1
-          kind: ClusterManager
-          metadata:
-            name: cluster-manager-hub
-          spec:
-            placementImagePullSpec: quay.io/open-cluster-management/placement
-            registrationImagePullSpec: quay.io/open-cluster-management/registration
-            workImagePullSpec: quay.io/open-cluster-management/work
-        type: raw
-      - name: cluster-manager-controller
-        properties:
-          apiVersion: apps/v1
-          kind: Deployment
-          metadata:
-            labels:
-              app: cluster-manager
-            name: cluster-manager-controller
-            namespace: open-cluster-management
-          spec:
-            replicas: 1
-            selector:
-              matchLabels:
-                app: cluster-manager
-            template:
-              metadata:
-                labels:
-                  app: cluster-manager
-              spec:
-                affinity:
-                  podAntiAffinity:
-                    preferredDuringSchedulingIgnoredDuringExecution:
-                    - podAffinityTerm:
-                        labelSelector:
-                          matchExpressions:
-                          - key: app
-                            operator: In
-                            values:
-                            - cluster-manager
-                        topologyKey: failure-domain.beta.kubernetes.io/zone
-                      weight: 70
-                    - podAffinityTerm:
-                        labelSelector:
-                          matchExpressions:
-                          - key: app
-                            operator: In
-                            values:
-                            - cluster-manager
-                        topologyKey: kubernetes.io/hostname
-                      weight: 30
-                containers:
-                - args:
-                  - /registration-operator
-                  - hub
-                  image: quay.io/open-cluster-management/registration-operator:latest
-                  imagePullPolicy: IfNotPresent
-                  livenessProbe:
-                    httpGet:
-                      path: /healthz
-                      port: 8443
-                      scheme: HTTPS
-                    initialDelaySeconds: 2
-                    periodSeconds: 10
-                  name: registration-operator
-                  readinessProbe:
-                    httpGet:
-                      path: /healthz
-                      port: 8443
-                      scheme: HTTPS
-                    initialDelaySeconds: 2
-                  resources:
-                    requests:
-                      cpu: 10m
-                      memory: 128Mi
-                  securityContext:
-                    allowPrivilegeEscalation: false
-                    capabilities:
-                      drop:
-                      - ALL
-                    privileged: false
-                    runAsNonRoot: true
-                serviceAccountName: cluster-manager-service-account
-        type: raw
-      workflow:
-        steps:
-        - name: apply-ns
-          properties:
-            component: ns-open-cluster-management
-          type: apply-component
-        - name: apply-resources
-          type: apply-remaining
-    status: {}
-  detail: |-
-    # ocm-cluster-manager
-
-    This addon aims to support multi-cluster application deployment.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: ocm-cluster-manager can deploy an OCM hub cluster
-      environment.
-    addons.oam.dev/name: ocm-cluster-manager
-  labels:
-    addons.oam.dev/type: ocm-cluster-manager
-  name: ocm-cluster-manager
-  namespace: {{.Values.systemDefinitionNamespace}}

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

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

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

@@ -1,67 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: Kubernetes Terraform Controller for AWS
-        addons.oam.dev/name: terraform-aws
-      name: terraform-aws
-      namespace: vela-system
-    spec:
-      components:
-      - name: aws-account-creds
-        properties:
-          apiVersion: v1
-          kind: Secret
-          metadata:
-            name: aws-account-creds
-            namespace: vela-system
-          stringData:
-            credentials: |
-              awsAccessKeyID: [[ index .Args "AWS_ACCESS_KEY_ID" ]]
-              awsSecretAccessKey: [[ index .Args "AWS_SECRET_ACCESS_KEY" ]]
-              awsSessionToken: [[ index .Args "AWS_SESSION_TOKEN" ]]
-          type: Opaque
-        type: raw
-      - name: aws
-        properties:
-          apiVersion: terraform.core.oam.dev/v1beta1
-          kind: Provider
-          metadata:
-            name: aws
-            namespace: default
-          spec:
-            credentials:
-              secretRef:
-                key: credentials
-                name: aws-account-creds
-                namespace: vela-system
-              source: Secret
-            provider: aws
-            region: '[[ index .Args "AWS_DEFAULT_REGION" ]]'
-        type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: terraform
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: |
-    # terraform-aws
-
-    This addon contains terraform provider for AWS.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: Kubernetes Terraform Controller for AWS
-    addons.oam.dev/name: terraform-aws
-  labels:
-    addons.oam.dev/type: terraform-aws
-  name: terraform-aws
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,67 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: Kubernetes Terraform Controller for Azure
-        addons.oam.dev/name: terraform-azure
-      name: terraform-azure
-      namespace: vela-system
-    spec:
-      components:
-      - name: azure-account-creds
-        properties:
-          apiVersion: v1
-          kind: Secret
-          metadata:
-            name: azure-account-creds
-            namespace: vela-system
-          stringData:
-            credentials: |
-              armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
-              armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
-              armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
-              armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
-          type: Opaque
-        type: raw
-      - name: azure
-        properties:
-          apiVersion: terraform.core.oam.dev/v1beta1
-          kind: Provider
-          metadata:
-            name: azure
-            namespace: default
-          spec:
-            credentials:
-              secretRef:
-                key: credentials
-                name: azure-account-creds
-                namespace: vela-system
-              source: Secret
-            provider: azure
-        type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: terraform
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: |
-    # terraform-azure
-
-    This addon contains terraform provider for Azure.
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: Kubernetes Terraform Controller for Azure
-    addons.oam.dev/name: terraform-azure
-  labels:
-    addons.oam.dev/type: terraform-azure
-  name: terraform-azure
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,595 +0,0 @@
-apiVersion: v1
-data:
-  application: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Application
-    metadata:
-      annotations:
-        addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
-          Terraform.
-      name: terraform
-      namespace: vela-system
-    spec:
-      components:
-      - name: terraform-controller
-        properties:
-          chart: terraform-controller
-          repoType: helm
-          url: https://charts.kubevela.net/addons
-          version: 0.2.10
-        type: helm
-      - name: alibaba-ack
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                ACK cluster
-            labels:
-              type: terraform
-            name: alibaba-ack
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/cs/dedicated-kubernetes
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-ask
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                Serverless Kubernetes (ASK)
-            labels:
-              type: terraform
-            name: alibaba-ask
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/cs/serverless-kubernetes
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-eip
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                Elastic IP
-            labels:
-              type: terraform
-            name: alibaba-eip
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-oss
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              cloud-resource/console-url: https://oss.console.aliyun.com/bucket/oss-{ALICLOUD_REGION}/{BUCKET_NAME}/overview
-              cloud-resource/identifier: BUCKET_NAME
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                OSS object
-            labels:
-              type: terraform
-            name: alibaba-oss
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n  bucket
-                  = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\" {\n  value
-                  = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
-                  \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
-                  \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
-                  ACL, supported 'private', 'public-read', 'public-read-write'\"\n  default
-                  = \"private\"\n  type = string\n} \n"
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-rds
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              cloud-resource/console-url: https://rdsnext.console.aliyun.com/detail/{DB_ID}/basicInfo?&region={ALICLOUD_REGION}
-              cloud-resource/identifier: DB_ID
-              cloud-resource/sensitive-outputs: DB_PASSWORD
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                RDS object
-            labels:
-              type: terraform
-            name: alibaba-rds
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  module "rds" {
-                    source = "github.com/kubevela-contrib/terraform-alicloud-rds"
-                    engine = "MySQL"
-                    engine_version = "8.0"
-                    instance_type = "rds.mysql.c1.large"
-                    instance_storage = "20"
-                    instance_name = var.instance_name
-                    account_name = var.account_name
-                    password = var.password
-                    allocate_public_connection = var.allocate_public_connection
-                    security_ips = ["0.0.0.0/0",]
-                  }
-
-                  output "DB_ID" {
-                    value = module.rds.db_instance_id
-                  }
-
-                  output "DB_NAME" {
-                    value = module.rds.this_db_instance_name
-                  }
-                  output "DB_USER" {
-                    value = module.rds.this_db_database_account
-                  }
-                  output "DB_PORT" {
-                    value = module.rds.this_db_instance_port
-                  }
-                  output "DB_HOST" {
-                    value = module.rds.this_db_instance_connection_string
-                  }
-                  output "DB_PASSWORD" {
-                    value = var.password
-                  }
-                  output "DB_PUBLIC_HOST" {
-                    value = module.rds.db_public_connection_string
-                  }
-
-                  variable "instance_name" {
-                    description = "RDS instance name"
-                    type = string
-                    default = "poc"
-                  }
-
-                  variable "account_name" {
-                    description = "RDS instance user account name"
-                    type = string
-                    default = "oam"
-                  }
-
-                  variable "password" {
-                    description = "RDS instance account password"
-                    type = string
-                    default = "Xyfff83jfewGGfaked"
-                  }
-
-                  variable "allocate_public_connection" {
-                    description = "Whether to allocate public connection for a RDS instance."
-                    type        = bool
-                    default     = true
-                  }
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-redis
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                Redis
-            labels:
-              type: terraform
-            name: alibaba-redis
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules/alibaba/redis
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-sls-project
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                SLS Project
-            labels:
-              type: terraform
-            name: alibaba-sls-project
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/sls/project
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-sls-store
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                SLS Store
-            labels:
-              type: terraform
-            name: alibaba-sls-store
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/sls/store
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-vpc
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                VPC
-            labels:
-              type: terraform
-            name: alibaba-vpc
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/vpc
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-vswitch
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
-                VSwitch
-            labels:
-              type: terraform
-            name: alibaba-vswitch
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/kubevela-contrib/terraform-modules.git
-                path: alibaba/vswitch
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: aws-s3
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for AWS S3
-            labels:
-              type: terraform
-            name: aws-s3
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  resource "aws_s3_bucket" "bucket-acl" {
-                    bucket = var.bucket
-                    acl    = var.acl
-                  }
-
-                  output "BUCKET_NAME" {
-                    value = aws_s3_bucket.bucket-acl.bucket_domain_name
-                  }
-
-                  variable "bucket" {
-                    description = "S3 bucket name"
-                    default = "vela-website"
-                    type = string
-                  }
-
-                  variable "acl" {
-                    description = "S3 bucket ACL"
-                    default = "private"
-                    type = string
-                  }
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: azure-database-mariadb
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Azure Database
-                Mariadb
-              provider: azure
-            labels:
-              type: terraform
-            name: azure-database-mariadb
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  # Configure the Microsoft Azure Provider
-                  provider "azurerm" {
-                    features {}
-                  }
-
-                  resource "azurerm_resource_group" "example" {
-                    name = var.resource_group
-                    location = var.location
-                  }
-
-                  resource "azurerm_mariadb_server" "example" {
-                    name = var.server_name
-                    location = var.location
-                    resource_group_name = azurerm_resource_group.example.name
-
-                    sku_name = "B_Gen5_2"
-
-                    storage_mb = 51200
-                    backup_retention_days = 7
-                    geo_redundant_backup_enabled = false
-
-                    administrator_login = var.username
-                    administrator_login_password = var.password
-                    version = "10.2"
-                    ssl_enforcement_enabled = true
-                  }
-
-                  resource "azurerm_mariadb_database" "example" {
-                    name = var.db_name
-                    resource_group_name = azurerm_resource_group.example.name
-                    server_name = azurerm_mariadb_server.example.name
-                    charset = "utf8"
-                    collation = "utf8_general_ci"
-                  }
-
-                  variable "server_name" {
-                    type = string
-                    description = "mariadb server name"
-                    default = "mariadb-svr-sample"
-                  }
-
-                  variable "db_name" {
-                    default = "backend"
-                    type = string
-                    description = "Database instance name"
-                  }
-
-                  variable "username" {
-                    default = "acctestun"
-                    type = string
-                    description = "Database instance username"
-                  }
-
-                  variable "password" {
-                    default = "H@Sh1CoR3!faked"
-                    type = string
-                    description = "Database instance password"
-                  }
-
-                  variable "location" {
-                    description = "Azure location"
-                    type = string
-                    default = "West Europe"
-                  }
-
-                  variable "resource_group" {
-                    description = "Resource group"
-                    type = string
-                    default = "kubevela-group"
-                  }
-
-                  output "SERVER_NAME" {
-                    value = var.server_name
-                  }
-
-                  output "DB_NAME" {
-                    value = var.db_name
-                  }
-                  output "DB_USER" {
-                    value = var.username
-                  }
-                  output "DB_PASSWORD" {
-                    sensitive = true
-                    value = var.password
-                  }
-                  output "DB_PORT" {
-                    value = "3306"
-                  }
-                  output "DB_HOST" {
-                    value = azurerm_mariadb_server.example.fqdn
-                  }
-                providerRef:
-                  name: azure
-                  namespace: default
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: azure-storage-account
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Azure Blob Storage
-                Account
-              provider: azure
-            labels:
-              type: terraform
-            name: azure-storage-account
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  # Configure the Microsoft Azure Provider
-                  provider "azurerm" {
-                    features {}
-                  }
-
-                  resource "azurerm_resource_group" "rsg" {
-                    count    = var.create_rsg ? 1 : 0
-                    name     = var.resource_group_name
-                    location = var.location
-                  }
-
-                  resource "azurerm_storage_account" "sa" {
-                    name                      = var.name
-                    resource_group_name       = var.create_rsg ? azurerm_resource_group.rsg[0].name : var.resource_group_name
-                    location                  = var.location
-                    account_tier              = "Standard"
-                    account_replication_type  = "GRS"
-                    enable_https_traffic_only = true
-
-                    dynamic "static_website" {
-                      for_each = var.static_website
-                      content {
-                        index_document     = static_website.value["index_document"]
-                        error_404_document = static_website.value["error_404_document"]
-                      }
-                    }
-
-                    tags = var.tags
-                  }
-
-                  variable "create_rsg" {
-                    description = "Conditional if resource group should be created. Defaults to 'true'."
-                    type        = bool
-                    default     = true
-                  }
-
-                  variable "resource_group_name" {
-                    description = "Name of resource group. Defaults to 'rsg'."
-                    type        = string
-                    default     = "rsg"
-                  }
-
-                  variable "name" {
-                    description = "Name of storage account. Defaults to 'storageaccount'."
-                    type        = string
-                    default     = "storageaccount"
-                  }
-
-                  variable "location" {
-                    description = "Location of storage account. Defaults to 'West Europe'."
-                    type        = string
-                    default     = "West Europe"
-                  }
-
-                  variable "tags" {
-                    description = "Tags for storage account. Defaults to '{}'."
-                    type        = map(string)
-                    default     = {}
-                  }
-
-                  variable "static_website" {
-                    description = "Static website configuration. Defaults to disabled."
-                    type        = list(map(string))
-                    default     = [{
-                      index_document = null
-                      error_404_document = null
-                    }]
-                  }
-
-                  output "BLOB_CONNECTION_STRING" {
-                    description = "Blob storage connection string"
-                    sensitive   = true
-                    value       = azurerm_storage_account.sa.primary_connection_string
-                  }
-
-                  output "BLOB_WEB_ENDPOINT" {
-                    description = "Blob storage static web endpoint"
-                    value       = azurerm_storage_account.sa.primary_web_endpoint
-                  }
-                providerRef:
-                  name: azure
-                  namespace: default
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      workflow:
-        steps:
-        - name: ""
-          properties:
-            name: fluxcd
-            namespace: vela-system
-          type: depends-on-app
-        - name: ""
-          type: apply-application
-    status: {}
-  detail: ""
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
-      Terraform.
-    addons.oam.dev/name: terraform
-  labels:
-    addons.oam.dev/type: terraform
-  name: terraform
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -66,6 +66,11 @@ spec:
       tolerations:
       {{- toYaml . | nindent 8 }}
       {{- end }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
 {{ end }}
 ---
 {{ if .Values.multicluster.enabled }}
@@ -84,6 +89,10 @@ spec:
 {{ end }}
 ---
 {{ if .Values.multicluster.enabled }}
+{{ $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:
@@ -105,6 +114,7 @@ spec:
   caBundle: Cg==
   {{ end }}
 {{ end }}
+{{ end }}
 ---
 {{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1

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

@@ -0,0 +1,21 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/apply-application-in-parallel.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply components of an application in parallel for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: apply-application-in-parallel
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ApplyApplicationInParallel & {}
+

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

@@ -16,9 +16,10 @@ spec:
         )
 
         app: op.#ApplyEnvBindApp & {
-        	env:    parameter.env
-        	policy: parameter.policy
-        	app:    context.name
+        	env:      parameter.env
+        	policy:   parameter.policy
+        	parallel: parameter.parallel
+        	app:      context.name
         	// context.namespace indicates the namespace of the app
         	namespace: context.namespace
         }
@@ -27,5 +28,7 @@ spec:
         	policy: *"" | string
         	// +usage=Declare the name of the env in policy
         	env: string
+        	// +usage=components are applied in parallel
+        	parallel: *false | bool
         }
 

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Deploy application to runtime clusters
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to config map for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2config
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -30,6 +32,7 @@ spec:
         		}
         		data: parameter.data
         	}
+        	cluster: parameter.cluster
         }
         parameter: {
         	// +usage=Specify the name of the config map
@@ -38,5 +41,7 @@ spec:
         	namespace?: string
         	// +usage=Specify the data of config map
         	data: {}
+        	// +usage=Specify the cluster of the config map
+        	cluster: *"" | string
         }
 

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to secret for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -33,6 +35,7 @@ spec:
         		}
         		stringData: parameter.data
         	}
+        	cluster: parameter.cluster
         }
         parameter: {
         	// +usage=Specify the name of the secret
@@ -43,5 +46,7 @@ spec:
         	type?: string
         	// +usage=Specify the data of secret
         	data: {}
+        	// +usage=Specify the cluster of the config map
+        	cluster: *"" | string
         }
 

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

@@ -17,14 +17,46 @@ 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?: {
-        		url: value | secretRef
+        		// +usage=Specify the the dingding 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: {
         			text?: *null | {
         				content: string
         			}
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
-        			msgtype: string
+        			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
         			link?:   *null | {
         				text?:       string
         				title?:      string
@@ -63,7 +95,18 @@ spec:
         	}
 
         	slack?: {
-        		url: value | secretRef
+        		// +usage=Specify the the slack 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: {
         			text:         string
         			blocks?:      *null | [...block]
@@ -77,17 +120,36 @@ spec:
         	}
 
         	email?: {
+        		// +usage=Specify the email info that you want to send from
         		from: {
-        			address:  string
-        			alias?:   string
-        			password: value | secretRef
-        			host:     string
-        			port:     *587 | int
+        			// +usage=Specify the email address that you want to send from
+        			address: string
+        			// +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: 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
+        			port: *587 | int
         		}
+        		// +usage=Specify the email address that you want to send to
         		to: [...string]
+        		// +usage=Specify the content of the email
         		content: {
+        			// +usage=Specify the subject of the email
         			subject: string
-        			body:    string
+        			// +usage=Specify the context body of the email
+        			body: string
         		}
         	}
         }
@@ -136,11 +198,6 @@ spec:
         	description?: textType
         	url?:         string
         }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
         // send webhook notification
         ding: op.#Steps & {
         	if parameter.dingding != _|_ {
@@ -171,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/rollout.yaml

@@ -43,4 +43,7 @@ spec:
         	batchPartition?: int
         }
         rolloutBatch: replicas: int
+  status:
+    customStatus: 'message: context.outputs.rollout.status.rollingState'
+    healthPolicy: 'isHealth: context.outputs.rollout.status.batchRollingState == "batchReady"'
 

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

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: share-cloud-resource
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -27,7 +25,6 @@ spec:
         	name: context.name
         }
         parameter: {
-        	env: string
         	// +usage=Declare the location to bind
         	placements: [...{
         		namespace?: string

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

@@ -280,10 +280,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
@@ -494,7 +494,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 +504,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-views/component-pod-view.yaml

@@ -1,106 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: component-pod-view
-  namespace: {{.Values.systemDefinitionNamespace}}
-data:
-  template: |
-    import (
-      "vela/ql"
-      "vela/op"
-      "strings"
-    )
-
-    parameter: {
-      appName:    string
-      appNs:      string
-      name?:      string
-      cluster?:   string
-      clusterNs?: string
-    }
-
-    annotationDeployVersion:  "app.oam.dev/deployVersion"
-    annotationPublishVersion: "app.oam.dev/publishVersion"
-
-    resources: ql.#ListResourcesInApp & {
-      app: {
-        name:      parameter.appName
-        namespace: parameter.appNs
-        filter: {
-          if parameter.cluster != _|_ {
-            cluster: parameter.cluster
-          }
-          if parameter.clusterNs != _|_ {
-            clusterNamespace: parameter.clusterNs
-          }
-          if parameter.name != _|_ {
-            components: [parameter.name]
-          }
-        }
-      }
-    }
-
-    if resources.err == _|_ {
-      collectedPods: op.#Steps & {
-        for i, resource in resources.list {
-          "\(i)": ql.#CollectPods & {
-            value:   resource.object
-            cluster: resource.cluster
-          }
-        }
-      }
-      podsWithCluster: [ for pods in collectedPods if pods.list != _|_ for podObj in pods.list {
-        cluster: pods.cluster
-        obj:     podObj
-        workload: {
-          apiVersion: pods.value.apiVersion
-          kind:       pods.value.kind
-        }
-        if pods.value.metadata.annotations[annotationPublishVersion] != _|_ {
-          publishVersion: pods.value.metadata.annotations[annotationPublishVersion]
-        }
-        if pods.value.metadata.annotations[annotationDeployVersion] != _|_ {
-          deployVersion: pods.value.metadata.annotations[annotationDeployVersion]
-        }
-      }]
-      podsError: [ for pods in collectedPods if pods.err != _|_ {pods.err}]
-      status: {
-        if len(podsError) == 0 {
-          podList: [ for pod in podsWithCluster {
-            cluster:  pod.cluster
-            workload: pod.workload
-            metadata: {
-              name:         pod.obj.metadata.name
-              namespace:    pod.obj.metadata.namespace
-              creationTime: pod.obj.metadata.creationTimestamp
-              version: {
-                if pod.publishVersion != _|_ {
-                  publishVersion: pod.publishVersion
-                }
-                if pod.deployVersion != _|_ {
-                  deployVersion: pod.deployVersion
-                }
-              }
-            }
-            status: {
-              phase: pod.obj.status.phase
-              // refer to https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
-              if phase != "Pending" && phase != "Unknown" {
-                podIP:    pod.obj.status.podIP
-                hostIP:   pod.obj.status.hostIP
-                nodeName: pod.obj.spec.nodeName
-              }
-            }
-          }]
-        }
-        if len(podsError) != 0 {
-          error: strings.Join(podsError, ",")
-        }
-      }
-    }
-
-    if resources.err != _|_ {
-      status: {
-        error: resources.err
-      }
-    }

charts/vela-core/templates/velaql-views/pod-view.yaml

@@ -1,84 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: pod-view
-  namespace: {{.Values.systemDefinitionNamespace}}
-data:
-  template: |
-    import (
-      "vela/ql"
-    )
-
-    parameter: {
-      name:      string
-      namespace: string
-      cluster:   *"" | string
-    }
-
-    pod: ql.#Read & {
-      value: {
-        apiVersion: "v1"
-        kind:       "Pod"
-        metadata: {
-          name:      parameter.name
-          namespace: parameter.namespace
-        }
-      }
-      cluster: parameter.cluster
-    }
-
-    eventList: ql.#SearchEvents & {
-      value: {
-        apiVersion: "v1"
-        kind:       "Pod"
-        metadata:   pod.value.metadata
-      }
-      cluster: parameter.cluster
-    }
-
-    podMetrics: ql.#Read & {
-      cluster: parameter.cluster
-      value: {
-        apiVersion: "metrics.k8s.io/v1beta1"
-        kind:       "PodMetrics"
-        metadata: {
-          name:      parameter.name
-          namespace: parameter.namespace
-        }
-      }
-    }
-
-    status: {
-      if pod.err == _|_ {
-        containers: [ for container in pod.value.spec.containers {
-          name:  container.name
-          image: container.image
-          resources: {
-            if container.resources.limits != _|_ {
-              limits: container.resources.limits
-            }
-            if container.resources.requests != _|_ {
-              requests: container.resources.requests
-            }
-            if podMetrics.err == _|_ {
-              usage: {for containerUsage in podMetrics.value.containers {
-                if containerUsage.name == container.name {
-                  cpu:    containerUsage.usage.cpu
-                  memory: containerUsage.usage.memory
-                }
-              }}
-            }
-          }
-          status: {for containerStatus in pod.value.status.containerStatuses if containerStatus.name == container.name {
-            state:        containerStatus.state
-            restartCount: containerStatus.restartCount
-          }}
-        }]
-        if eventList.err == _|_ {
-          events: eventList.list
-        }
-      }
-      if pod.err != _|_ {
-        error: pod.err
-      }
-    }

charts/vela-core/templates/velaql-views/resource-view.yaml

@@ -1,62 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: resource-view
-  namespace: {{.Values.systemDefinitionNamespace}}
-data:
-  template: |
-    import (
-      "vela/ql"
-    )
-
-    parameter: {
-      type:      string
-      namespace: *"" | string
-      cluster:   *"" | string
-    }
-
-    schema: {
-      "secret": {
-        apiVersion: "v1"
-        kind:       "Secret"
-      }
-      "configMap": {
-        apiVersion: "v1"
-        kind:       "ConfigMap"
-      }
-      "pvc": {
-        apiVersion: "v1"
-        kind:       "PersistentVolumeClaim"
-      }
-      "storageClass": {
-        apiVersion: "storage.k8s.io/v1"
-        kind:       "StorageClass"
-      }
-      "ns": {
-        apiVersion: "v1"
-        kind:       "Namespace"
-      }
-    }
-
-    List: ql.#List & {
-      resource: schema[parameter.type]
-      filter: {
-        namespace: parameter.namespace
-      }
-      cluster: parameter.cluster
-    }
-
-    status: {
-      if List.err == _|_ {
-        if len(List.list.items) == 0 {
-          error: "failed to list \(parameter.type) in namespace \(parameter.namespace)"
-        }
-        if len(List.list.items) != 0 {
-          list: List.list.items
-        }
-      }
-
-      if List.err != _|_ {
-        error: List.err
-      }
-    }

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
@@ -107,13 +110,13 @@ dependCheckWait: 30s
 OAMSpecVer: "v0.3"
 
 multicluster:
-  enabled: false
+  enabled: true
   clusterGateway:
     replicaCount: 1
     port: 9443
     image:
       repository: oamdev/cluster-gateway
-      tag: v1.1.6
+      tag: v1.1.7
       pullPolicy: Always
     resources:
       limits:

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

@@ -640,7 +640,8 @@ spec:
                           type: object
                         type: array
                       resourceTracker:
-                        description: ResourceTracker record the status of the ResourceTracker
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -676,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
@@ -985,6 +879,8 @@ spec:
                             type: object
                           finished:
                             type: boolean
+                          message:
+                            type: string
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string
@@ -2321,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,
@@ -2897,7 +2475,8 @@ spec:
                           type: object
                         type: array
                       resourceTracker:
-                        description: ResourceTracker record the status of the ResourceTracker
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -2933,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
@@ -3242,6 +2714,8 @@ spec:
                             type: object
                           finished:
                             type: boolean
+                          message:
+                            type: string
                           mode:
                             description: WorkflowMode describes the mode of workflow
                             type: string

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

@@ -461,7 +461,7 @@ spec:
                   type: object
                 type: array
               resourceTracker:
-                description: ResourceTracker record the status of the ResourceTracker
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -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:
@@ -667,6 +591,8 @@ spec:
                     type: object
                   finished:
                     type: boolean
+                  message:
+                    type: string
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string
@@ -874,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:
@@ -1285,7 +983,7 @@ spec:
                   type: object
                 type: array
               resourceTracker:
-                description: ResourceTracker record the status of the ResourceTracker
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -1309,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:
@@ -1491,6 +1113,8 @@ spec:
                     type: object
                   finished:
                     type: boolean
+                  message:
+                    type: string
                   mode:
                     description: WorkflowMode describes the mode of workflow
                     type: string

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

@@ -15,11 +15,24 @@ spec:
     listKind: ResourceTrackerList
     plural: resourcetrackers
     shortNames:
-    - tracker
+    - rt
     singular: resourcetracker
   scope: Cluster
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: TYPE
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/name']
+      name: APP
+      type: string
+    - jsonPath: .metadata.labels['app\.oam\.dev\/namespace']
+      name: APP-NS
+      type: string
+    - jsonPath: .spec.applicationGeneration
+      name: APP-GEN
+      type: number
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: An ResourceTracker represents a tracker for track cross namespace
@@ -37,10 +50,80 @@ spec:
             type: string
           metadata:
             type: object
+          spec:
+            description: ResourceTrackerSpec define the spec of resourceTracker
+            properties:
+              applicationGeneration:
+                format: int64
+                type: integer
+              managedResources:
+                items:
+                  description: ManagedResource define the resource to be managed by
+                    ResourceTracker
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    cluster:
+                      type: string
+                    component:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
+                    deleted:
+                      description: Deleted marks the resource to be deleted
+                      type: boolean
+                    env:
+                      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
+                    raw:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    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
+                    trait:
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
+              type:
+                description: ResourceTrackerType defines the type of resourceTracker
+                type: string
+            required:
+            - applicationGeneration
+            type: object
           status:
             description: ResourceTrackerStatus define the status of resourceTracker
+              For backward-compatibility
             properties:
               trackedResources:
+                description: Deprecated
                 items:
                   description: ClusterObjectReference defines the object reference
                     with cluster.

charts/vela-minimal/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -0,0 +1,21 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/apply-application-in-parallel.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply components of an application in parallel for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: apply-application-in-parallel
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ApplyApplicationInParallel & {}
+

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Deploy application to runtime clusters
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to config map for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2config
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -30,6 +32,7 @@ spec:
         		}
         		data: parameter.data
         	}
+        	cluster: parameter.cluster
         }
         parameter: {
         	// +usage=Specify the name of the config map
@@ -38,5 +41,7 @@ spec:
         	namespace?: string
         	// +usage=Specify the data of config map
         	data: {}
+        	// +usage=Specify the cluster of the config map
+        	cluster: *"" | string
         }
 

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to secret for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -33,6 +35,7 @@ spec:
         		}
         		stringData: parameter.data
         	}
+        	cluster: parameter.cluster
         }
         parameter: {
         	// +usage=Specify the name of the secret
@@ -43,5 +46,7 @@ spec:
         	type?: string
         	// +usage=Specify the data of secret
         	data: {}
+        	// +usage=Specify the cluster of the config map
+        	cluster: *"" | string
         }
 

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

@@ -17,14 +17,46 @@ 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?: {
-        		url: value | secretRef
+        		// +usage=Specify the the dingding 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: {
         			text?: *null | {
         				content: string
         			}
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
-        			msgtype: string
+        			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
         			link?:   *null | {
         				text?:       string
         				title?:      string
@@ -63,7 +95,18 @@ spec:
         	}
 
         	slack?: {
-        		url: value | secretRef
+        		// +usage=Specify the the slack 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: {
         			text:         string
         			blocks?:      *null | [...block]
@@ -77,17 +120,36 @@ spec:
         	}
 
         	email?: {
+        		// +usage=Specify the email info that you want to send from
         		from: {
-        			address:  string
-        			alias?:   string
-        			password: value | secretRef
-        			host:     string
-        			port:     *587 | int
+        			// +usage=Specify the email address that you want to send from
+        			address: string
+        			// +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: 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
+        			port: *587 | int
         		}
+        		// +usage=Specify the email address that you want to send to
         		to: [...string]
+        		// +usage=Specify the content of the email
         		content: {
+        			// +usage=Specify the subject of the email
         			subject: string
-        			body:    string
+        			// +usage=Specify the context body of the email
+        			body: string
         		}
         	}
         }
@@ -136,11 +198,6 @@ spec:
         	description?: textType
         	url?:         string
         }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
         // send webhook notification
         ding: op.#Steps & {
         	if parameter.dingding != _|_ {
@@ -171,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/rollout.yaml

@@ -43,4 +43,7 @@ spec:
         	batchPartition?: int
         }
         rolloutBatch: replicas: int
+  status:
+    customStatus: 'message: context.outputs.rollout.status.rollingState'
+    healthPolicy: 'isHealth: context.outputs.rollout.status.batchRollingState == "batchReady"'
 

charts/vela-minimal/templates/defwithtemplate/share-cloud-resource.yaml

@@ -5,8 +5,6 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
   name: share-cloud-resource
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
@@ -27,7 +25,6 @@ spec:
         	name: context.name
         }
         parameter: {
-        	env: string
         	// +usage=Declare the location to bind
         	placements: [...{
         		namespace?: string

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

@@ -280,10 +280,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
@@ -494,7 +494,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 +504,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:

charts/vela-minimal/values.yaml

@@ -112,7 +112,7 @@ multicluster:
     port: 9443
     image:
       repository: oamdev/cluster-gateway
-      tag: v1.1.3
+      tag: v1.1.7
       pullPolicy: Always
     resources:
       limits:

cmd/apiserver/main.go

@@ -45,6 +45,7 @@ func main() {
 	flag.StringVar(&s.restCfg.LeaderConfig.ID, "id", uuid.New().String(), "the holder identity name")
 	flag.StringVar(&s.restCfg.LeaderConfig.LockName, "lock-name", "apiserver-lock", "the lease lock resource name")
 	flag.DurationVar(&s.restCfg.LeaderConfig.Duration, "duration", time.Second*5, "the lease lock resource name")
+	flag.DurationVar(&s.restCfg.AddonCacheTime, "addon-cache-duration", time.Minute*10, "how long between two addon cache operation")
 	flag.Parse()
 
 	if len(os.Args) > 2 && os.Args[1] == "build-swagger" {

cmd/core/main.go

@@ -30,14 +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"
 
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
+	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"
@@ -75,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
@@ -111,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")
@@ -132,6 +129,7 @@ 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.")
+	standardcontroller.AddOptimizeFlags()
 
 	flag.Parse()
 	// setup logging
@@ -206,12 +204,16 @@ func main() {
 		Port:                       webhookPort,
 		CertDir:                    certDir,
 		HealthProbeBindAddress:     healthAddr,
-		SyncPeriod:                 &syncPeriod,
 		LeaderElectionResourceLock: leaderElectionResourceLock,
 		LeaseDuration:              &leaseDuration,
 		RenewDeadline:              &renewDeadline,
 		RetryPeriod:                &retryPeriod,
-		ClientDisableCacheFor:      []client.Object{&v1beta1.ResourceTracker{}, &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/coding-conventions.md

@@ -22,6 +22,10 @@
 
   - Command-line flags should use dashes, not underscores
 
+  - API
+    - According to RFC3986, URLs are "case sensitive". KubeVela uses snake_case for API URLs.
+      - e.g.: `POST /v1/cloud_clusters`
+
   - Naming
     - Please consider package name when selecting an interface name, and avoid
       redundancy.

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. |

design/vela-core/resourcetracker_design.md

@@ -0,0 +1,56 @@
+# ResourceTracker: Managing Resources behind Application
+
+- Owner: Da Yin (@somefive)
+- Reviewer: Jian Li (@leejanee), Jianbo Sun (@wonderflow)
+- Date: 12/10/2021
+- Status: Implemented
+
+## Intro
+
+As the release of Workflow in KubeVela v1.1, resources dispatched by application can be extremely dynamic.
+Instead of simply declaring in Application Component, users can have advanced control for applied resources by leveraging WorkflowSteps such as `ApplyObject` or operators such as `op.Delete`.
+Meanwhile, with EnvBinding Policy also released in KubeVela 1.1, users can have multiple same components but deployed in different clusters.
+These techniques raise new challenges for tracking and maintaining of resources.
+
+## Goal
+
+To tackle these challenges, a new architecture of ResourceTracker is proposed and implemented.
+Generally, there are several major technical changes compared to the previous version:
+
+1. Resources do not use OwnerReference to track their ResourceTracker anymore. In other word, the previous bi-directional binding is simplified into uni-directional, which allows us to have more flexible resource management strategies (such as releasing the control of resources).
+2. Resources rendered manifests are recorded in ResourceTracker optionally. Based on that, we can prevent configuration drift by leveraging the reconciling mechanism of the Kubernetes operator pattern. 
+3. ResourceTracker deletion now use finalizer and leverage ApplicationController to reconcile. This ensures the deletion of Application truly removes all managed resources. Also, it allows users to manage versioned resource manually. 
+4. ResourceTracker in the HubCluster can track resources in ManagedClusters, so that no ResourceTracker is needed anymore in ManagedCluster. Now we can use caches for ResourceTracker again. Additionally, we do not individual multicluster garbage-collect logic anymore.
+
+From the perspective of users, the direct new-incoming capabilities include:
+1. Users can prevent configuration drift by default, which is a common usage of the classical Application model. Alternatively, they can only dispatch resources by leveraging [ApplyOnce](../../docs/examples/app-with-policy/apply-once-policy) Policy, which is the mode of Application-as-Workflow.
+2. Users can have customized life-cycle control for application resources by leveraging [GarbageCollect](../../docs/examples/app-with-policy/gc-policy) Policy. For example, users might want to keep resources after version updates or application removal.
+
+## Implementations
+
+### ResourceTracker Types
+
+There are several *ResourceTrackers* maintained for one Application.
+- **Versioned ResourceTracker**: Each ResourceTracker keeps the record for the resources of one Application generation. Most resources are kept here. When application spec is updated, new versioned ResourceTracker will be created and used. 
+- **Root ResourceTracker**: This ResourceTracker keeps the record of the resources that shares the life-cycle with the Application instead of a single version. Resources recorded here will not be recycled until Application is deleted.
+- **ControllerRevision ResourceTracker**: This ResourceTracker tracks all the dispatched component revisions. When some components are not in use in new versions, this ResourceTracker can elegantly recycle the revisions for those components. 
+
+### ResourceKeeper
+
+The main implementation of the resource management logic locates at [pkg/resourcekeeper](../../pkg/resourcekeeper).
+The **ResourceKeeper** takes charge of the dispatching, tracking, and recycling of all resources.
+- **Dispatch**: First record resources in **ResourceTracker**, then apply resources. Depending on the life-cycle of resources, either **Versioned ResourceTracker** or **Root ResourceTracker** will be used.
+- **Delete**: First mark resources as deleted in **ResourceTracker**, then delete resources.
+- **StateKeep**: Ranging over all managed resources in the latest **Versioned ResourceTracker** and **Root ResourceTracker**, re-apply those resources.
+- **GarbageCollect**: Mark outdated or unused ResourceTrackers as deleted and garbage-collect their managed resources. Details will be delivered below.
+
+### Garbage Collection Details
+
+The **GarbageCollect** process includes several steps.
+0. **Init**: Scanning over all managed resources in all **Versioned ResourceTrackers** and **Root ResourceTracker** (do not retrieve content from APIServer), aggregating the trackers of each resource and calculate which one RT is responsible for garbage collecting it. 
+1. **Mark Stage**: Ranging over all ResourceTrackers. If `KeepLegacyResources` is not enabled, outdated ResourceTrackers will be marked as deleted. If enabled, inactive ResourceTrackers, that have all managed resources removed or managed by newer ResourceTrackers, will be marked as deleted. 
+2. **Sweep Stage**: For all ResourceTrackers marked as deleted, check if all inactive managed resources (managed by newer RT or deleted) are removed (do not exist). If true, remove the finalizer of the ResourceTracker (truly remove it).
+3. **Finalize Stage**: For all ResourceTrackers marked as deleted, deleting all inactive managed resources.
+4. **GarbageCollectComponentRevisionResourceTracker**: Ranging over all resources in active ResourceTrackers and calculate the component usage. For ComponentRevisions whose component is not in-use anymore, remove them.
+
+The **Mark Stage** and **GarbageCollectComponentRevisionResourceTracker** will only run when application workflow succeeded, which means when application is still running workflow or new release is not successful, outdated ResourceTrackers will not be marked and resources will not be recycled.

design/vela-core/workflow_policy.md

@@ -52,10 +52,6 @@ spec:
   # - should mark "finish" phase in status.conditions.
   workflow:
 
-    # suspend can manually stop the workflow and resume. it will also allow suspend policy for workflow.
-    suspend:
-      manual: true
-
     steps:
 
     # blue-green rollout
@@ -64,6 +60,9 @@ spec:
       properties:
         partition: "50%"
 
+    # suspend can manually stop the workflow and resume. it will also allow suspend policy for workflow.
+    - type: suspend
+
     # traffic shift
     - type: traffic-shift
       properties:
@@ -131,6 +130,46 @@ spec:
         }
 ```
 
+### Stability mechanism
+
+#### Backoff Time
+
+Sometimes a workflow step can take a long time, so we need a backoff time for workflow reconciliation.
+
+If the status of workflow step is `waiting` or `failed`, the workflow will be reconciled after a backoff time like below:
+
+```
+int(0.05 * 2^(n-1))
+```
+
+Based on the above formula, we will take `1s` and `600s` as our min and max time.
+
+For example, if the workflow is `waiting`, the first ten reconciliation will be like:
+
+| Times | 2^(n-1) | 0.05*2^(n-1) | Requeue After(s) |
+| ------ | ------ | ------ | ------ |
+| 1 | 1 | 0.05 | 1 |
+| 2 | 2 | 0.1 | 1 |
+| 3 | 4 | 0.2 | 1 |
+| 4 | 8 | 0.4 | 1 |
+| 5 | 16 | 0.8 | 1 |
+| 6 | 32 | 1.6 | 1 |
+| 7 | 64 | 3.2 | 3 |
+| 8 | 128 | 6.4 | 6 |
+| 9 | 256 | 12.8 | 12 |
+| 10 | 512 | 25.6 | 25 |
+| ... | ... | ... | ... |
+
+#### Failed Workflow Steps
+
+If the workflow step is `failed`, it means that there may be some error in the workflow step, like some cue errors.
+
+> Note that if the workflow step is unhealthy, the workflow step will be marked as `wait` but not `failed` and it will wait for healthy.
+
+For this case, we will retry the workflow step 10 times, and if the workflow step is still `failed`, we will suspend this workflow, and it's message will be `The workflow suspends automatically because the failed times of steps have reached the limit(10 times)`.
+
+After the workflow is suspended, we can change the workflow step to make it work, and then use `vela workflow resume <workflow-name>` to resume it.
+
 ## Implementation
 
 In this section we will discuss the implementation details for supporting policies and workflow tasks.
@@ -235,6 +274,7 @@ Here are the steps in Task Manager:
   - continue: continue to run the next action.
   - wait: makes the workflow manager to retry later.
   - break: makes the workflow manager to stop the entire workflow.
+  - failedAfterRetries: if there are no other running steps, makes the workflow manager to suspend the workflow.
 
 - Task Manager will change status as needed based on the returned TaskStatus, e.g. change to wait. 
 
@@ -417,11 +457,13 @@ Each workflow task has similar interactions with Task Manager as follows:
 
 - The Task Manager will apply the workflow object with annotation `app.oam.dev/workflow-context`. This annotation will pass in the context marshalled in json defined as the following:
   ```go
-  type WorkflowContext struct {
-    AppName string
-    AppRevisionName string
-    StepIndex int
-  }
+    type WorkflowContext struct {
+    	cli        client.Client
+    	store      *corev1.ConfigMap
+    	components map[string]*ComponentManifest
+    	vars       *value.Value
+    	modified   bool
+    }
   ```
 
 - The workflow object's status condition should turn to be `True` status and `Succeeded` reason, and `observedGeneration` to match the resource's generation per se.

docs/examples/app-with-policy/apply-once-policy/apply-once.md

@@ -0,0 +1,31 @@
+# How to use ApplyOnce policy
+
+By default, the KubeVela operator will prevent configuration drift for applied resources by reconciling them routinely. This is useful if you want to keep your application always have the desired configuration in avoid of some unintentional changes by external modifiers.
+
+However, sometimes, you might want to use KubeVela Application to do the dispatch job and recycle job but want to leave resources mutable after workflow is finished. In this case, you can use the following ApplyOnce policy. 
+
+```shell
+$ cat <<EOF | kubectl apply -f -
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: apply-once-app
+spec:
+  components:
+    - name: hello-world
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+      traits:
+        - type: scaler
+          properties:
+            replicas: 1
+  policies:
+    - name: apply-once
+      type: apply-once
+      properties:
+        enable: true
+EOF
+```
+
+In this case, if you change the replicas of the `hello-world` deployment after Application enters `running` state, it would be brought back. On the contrary, if you set the `apply-once` policy to be disabled (by default), any changes to the replicas of `hello-world` application will be brought back in the next reconcile loop.

docs/examples/app-with-policy/gc-policy/keep-legacy-resources.md

@@ -1,4 +1,4 @@
-## How to use garbage-collect policy
+## How to keep legacy resources
 
 Suppose you want to keep the resources created by the old version of the app. You only need to specify garbage-collect in the policy field of the app and enable the option `keepLegacyResource`.
 

docs/examples/app-with-policy/gc-policy/persist-resources.md

@@ -0,0 +1,79 @@
+# How to persist resources
+
+By leveraging the garbage-collect policy, users can persist some resources, which skip the normal garbage-collect process when application is updated.
+
+Take the following app as an example, in the garbage-collect policy, a rule is added which marks all the resources created by the `expose` trait to use the `onAppDelete` strategy. This will keep those services until application is deleted.
+```shell
+$ cat <<EOF | kubectl apply -f -
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: garbage-collect-app
+spec:
+  components:
+    - name: hello-world
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+      traits:
+        - type: expose
+          properties:
+            port: [8000]
+  policies:
+    - name: garbage-collect
+      type: garbage-collect
+      properties:
+        rules:
+          - selector:
+              traitTypes:
+                - expose
+            strategy: onAppDelete
+EOF
+```
+
+You can find deployment and service are created.
+```shell
+$ kubectl get deployment
+NAME          READY   UP-TO-DATE   AVAILABLE   AGE
+hello-world   1/1     1            1           74s
+$ kubectl get service   
+NAME          TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
+hello-world   ClusterIP   10.96.160.208   <none>        8000/TCP   78s
+```
+
+If you upgrade the application and use a different component, you will find the old versioned deployment is deleted by the service is kept.
+```shell
+$ cat <<EOF | kubectl apply -f -
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: garbage-collect-app
+spec:
+  components:
+    - name: hello-world-new
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+      traits:
+        - type: expose
+          properties:
+            port: [8000]
+  policies:
+    - name: garbage-collect
+      type: garbage-collect
+      properties:
+        rules:
+          - selector:
+              traitTypes:
+                - expose
+            strategy: onAppDelete
+EOF
+
+$ kubectl get deployment
+NAME              READY   UP-TO-DATE   AVAILABLE   AGE
+hello-world-new   1/1     1            1           10s
+$ kubectl get service   
+NAME              TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
+hello-world       ClusterIP   10.96.160.208   <none>        8000/TCP   5m56s
+hello-world-new   ClusterIP   10.96.20.4      <none>        8000/TCP   13s
+```

docs/examples/helm-module/webapp-chart-cd.yaml

@@ -18,4 +18,4 @@ spec:
             chart: "podinfo"
             version: "5.1.4"
       repository:
-        url: "http://oam.dev/catalog/"
+        url: "https://charts.kubevela.net/example/"

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/export2config/app.yaml

@@ -20,7 +20,7 @@ spec:
         properties:
           component: express-server
       - name: export-config
-        type: export-config
+        type: export2config
         inputs:
           - from: status
             parameterKey: data.serverstatus

docs/examples/workflow/export2secret/app.yaml

@@ -20,7 +20,7 @@ spec:
         properties:
           component: express-server
       - name: export-secret
-        type: export-secret
+        type: export2secret
         inputs:
           - from: status
             parameterKey: data.serverstatus