Fix: backport Terraform releated PR (#2829)

- Fix: upgrade terraform controller to v0.2.10 #2827
- Fix: support naming a terraform provider #2794

Signed-off-by: zzxwill <zzxwill@gmail.com>

.github/pr-title-checker-config.json

@@ -0,0 +1,10 @@
+{
+  "LABEL": {
+    "name": "title-needs-formatting",
+    "color": "EEEEEE"
+  },
+  "CHECKS": {
+    "prefixes": ["Fix: ", "Feat: ", "Docs: ", "Test: ", "Chore: ", "CI: ", "Perf: ", "Refactor: ", "Revert: ", "Style: ", "Test: ", "Backport: ", "Backport",
+      "Fix(", "Feat(", "Docs(", "Test(", "Chore(", "CI(", "Perf(", "Refactor(", "Revert(", "Style(", "Test(", "Backport("]
+  }
+} 

.github/workflows/commit-lint.yml

@@ -1,13 +1,19 @@
-name: Lint Commit Messages
-on: [push, pull_request]
+name: PR Title Checker
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
 
 jobs:
-  commitlint:
+  check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: thehanimo/pr-title-checker@v1.3.1
         with:
-          fetch-depth: 0
-      - uses: wagoid/commitlint-github-action@v4
-        with:
-          helpURL: https://github.com/oam-dev/kubevela/blob/master/contribute/create-pull-request.md#commit-message-format
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pass_on_octokit_error: true
+          configuration_path: ".github/pr-title-checker-config.json"

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

@@ -76,10 +76,16 @@ jobs:
       - name: Load Image to kind cluster (Hub)
         run: make kind-load
 
+      - name: Load Image to kind cluster (Worker)
+        run: |
+          make kind-load-runtime-cluster
+
       - name: Cleanup for e2e tests
         run: |
           make e2e-cleanup
           make e2e-setup-core
+          make
+          make setup-runtime-e2e-cluster
 
       - name: Run e2e multicluster tests
         run: make e2e-multicluster-test

.github/workflows/e2e-test.yml

@@ -83,6 +83,9 @@ jobs:
       - name: Run api e2e tests
         run: make e2e-api-test
 
+      - name: Run addons e2e tests
+        run: make e2e-addon-test
+
       - name: Run e2e tests
         run: make e2e-test
 

.gitignore

@@ -45,4 +45,7 @@ charts/vela-core/crds/_.yaml
 .vela/
 
 # check docs
-git-page/
+git-page/
+
+# e2e rollout runtime image build
+runtime/rollout/e2e/tmp

Dockerfile

@@ -5,6 +5,10 @@ WORKDIR /workspace
 # Copy the Go Modules manifests
 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
+
 # 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
 RUN go mod download

Makefile

@@ -39,6 +39,9 @@ endif
 VELA_CORE_IMAGE      ?= vela-core:latest
 VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
 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
 
 all: build
 
@@ -143,13 +146,16 @@ e2e-setup-core:
 	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
+	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
 
@@ -168,6 +174,11 @@ 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
@@ -193,10 +204,12 @@ e2e-cleanup:
 	rm -rf ~/.vela
 
 image-cleanup:
+ifneq (, $(shell which docker))
 # Delete Docker image
 ifneq ($(shell docker images -q $(VELA_CORE_TEST_IMAGE)),)
 	docker rmi -f $(VELA_CORE_TEST_IMAGE)
 endif
+endif
 
 end-e2e-core:
 	sh ./hack/e2e/end_e2e_core.sh
@@ -209,6 +222,12 @@ kind-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
 	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
+kind-load-runtime-cluster:
+	/bin/sh hack/e2e/build_runtime_rollout.sh
+	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
+	rm -rf runtime/rollout/e2e/tmp
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
@@ -240,7 +259,7 @@ core-uninstall: manifests
 	kubectl delete -f charts/vela-core/crds/
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: installcue kustomize
+manifests: installcue kustomize addon
 	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
@@ -248,7 +267,6 @@ manifests: installcue kustomize
 	go run ./hack/crd/dispatch/dispatch.go config/crd/base charts/vela-core/crds charts/oam-runtime/crds runtime/ charts/vela-minimal/crds
 	rm -f config/crd/base/*
 	./vela-templates/gen_definitions.sh
-	go run ./vela-templates/gen_addons.go
 
 GOLANGCILINT_VERSION ?= v1.38.0
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
@@ -258,16 +276,20 @@ HOSTARCH := amd64
 endif
 
 golangci:
-ifeq (, $(shell which golangci-lint))
+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 'Install succeed' ;\
+	echo 'Successfully installed' ;\
 	}
 GOLANGCILINT=$(GOBIN)/golangci-lint
 else
-GOLANGCILINT=$(shell which golangci-lint)
+	@$(OK) golangci-lint is already installed
+GOLANGCILINT=$(GOBIN)/golangci-lint
 endif
 
 .PHONY: staticchecktool
@@ -328,3 +350,7 @@ 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

@@ -19,13 +19,11 @@ package common
 import (
 	"encoding/json"
 
+	"github.com/oam-dev/terraform-controller/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	types "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
@@ -114,8 +112,7 @@ type Terraform struct {
 	// +kubebuilder:validation:Enum:=hcl;json;remote
 	Type string `json:"type,omitempty"`
 
-	// ProviderReference specifies the reference to Provider
-	ProviderReference *types.Reference `json:"providerRef,omitempty"`
+	v1beta1.BaseConfigurationSpec `json:",inline"`
 }
 
 // A WorkloadTypeDescriptor refer to a Workload Type

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

@@ -21,7 +21,6 @@ limitations under the License.
 package common
 
 import (
-	crossplane_runtime "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -559,11 +558,7 @@ func (in *SubStepsStatus) DeepCopy() *SubStepsStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Terraform) DeepCopyInto(out *Terraform) {
 	*out = *in
-	if in.ProviderReference != nil {
-		in, out := &in.ProviderReference, &out.ProviderReference
-		*out = new(crossplane_runtime.Reference)
-		**out = **in
-	}
+	in.BaseConfigurationSpec.DeepCopyInto(&out.BaseConfigurationSpec)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.

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

@@ -38,7 +38,8 @@ type WorkflowStepDefinitionSpec struct {
 type WorkflowStepDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
 	condition.ConditionedStatus `json:",inline"`
-
+	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
+	ConfigMapRef string `json:"configMapRef,omitempty"`
 	// LatestRevision of the component definition
 	// +optional
 	LatestRevision *common.Revision `json:"latestRevision,omitempty"`

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

@@ -188,6 +188,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +477,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -193,6 +193,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +463,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create

charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch

charts/oam-runtime/templates/oam-runtime-controller.yaml

@@ -126,7 +126,7 @@ spec:
             {{ end }}
             - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
             - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

charts/oam-runtime/templates/test/test-application.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "oam-runtime.fullname" . }}-test-connection"
+  name: {{ include "oam-runtime.fullname" . }}-test-connection
   labels:
   {{- include "oam-runtime.labels" . | nindent 4 }}
   annotations:
@@ -9,7 +9,7 @@ metadata:
 spec:
   containers:
     - name: wget
-      image: busybox
+      image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
       command: ['wget']
       args: ['{{ include "oam-runtime.fullname" . }}:{{ .Values.healthCheck.port }}']
   restartPolicy: Never

charts/oam-runtime/values.yaml

@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"
 
 disableCaps: "all"
+
+imageRegistry: ""
 image:
   repository: oamdev/vela-core
   tag: latest
@@ -98,4 +100,9 @@ concurrentReconciles: 4
 dependCheckWait: 30s
 
 # OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.2"
+OAMSpecVer: "v0.2"
+
+test:
+  app:
+    repository: oamdev/busybox
+    tag: latest

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

@@ -1232,6 +1232,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1645,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1956,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3390,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3696,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4091,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4365,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4441,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4659,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -179,6 +179,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -463,6 +472,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -222,6 +222,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +516,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +803,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1071,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1147,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -151,6 +151,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -188,6 +188,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +477,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -148,6 +148,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -212,6 +221,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +463,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -8,7 +8,7 @@ data:
         addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
           traffic.
       name: istio
-      namespace: istio-system
+      namespace: vela-system
     spec:
       components:
       - name: ns-istio-system

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

@@ -10,106 +10,13 @@ data:
       namespace: vela-system
     spec:
       components:
-      - name: ns-observability
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: observability
-        type: raw
-      - name: import-grafana-dashboard-traitdef
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Import dashboards to Grafana
-            name: import-grafana-dashboard
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                  \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                  parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
-                  {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:   *\"default\"
-                  | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
-                  *\"default\" | string\n\turls: [...string]\n}\n"
-        type: raw
-      - name: pure-ingress-traitdef
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Enable public web traffic for the component
-                without creating a Service.
-            name: pure-ingress
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
-                  \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec: {\n\t\trules:
-                  [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths: [\n\t\t\t\t\tfor
-                  k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
-                  {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
-                  v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
-                  {\n\t// +usage=Specify the domain you want to expose\n\tdomain: string\n\n\t//
-                  +usage=Specify the mapping relationship between the http path and the
-                  workload port\n\thttp: [string]: int\n}\n"
-            status:
-              customStatus: |-
-                let igs = context.outputs.ingress.status.loadBalancer.ingress
-                if igs == _|_ {
-                  message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
-                }
-                if len(igs) > 0 {
-                  if igs[0].ip != _|_ {
-                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
-                  }
-                  if igs[0].ip == _|_ {
-                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
-                  }
-                }
-              healthPolicy: |
-                isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
-        type: raw
-      - name: register-grafana-datasource-traitdef
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Add a datasource to Grafana
-            name: register-grafana-datasource
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                  \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                  parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
-                  \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
-                  \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
-                  parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
-                  \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
-                  \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
-                  \                     string\n\taccess:                    *\"proxy\"
-                  | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
-                  | string\n}\n"
-        type: raw
       - name: grafana-registration
         properties:
           chart: ./chart
           git:
             branch: master
           repoType: git
-          targetNamespace: observability
+          targetNamespace: vela-system
           url: https://github.com/oam-dev/grafana-registration
           values:
             replicaCount: 1
@@ -119,7 +26,7 @@ data:
           chart: grafana
           releaseName: grafana
           repoType: helm
-          targetNamespace: observability
+          targetNamespace: vela-system
           url: https://charts.kubevela.net/addons
           version: 6.14.1
         traits:
@@ -130,9 +37,9 @@ data:
           type: pure-ingress
         - properties:
             credentialSecret: grafana
-            credentialSecretNamespace: observability
+            credentialSecretNamespace: vela-system
             grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
+            grafanaServiceNamespace: vela-system
             urls:
             - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
             - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
@@ -145,18 +52,18 @@ data:
           chart: loki-stack
           releaseName: loki
           repoType: helm
-          targetNamespace: observability
+          targetNamespace: vela-system
           url: https://charts.kubevela.net/addons
           version: 2.4.1
         traits:
         - properties:
             access: proxy
             credentialSecret: grafana
-            credentialSecretNamespace: observability
+            credentialSecretNamespace: vela-system
             grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
+            grafanaServiceNamespace: vela-system
             name: loki
-            namespace: observability
+            namespace: vela-system
             service: loki
             type: loki
           type: register-grafana-datasource
@@ -166,7 +73,7 @@ data:
           chart: prometheus
           releaseName: prometheus
           repoType: helm
-          targetNamespace: observability
+          targetNamespace: vela-system
           url: https://charts.kubevela.net/addons
           values:
             alertmanager:
@@ -184,11 +91,11 @@ data:
         - properties:
             access: proxy
             credentialSecret: grafana
-            credentialSecretNamespace: observability
+            credentialSecretNamespace: vela-system
             grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
+            grafanaServiceNamespace: vela-system
             name: prometheus
-            namespace: observability
+            namespace: vela-system
             service: prometheus-server
             type: prometheus
           type: register-grafana-datasource
@@ -197,7 +104,7 @@ data:
         properties:
           chart: kube-state-metrics
           repoType: helm
-          targetNamespace: observability
+          targetNamespace: vela-system
           url: https://charts.kubevela.net/addons
           values:
             image:
@@ -212,22 +119,6 @@ data:
             name: fluxcd
             namespace: vela-system
           type: depends-on-app
-        - name: apply-ns
-          properties:
-            component: ns-observability
-          type: apply-component
-        - name: apply-trait-1
-          properties:
-            component: import-grafana-dashboard-traitdef
-          type: apply-component
-        - name: apply-trait-2
-          properties:
-            component: pure-ingress-traitdef
-          type: apply-component
-        - name: apply-trait-3
-          properties:
-            component: register-grafana-datasource-traitdef
-          type: apply-component
         - name: apply-resources
           type: apply-remaining
     status:

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

@@ -0,0 +1,70 @@
+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:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+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

@@ -0,0 +1,70 @@
+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:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+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

@@ -0,0 +1,70 @@
+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:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+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-provider-alibaba.yaml

@@ -8,7 +8,7 @@ data:
         addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
         addons.oam.dev/name: terraform/provider-alibaba
       name: terraform-provider-alibaba
-      namespace: default
+      namespace: vela-system
     spec:
       components:
       - name: alibaba-account-creds
@@ -16,7 +16,7 @@ data:
           apiVersion: v1
           kind: Secret
           metadata:
-            name: alibaba-provider-secret
+            name: alibaba-account-creds
             namespace: vela-system
           stringData:
             credentials: |

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

@@ -0,0 +1,61 @@
+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/provider-aws
+      name: terraform-provider-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
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kubernetes Terraform Controller for AWS
+    addons.oam.dev/name: terraform/provider-aws
+  labels:
+    addons.oam.dev/type: terraform-provider-aws
+  name: terraform-provider-aws
+  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -8,7 +8,7 @@ data:
         addons.oam.dev/description: Kubernetes Terraform Controller for Azure
         addons.oam.dev/name: terraform/provider-azure
       name: terraform-provider-azure
-      namespace: default
+      namespace: vela-system
     spec:
       components:
       - name: azure-account-creds

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

@@ -11,20 +11,35 @@ data:
       namespace: vela-system
     spec:
       components:
-      - name: ns-terraform-system
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: terraform-system
-        type: raw
       - name: terraform-controller
         properties:
           chart: terraform-controller
           repoType: helm
           url: https://charts.kubevela.net/addons
-          version: 0.1.19
+          version: 0.2.10
         type: helm
+      - 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-ack
         properties:
           apiVersion: core.oam.dev/v1beta1
@@ -40,199 +55,32 @@ data:
           spec:
             schematic:
               terraform:
-                configuration: |
-                  module "kubernetes" {
-                    source = "github.com/zzxwill/terraform-alicloud-kubernetes"
-                    new_nat_gateway = true
-                    vpc_name = var.vpc_name
-                    vpc_cidr = var.vpc_cidr
-                    vswitch_name_prefix = var.vswitch_name_prefix
-                    vswitch_cidrs = var.vswitch_cidrs
-                    master_instance_types = var.master_instance_types
-                    worker_instance_types = var.worker_instance_types
-                    k8s_pod_cidr = var.k8s_pod_cidr
-                    k8s_service_cidr = var.k8s_service_cidr
-                    k8s_worker_number = var.k8s_worker_number
-                    cpu_core_count = var.cpu_core_count
-                    memory_size = var.memory_size
-                    zone_id = var.zone_id
-                    k8s_version = var.k8s_version
-                    k8s_name_prefix = var.k8s_name_prefix
-                  }
-                  ######################
-                  # Instance types variables
-                  ######################
-                  variable "cpu_core_count" {
-                    description = "CPU core count is used to fetch instance types."
-                    type = number
-                    default = 4
-                  }
-                  variable "memory_size" {
-                    description = "Memory size used to fetch instance types."
-                    type = number
-                    default = 8
-                  }
-                  ######################
-                  # VPC variables
-                  ######################
-                  variable "vpc_name" {
-                    description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
-                    type = string
-                    default = "tf-k8s-vpc"
-                  }
-                  variable "vpc_cidr" {
-                    description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
-                    type = string
-                    default = "10.0.0.0/8"
-                  }
-                  ######################
-                  # VSwitch variables
-                  ######################
-                  variable "vswitch_name_prefix" {
-                    type = string
-                    description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
-                    default = "tf-k8s-vsw"
-                  }
-                  variable "number_format" {
-                    description = "The number format used to output."
-                    type = string
-                    default = "%02d"
-                  }
-                  variable "vswitch_ids" {
-                    description = "List of existing vswitch id."
-                    type = list
-                    default = []
-                  }
-                  variable "vswitch_cidrs" {
-                    description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
-                    type = list
-                    default = [
-                      "10.1.0.0/16",
-                      "10.2.0.0/16",
-                      "10.3.0.0/16"]
-                  }
-                  variable "k8s_name_prefix" {
-                    description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
-                    type = string
-                    default = "poc"
-                  }
-                  variable "new_nat_gateway" {
-                    type = bool
-                    description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
-                    default = true
-                  }
-                  variable "master_instance_types" {
-                    description = "The ecs instance types used to launch master nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c5.xlarge",
-                      "ecs.n4.xlarge",
-                      # "ecs.n1.large",
-                      # "ecs.sn1.large",
-                      # "ecs.s6-c1m2.xlarge",
-                      # "ecs.c6e.xlarge"
-                    ]
-                  }
-                  variable "worker_instance_types" {
-                    description = "The ecs instance types used to launch worker nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c6e.xlarge",
-                      "ecs.n4.xlarge",
-                      //    "ecs.n1.large",
-                      //    "ecs.sn1.large",
-                      //    "ecs.s6-c1m2.xlarge"
-                    ]
-                  }
-                  variable "node_cidr_mask" {
-                    type = number
-                    description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
-                    default = 24
-                  }
-                  variable "enable_ssh" {
-                    description = "Enable login to the node through SSH."
-                    type = bool
-                    default = true
-                  }
-                  variable "install_cloud_monitor" {
-                    description = "Install cloud monitor agent on ECS."
-                    type = bool
-                    default = true
-                  }
-                  variable "cpu_policy" {
-                    type = string
-                    description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
-                    default = "none"
-                  }
-                  variable "proxy_mode" {
-                    description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
-                    type = string
-                    default = "iptables"
-                  }
-                  variable "password" {
-                    description = "The password of ECS instance."
-                    type = string
-                    default = "Just4Test"
-                  }
-                  variable "k8s_worker_number" {
-                    description = "The number of worker nodes in kubernetes cluster."
-                    type = number
-                    default = 2
-                  }
-                  # k8s_pod_cidr is only for flannel network
-                  variable "k8s_pod_cidr" {
-                    description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
-                    type = string
-                    default = "172.20.0.0/16"
-                  }
-                  variable "k8s_service_cidr" {
-                    description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
-                    type = string
-                    default = "192.168.0.0/16"
-                  }
-                  variable "k8s_version" {
-                    description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
-                    type = string
-                    default = "1.20.4-aliyun.1"
-                  }
-                  variable "zone_id" {
-                    description = "Availability Zone ID"
-                    type = string
-                    default = "cn-hongkong-b"
-                    # "cn-beijing-a"
-                  }
-                  output "name" {
-                    value = module.kubernetes.name
-                  }
-                  output "kubeconfig" {
-                    value = module.kubernetes.kubeconfig
-                  }
-                  output "cluster_ca_cert" {
-                    value = module.kubernetes.cluster_ca_cert
-                  }
-                  output "client_cert" {
-                    value = module.kubernetes.client_cert
-                  }
-                  output "client_key" {
-                    value = module.kubernetes.client_key
-                  }
-                  output "api_server_internet" {
-                    value = module.kubernetes.api_server_internet
-                  }
+                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
@@ -266,6 +114,8 @@ data:
           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:
@@ -293,6 +143,9 @@ data:
           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:
@@ -304,7 +157,7 @@ data:
               terraform:
                 configuration: |
                   module "rds" {
-                    source = "terraform-alicloud-modules/rds/alicloud"
+                    source = "github.com/kubevela-contrib/terraform-alicloud-rds"
                     engine = "MySQL"
                     engine_version = "8.0"
                     instance_type = "rds.mysql.c1.large"
@@ -312,6 +165,12 @@ data:
                     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" {
@@ -329,6 +188,9 @@ data:
                   output "DB_PASSWORD" {
                     value = var.password
                   }
+                  output "DB_PUBLIC_HOST" {
+                    value = module.rds.db_public_connection_string
+                  }
 
                   variable "instance_name" {
                     description = "RDS instance name"
@@ -347,6 +209,144 @@ data:
                     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-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
@@ -468,19 +468,119 @@ data:
                 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: checking-depends-on
+        - name: ""
           properties:
             name: fluxcd
             namespace: vela-system
           type: depends-on-app
-        - name: apply-ns
-          properties:
-            component: ns-terraform-system
-          type: apply-component
-        - name: apply-resources
-          type: apply-remaining
+        - name: ""
+          type: apply-application
     status:
       rollout:
         batchRollingState: ""

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

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create

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

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch

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

@@ -35,7 +35,7 @@ spec:
             {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
             - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}"
             {{ end }}
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
           imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
           resources:
           {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
@@ -132,7 +132,7 @@ spec:
     spec:
       containers:
       - name: create
-        image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+        image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
         imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
         args:
           - create
@@ -175,7 +175,7 @@ spec:
     spec:
       containers:
       - name: patch
-        image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+        image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
         imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
         command:
           - /patch

charts/vela-core/templates/defwithtemplate/apply-object.yaml

@@ -16,7 +16,13 @@ spec:
         )
 
         apply: op.#Apply & {
-        	value: parameter
+        	value:   parameter.value
+        	cluster: parameter.cluster
+        }
+        parameter: {
+        	// +usage=Specify the value of the object
+        	value: {...}
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
         }
-        parameter: {}
 

charts/vela-core/templates/defwithtemplate/depends-on-app.yaml

@@ -27,7 +27,7 @@ spec:
         	}
         }
         load: op.#Steps & {
-        	if dependsOn.err != _|_ && dependsOn.value == _|_ {
+        	if dependsOn.err != _|_ {
         		configMap: op.#Read & {
         			value: {
         				apiVersion: "v1"
@@ -37,18 +37,17 @@ spec:
         					namespace: parameter.namespace
         				}
         			}
-        		}
-        		apply: op.#Apply & {
-        			value: {
-        				yaml.Unmarshal(configMap.value.data[parameter.name])
-        			}
-        		}
+        		}         @step(1)
+        		template: configMap.value.data["application"]
+        		apply:    op.#Apply & {
+        			value: yaml.Unmarshal(template)
+        		}     @step(2)
         		wait: op.#ConditionalWait & {
-        			continue: load.apply.value.status.status == "running"
-        		}
+        			continue: apply.value.status.status == "running"
+        		} @step(3)
         	}
 
-        	if dependsOn.value != _|_ {
+        	if dependsOn.err == _|_ {
         		wait: op.#ConditionalWait & {
         			continue: dependsOn.value.status.status == "running"
         		}

charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -0,0 +1,39 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/import-grafana-dashboard.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Import dashboards to Grafana
+  name: import-grafana-dashboard
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "ImportDashboard"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		urls: parameter.urls
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: *"default" | string
+        	urls: [...string]
+
+        }
+  workloadRefPath: ""
+

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

@@ -0,0 +1,113 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/nocalhost.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: nocalhost develop configuration.
+  name: nocalhost
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - '*'
+  podDisruptive: true
+  schematic:
+    cue:
+      template: |
+        import (
+        	"encoding/json"
+        )
+
+        patch: metadata: annotations: {
+        	"dev.nocalhost/application-name":      context.appName
+        	"dev.nocalhost/application-namespace": context.namespace
+        	"dev.nocalhost":                       json.Marshal({
+        		containers: [
+        			{
+        				name: context.name
+        				dev: {
+        					if parameter.gitUrl != _|_ {
+        						gitUrl: parameter.gitUrl
+        					}
+        					image:   parameter.image
+        					shell:   parameter.shell
+        					workDir: parameter.workDir
+        					if parameter.storageClass != _|_ {
+        						storageClass: parameter.storageClass
+        					}
+        					resources: {
+        						limits:   parameter.resources.limits
+        						requests: parameter.resources.requests
+        					}
+        					if parameter.persistentVolumeDirs != _|_ {
+        						persistentVolumeDirs: [
+        							for v in parameter.persistentVolumeDirs {
+        								path:     v.path
+        								capacity: v.capacity
+        							},
+        						]
+        					}
+        					if parameter.command != _|_ {
+        						command: parameter.command
+        					}
+        					if parameter.debug != _|_ {
+        						debug: parameter.debug
+        					}
+        					hotReload: parameter.hotReload
+        					if parameter.sync != _|_ {
+        						sync: parameter.sync
+        					}
+        					if parameter.env != _|_ {
+        						env: [
+        							for v in parameter.env {
+        								name:  v.name
+        								value: v.value
+        							},
+        						]
+        					}
+        					if parameter.portForward != _|_ {
+        						portForward: parameter.portForward
+        					}
+        				}
+        			},
+        		]
+        	})
+        }
+        parameter: {
+        	gitUrl?:       string
+        	image:         string
+        	shell:         *"bash" | string
+        	workDir:       *"/home/nocalhost-dev" | string
+        	storageClass?: string
+        	command?: {
+        		run?: [...string]
+        		debug?: [...string]
+        	}
+        	debug?: remoteDebugPort?: int
+        	hotReload: *true | bool
+        	sync: {
+        		type: *"send" | string
+        		filePattern?: [...string]
+        		ignoreFilePattern?: [...string]
+        	}
+        	env?: [...{
+        		name:  string
+        		value: string
+        	}]
+        	portForward?: [...string]
+        	persistentVolumeDirs?: [...{
+        		path:     string
+        		capacity: string
+        	}]
+        	resources: {
+        		limits: {
+        			memory: *"2Gi" | string
+        			cpu:    *"2" | string
+        		}
+        		requests: {
+        			memory: *"512Mi" | string
+        			cpu:    *"0.5" | string
+        		}
+        	}
+        }
+

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

@@ -0,0 +1,56 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/pure-ingress.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Enable public web traffic for the component without creating a Service.
+  name: pure-ingress
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: ingress: {
+        	apiVersion: "networking.k8s.io/v1beta1"
+        	kind:       "Ingress"
+        	metadata: name: context.name
+        	spec: rules: [{
+        		host: parameter.domain
+        		http: paths: [
+        			for k, v in parameter.http {
+        				path: k
+        				backend: {
+        					serviceName: context.name
+        					servicePort: v
+        				}
+        			},
+        		]
+        	}]
+        }
+        parameter: {
+        	// +usage=Specify the domain you want to expose
+        	domain: string
+
+        	// +usage=Specify the mapping relationship between the http path and the workload port
+        	http: [string]: int
+        }
+  status:
+    customStatus: |-
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
+      	message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+      }
+      if len(igs) > 0 {
+      	if igs[0].ip != _|_ {
+      		message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+      	}
+      	if igs[0].ip == _|_ {
+      		message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+      	}
+      }
+  workloadRefPath: ""
+

charts/vela-core/templates/defwithtemplate/read-object.yaml

@@ -28,6 +28,7 @@ spec:
         					}
         				}
         			}
+        			cluster: parameter.cluster
         		}
         	}
         	if parameter.apiVersion != _|_ || parameter.kind != _|_ {
@@ -42,6 +43,7 @@ spec:
         					}
         				}
         			}
+        			cluster: parameter.cluster
         		}
         	}
         }
@@ -54,5 +56,7 @@ spec:
         	name: string
         	// +usage=Specify the namespace of the object
         	namespace?: string
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
         }
 

charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml

@@ -0,0 +1,48 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/register-grafana-datasource.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Add a datasource to Grafana
+  name: register-grafana-datasource
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "DatasourceRegistration"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		datasource: {
+        			name:      parameter.name
+        			type:      parameter.type
+        			access:    parameter.access
+        			service:   parameter.service
+        			namespace: parameter.namespace
+        		}
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: string
+        	name:                      string
+        	type:                      string
+        	access:                    *"proxy" | string
+        	service:                   string
+        	namespace:                 *"default" | string
+        }
+  workloadRefPath: ""
+

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

@@ -24,8 +24,10 @@ spec:
         		componentName:      context.name
         		rolloutPlan: {
         			rolloutStrategy: "IncreaseFirst"
-        			rolloutBatches:  parameter.rolloutBatches
-        			targetSize:      parameter.targetSize
+        			if parameter.rolloutBatches != _|_ {
+        				rolloutBatches: parameter.rolloutBatches
+        			}
+        			targetSize: parameter.targetSize
         			if parameter["batchPartition"] != _|_ {
         				batchPartition: parameter.batchPartition
         			}
@@ -35,7 +37,7 @@ spec:
         parameter: {
         	targetRevision: *context.revision | string
         	targetSize:     int
-        	rolloutBatches: [...rolloutBatch]
+        	rolloutBatches?: [...rolloutBatch]
         	batchPartition?: int
         }
         rolloutBatch: replicas: int

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

@@ -97,17 +97,17 @@ spec:
         		url?:       string
         		value?:     string
         		style?:     string
-        		text?:      text
+        		text?:      textType
         		confirm?: {
-        			title:   text
-        			text:    text
-        			confirm: text
-        			deny:    text
+        			title:   textType
+        			text:    textType
+        			confirm: textType
+        			deny:    textType
         			style?:  string
         		}
         		options?: [...option]
         		initial_options?: [...option]
-        		placeholder?:  text
+        		placeholder?:  textType
         		initial_date?: string
         		image_url?:    string
         		alt_text?:     string
@@ -121,16 +121,16 @@ spec:
         		initial_time?: string
         	}]
         }
-        text: {
+        textType: {
         	type:      string
         	text:      string
         	emoji?:    bool
         	verbatim?: bool
         }
         option: {
-        	text:         text
+        	text:         textType
         	value:        string
-        	description?: text
+        	description?: textType
         	url?:         string
         }
         // send webhook notification

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

@@ -30,7 +30,7 @@ spec:
           args:
             - "apiserver"
             - "--port={{ .Values.apiServer.port }}"
-          image: {{ .Values.apiserverImage.repository }}:{{ .Values.apiserverImage.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.apiserverImage.repository }}:{{ .Values.apiserverImage.tag }}
           imagePullPolicy: {{ quote .Values.apiserverImage.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

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

@@ -130,7 +130,7 @@ spec:
             {{ if .Values.multicluster.enabled }}
             - "--enable-cluster-gateway"
             {{ end }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

charts/vela-core/templates/test/test-application.yaml

@@ -10,7 +10,7 @@ spec:
     - name: helm-test-express-server
       type: webservice
       properties:
-        image: crccheck/hello-world
+        image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
         port: 8000
       traits:
         - type: ingress
@@ -30,7 +30,7 @@ spec:
   serviceAccountName: kubevela-vela-core
   containers:
     - name: {{ .Release.Name }}-application-test
-      image: alpine/k8s:1.18.2
+      image: {{ .Values.imageRegistry }}{{ .Values.test.k8s.repository }}:{{ .Values.test.k8s.tag }}
       imagePullPolicy: IfNotPresent
       command:
         - /bin/bash

charts/vela-core/values.yaml

@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"
 
 disableCaps: ""
+
+imageRegistry: ""
 image:
   repository: oamdev/vela-core
   tag: latest
@@ -130,4 +132,12 @@ multicluster:
         memory: 200Mi
     secureTLS:
       enabled: true
-      certPath: /etc/k8s-cluster-gateway-certs
+      certPath: /etc/k8s-cluster-gateway-certs
+
+test:
+  app:
+    repository: oamdev/hello-world
+    tag: latest
+  k8s:
+    repository: oamdev/alpine-k8s
+    tag: 1.18.2

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

@@ -1232,6 +1232,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1645,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1956,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3390,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3696,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4091,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4365,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4441,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4659,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -222,6 +222,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +516,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +803,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1071,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1147,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -151,6 +151,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -188,6 +188,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +477,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -148,6 +148,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -212,6 +221,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +463,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create

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

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - patch

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

@@ -35,7 +35,7 @@ spec:
             {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
             - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}"
             {{ end }}
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
           imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
           resources:
           {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
@@ -132,7 +132,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
           imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
           args:
             - create
@@ -175,7 +175,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
           imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
           command:
             - /patch

charts/vela-minimal/templates/defwithtemplate/apply-object.yaml

@@ -16,7 +16,13 @@ spec:
         )
 
         apply: op.#Apply & {
-        	value: parameter
+        	value:   parameter.value
+        	cluster: parameter.cluster
+        }
+        parameter: {
+        	// +usage=Specify the value of the object
+        	value: {...}
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
         }
-        parameter: {}
 

charts/vela-minimal/templates/defwithtemplate/depends-on-app.yaml

@@ -27,7 +27,7 @@ spec:
         	}
         }
         load: op.#Steps & {
-        	if dependsOn.err != _|_ && dependsOn.value == _|_ {
+        	if dependsOn.err != _|_ {
         		configMap: op.#Read & {
         			value: {
         				apiVersion: "v1"
@@ -37,18 +37,17 @@ spec:
         					namespace: parameter.namespace
         				}
         			}
-        		}
-        		apply: op.#Apply & {
-        			value: {
-        				yaml.Unmarshal(configMap.value.data[parameter.name])
-        			}
-        		}
+        		}         @step(1)
+        		template: configMap.value.data["application"]
+        		apply:    op.#Apply & {
+        			value: yaml.Unmarshal(template)
+        		}     @step(2)
         		wait: op.#ConditionalWait & {
-        			continue: load.apply.value.status.status == "running"
-        		}
+        			continue: apply.value.status.status == "running"
+        		} @step(3)
         	}
 
-        	if dependsOn.value != _|_ {
+        	if dependsOn.err == _|_ {
         		wait: op.#ConditionalWait & {
         			continue: dependsOn.value.status.status == "running"
         		}

charts/vela-minimal/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -0,0 +1,39 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/import-grafana-dashboard.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Import dashboards to Grafana
+  name: import-grafana-dashboard
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "ImportDashboard"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		urls: parameter.urls
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: *"default" | string
+        	urls: [...string]
+
+        }
+  workloadRefPath: ""
+

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

@@ -0,0 +1,113 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/nocalhost.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: nocalhost develop configuration.
+  name: nocalhost
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads:
+    - '*'
+  podDisruptive: true
+  schematic:
+    cue:
+      template: |
+        import (
+        	"encoding/json"
+        )
+
+        patch: metadata: annotations: {
+        	"dev.nocalhost/application-name":      context.appName
+        	"dev.nocalhost/application-namespace": context.namespace
+        	"dev.nocalhost":                       json.Marshal({
+        		containers: [
+        			{
+        				name: context.name
+        				dev: {
+        					if parameter.gitUrl != _|_ {
+        						gitUrl: parameter.gitUrl
+        					}
+        					image:   parameter.image
+        					shell:   parameter.shell
+        					workDir: parameter.workDir
+        					if parameter.storageClass != _|_ {
+        						storageClass: parameter.storageClass
+        					}
+        					resources: {
+        						limits:   parameter.resources.limits
+        						requests: parameter.resources.requests
+        					}
+        					if parameter.persistentVolumeDirs != _|_ {
+        						persistentVolumeDirs: [
+        							for v in parameter.persistentVolumeDirs {
+        								path:     v.path
+        								capacity: v.capacity
+        							},
+        						]
+        					}
+        					if parameter.command != _|_ {
+        						command: parameter.command
+        					}
+        					if parameter.debug != _|_ {
+        						debug: parameter.debug
+        					}
+        					hotReload: parameter.hotReload
+        					if parameter.sync != _|_ {
+        						sync: parameter.sync
+        					}
+        					if parameter.env != _|_ {
+        						env: [
+        							for v in parameter.env {
+        								name:  v.name
+        								value: v.value
+        							},
+        						]
+        					}
+        					if parameter.portForward != _|_ {
+        						portForward: parameter.portForward
+        					}
+        				}
+        			},
+        		]
+        	})
+        }
+        parameter: {
+        	gitUrl?:       string
+        	image:         string
+        	shell:         *"bash" | string
+        	workDir:       *"/home/nocalhost-dev" | string
+        	storageClass?: string
+        	command?: {
+        		run?: [...string]
+        		debug?: [...string]
+        	}
+        	debug?: remoteDebugPort?: int
+        	hotReload: *true | bool
+        	sync: {
+        		type: *"send" | string
+        		filePattern?: [...string]
+        		ignoreFilePattern?: [...string]
+        	}
+        	env?: [...{
+        		name:  string
+        		value: string
+        	}]
+        	portForward?: [...string]
+        	persistentVolumeDirs?: [...{
+        		path:     string
+        		capacity: string
+        	}]
+        	resources: {
+        		limits: {
+        			memory: *"2Gi" | string
+        			cpu:    *"2" | string
+        		}
+        		requests: {
+        			memory: *"512Mi" | string
+        			cpu:    *"0.5" | string
+        		}
+        	}
+        }
+

charts/vela-minimal/templates/defwithtemplate/pure-ingress.yaml

@@ -0,0 +1,56 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/pure-ingress.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Enable public web traffic for the component without creating a Service.
+  name: pure-ingress
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: ingress: {
+        	apiVersion: "networking.k8s.io/v1beta1"
+        	kind:       "Ingress"
+        	metadata: name: context.name
+        	spec: rules: [{
+        		host: parameter.domain
+        		http: paths: [
+        			for k, v in parameter.http {
+        				path: k
+        				backend: {
+        					serviceName: context.name
+        					servicePort: v
+        				}
+        			},
+        		]
+        	}]
+        }
+        parameter: {
+        	// +usage=Specify the domain you want to expose
+        	domain: string
+
+        	// +usage=Specify the mapping relationship between the http path and the workload port
+        	http: [string]: int
+        }
+  status:
+    customStatus: |-
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
+      	message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+      }
+      if len(igs) > 0 {
+      	if igs[0].ip != _|_ {
+      		message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+      	}
+      	if igs[0].ip == _|_ {
+      		message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+      	}
+      }
+  workloadRefPath: ""
+

charts/vela-minimal/templates/defwithtemplate/read-object.yaml

@@ -28,6 +28,7 @@ spec:
         					}
         				}
         			}
+        			cluster: parameter.cluster
         		}
         	}
         	if parameter.apiVersion != _|_ || parameter.kind != _|_ {
@@ -42,6 +43,7 @@ spec:
         					}
         				}
         			}
+        			cluster: parameter.cluster
         		}
         	}
         }
@@ -54,5 +56,7 @@ spec:
         	name: string
         	// +usage=Specify the namespace of the object
         	namespace?: string
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
         }
 

charts/vela-minimal/templates/defwithtemplate/register-grafana-datasource.yaml

@@ -0,0 +1,48 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/register-grafana-datasource.cue
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Add a datasource to Grafana
+  name: register-grafana-datasource
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appliesToWorkloads: []
+  conflictsWith: []
+  podDisruptive: false
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "DatasourceRegistration"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		datasource: {
+        			name:      parameter.name
+        			type:      parameter.type
+        			access:    parameter.access
+        			service:   parameter.service
+        			namespace: parameter.namespace
+        		}
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: string
+        	name:                      string
+        	type:                      string
+        	access:                    *"proxy" | string
+        	service:                   string
+        	namespace:                 *"default" | string
+        }
+  workloadRefPath: ""
+

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

@@ -24,8 +24,10 @@ spec:
         		componentName:      context.name
         		rolloutPlan: {
         			rolloutStrategy: "IncreaseFirst"
-        			rolloutBatches:  parameter.rolloutBatches
-        			targetSize:      parameter.targetSize
+        			if parameter.rolloutBatches != _|_ {
+        				rolloutBatches: parameter.rolloutBatches
+        			}
+        			targetSize: parameter.targetSize
         			if parameter["batchPartition"] != _|_ {
         				batchPartition: parameter.batchPartition
         			}
@@ -35,7 +37,7 @@ spec:
         parameter: {
         	targetRevision: *context.revision | string
         	targetSize:     int
-        	rolloutBatches: [...rolloutBatch]
+        	rolloutBatches?: [...rolloutBatch]
         	batchPartition?: int
         }
         rolloutBatch: replicas: int

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

@@ -97,17 +97,17 @@ spec:
         		url?:       string
         		value?:     string
         		style?:     string
-        		text?:      text
+        		text?:      textType
         		confirm?: {
-        			title:   text
-        			text:    text
-        			confirm: text
-        			deny:    text
+        			title:   textType
+        			text:    textType
+        			confirm: textType
+        			deny:    textType
         			style?:  string
         		}
         		options?: [...option]
         		initial_options?: [...option]
-        		placeholder?:  text
+        		placeholder?:  textType
         		initial_date?: string
         		image_url?:    string
         		alt_text?:     string
@@ -121,16 +121,16 @@ spec:
         		initial_time?: string
         	}]
         }
-        text: {
+        textType: {
         	type:      string
         	text:      string
         	emoji?:    bool
         	verbatim?: bool
         }
         option: {
-        	text:         text
+        	text:         textType
         	value:        string
-        	description?: text
+        	description?: textType
         	url?:         string
         }
         // send webhook notification

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

@@ -30,7 +30,7 @@ spec:
           args:
             - "apiserver"
             - "--bind-addr=0.0.0.0:{{ .Values.apiServer.port }}"
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

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

@@ -132,7 +132,7 @@ spec:
             {{ if .Values.multicluster.enabled }}
             - "--enable-cluster-gateway"
             {{ end }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
           {{- toYaml .Values.resources | nindent 12 }}

charts/vela-minimal/templates/test/test-application.yaml

@@ -10,53 +10,5 @@ spec:
     - name: helm-test-express-server
       type: webservice
       properties:
-        image: crccheck/hello-world
+        image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
         port: 8000
-      # traits:
-      #   - type: ingress
-      #     properties:
-      #       domain: testsvc.example.com
-      #       http:
-      #         "/": 8000
-# ---
-# apiVersion: v1
-# kind: Pod
-# metadata:
-#   name: "{{ .Release.Name }}-application-test"
-#   annotations:
-#     "helm.sh/hook": test
-#     helm.sh/hook-delete-policy: hook-succeeded
-# spec:
-#   serviceAccountName: kubevela-vela-core
-#   containers:
-#     - name: {{ .Release.Name }}-application-test
-#       image: alpine/k8s:1.18.2
-#       imagePullPolicy: IfNotPresent
-#       command:
-#         - /bin/bash
-#         - -ec
-#         - |
-
-#           set -e
-
-#           echo "Waiting application is ready..."
-
-#           echo "waiting for application being Ready"
-#           kubectl -n vela-system wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
-#           echo "application is Ready"
-
-#           # wait for deploy being created
-#           echo "waiting for deployment being available"
-#           kubectl -n vela-system wait --for=condition=available deployments helm-test-express-server --timeout 3m
-#           echo "deployment being available"
-
-#           # wait for ingress being created
-#           while ! [ `kubectl -n vela-system get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
-#             echo "waiting for ingress being created"
-#             sleep 1
-#           done
-
-
-
-#           echo "Application and its components are created"
-#   restartPolicy: Never

charts/vela-minimal/values.yaml

@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"
 
 disableCaps: "manualscalertrait,containerizedwokrload,envbinding"
+
+imageRegistry: ""
 image:
   repository: oamdev/vela-core
   tag: latest
@@ -125,4 +127,9 @@ multicluster:
         memory: 200Mi
     secureTLS:
       enabled: true
-      certPath: /etc/k8s-cluster-gateway-certs
+      certPath: /etc/k8s-cluster-gateway-certs
+
+test:
+  app:
+    repository: oamdev/hello-world
+    tag: latest

cmd/core/main.go

@@ -32,6 +32,7 @@ import (
 
 	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"
@@ -43,6 +44,7 @@ import (
 	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 	"github.com/oam-dev/kubevela/pkg/cue/packages"
+	_ "github.com/oam-dev/kubevela/pkg/monitor/metrics"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
@@ -111,6 +113,8 @@ func main() {
 	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.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")
 	flag.IntVar(&controllerArgs.ConcurrentReconciles, "concurrent-reconciles", 4, "concurrent-reconciles is the concurrent reconcile number of the controller. The default value is 4")
 	flag.Float64Var(&qps, "kube-api-qps", 50, "the qps for reconcile clients. Low qps may lead to low throughput. High qps may give stress to api-server. Raise this value if concurrent-reconciles is set to be high.")
@@ -192,7 +196,7 @@ func main() {
 			os.Exit(1)
 		}
 	}
-
+	ctrl.SetLogger(klogr.New())
 	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsAddr,

commitlint.config.js

@@ -1,32 +0,0 @@
-const Configuration = {
-  /*
-   * Resolve and load @commitlint/config-conventional from node_modules.
-   * Referenced packages must be installed
-   */
-  extends: ['@commitlint/config-conventional'],
-  /*
-   * Any rules defined here will override rules from @commitlint/config-conventional
-   */
-  rules: {
-    'type-enum': [
-			2,
-			'always',
-			[
-				'Build',
-				'Chore',
-				'CI',
-				'Docs',
-				'Feat',
-				'Fix',
-				'Perf',
-				'Refactor',
-				'Revert',
-				'Style',
-				'Test',
-			],
-		],
-    'type-case': [2, 'never', 'lower-case'],
-  },
-};
-
-module.exports = Configuration;

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

@@ -22,6 +22,7 @@
 |        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. |
+|      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. |
 |        kube-api-qps         |  int   |                50                 | The qps for reconcile k8s clients. Increase it if you have high concurrency. A small number might restrict the requests to the api-server which may cause a long waiting queue when there are a large number of inflight requests. Try to avoid setting it too high since it will cause large burden on apiserver. |
@@ -39,4 +40,4 @@
 | Medium | < 500   |   < 5,000     | < 30,000 |              4        |      500     |      800       |     1 |   2Gi  |
 | Large | < 1,000  |   < 12,000    | < 72,000 |              4        |      800     |     1,000      |     2 |   4Gi  |
 
-> For details, read KubeVela Performance Test Report
+> For details, read KubeVela Performance Test Report

docs/examples/nocalhost/nocalhost.yaml

@@ -0,0 +1,157 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: bookinfo
+spec:
+  components:
+    - name: productpage
+      type: webservice
+      properties:
+        image: nocalhost-docker.pkg.coding.net/nocalhost/bookinfo/productpage:latest
+        port: 9080
+      traits:
+        - type: expose
+          properties:
+            port:
+              - 9080
+        - type: nocalhost
+          properties:
+            gitUrl: https://github.com/nocalhost/bookinfo-productpage.git
+            image: nocalhost-docker.pkg.coding.net/nocalhost/dev-images/python:3.7.7-slim-productpage-with-pydevd
+            shell: "bash"
+            workDir: "/opt/work"
+            resources:
+              limits:
+                memory: 1Gi
+                cpu: "1"
+              requests:
+                memory: 512Mi
+                cpu: "0.5"
+            debug:
+              remoteDebugPort: 9009
+            hotReload: true
+            sync:
+              type: send
+              filePattern:
+                - ./
+              ignoreFilePattern:
+                - .git
+                - .idea
+            command:
+              run:
+                - sh
+                - run.sh
+              debug:
+                - sh
+                - debug.sh
+            env:
+              - name: "foo"
+                value: "bar"
+            portForward:
+              - 39080:9080
+
+    - name: authors
+      type: webservice
+      properties:
+        image: nocalhost-docker.pkg.coding.net/nocalhost/bookinfo/authors:latest
+        port: 9080
+      traits:
+        - type: expose
+          properties:
+            port:
+              - 9080
+        - type: nocalhost
+          properties:
+            gitUrl: https://github.com/nocalhost/bookinfo-authors.git
+            image: nocalhost-docker.pkg.coding.net/nocalhost/dev-images/golang:latest
+            command:
+              run:
+                - sh
+                - run.sh
+              debug:
+                - sh
+                - debug.sh
+            debug:
+              remoteDebugPort: 9009
+
+    - name: details
+      type: webservice
+      properties:
+        image: nocalhost-docker.pkg.coding.net/nocalhost/bookinfo/details:latest
+        port: 9080
+      traits:
+        - type: expose
+          properties:
+            port:
+              - 9080
+        - type: nocalhost
+          properties:
+            gitUrl: https://github.com/nocalhost/bookinfo-details.git
+            image: nocalhost-docker.pkg.coding.net/nocalhost/dev-images/ruby:2.7.1-slim
+            command:
+              run:
+                - sh
+                - run.sh
+              debug:
+                - sh
+                - debug.sh
+            sync:
+              filePattern:
+                - ./
+              ignoreFilePattern:
+                - .git
+                - .idea
+
+    - name: ratings
+      type: webservice
+      properties:
+        image: nocalhost-docker.pkg.coding.net/nocalhost/bookinfo/ratings:latest
+        port: 9080
+      traits:
+        - type: expose
+          properties:
+            port:
+              - 9080
+        - type: nocalhost
+          properties:
+            gitUrl: https://github.com/nocalhost/bookinfo-ratings.git
+            image: nocalhost-docker.pkg.coding.net/nocalhost/dev-images/node:12.18.1-slim
+            command:
+              run:
+                - sh
+                - run.sh
+              debug:
+                - sh
+                - debug.sh
+
+    - name: reviews
+      type: webservice
+      properties:
+        image: nocalhost-docker.pkg.coding.net/nocalhost/bookinfo/reviews:latest
+        port: 9080
+      traits:
+        - type: expose
+          properties:
+            port:
+              - 9080
+        - type: nocalhost
+          properties:
+            gitUrl: https://github.com/nocalhost/bookinfo-reviews.git
+            image: nocalhost-docker.pkg.coding.net/nocalhost/dev-images/java:latest
+            command:
+              run:
+                - sh
+                - run.sh
+              debug:
+                - sh
+                - debug.sh
+            debug:
+              remoteDebugPort: 5005
+            sync:
+              filePattern:
+                - ./
+              ignoreFilePattern:
+                - .git
+                - .idea
+                - .gradle
+                - build

docs/examples/obervability/README.md

@@ -1,4 +1,4 @@
 This repo is the source artifacts for addon `observability`.
 
-- All .cue files are source artifacts from definition of [observability-asset](../../../vela-templates/addons/observability-asset).
-- `initializer-observability.yaml` will help developer  [observability](../../../vela-templates/addons/observability).
+- All files in definitions are source artifacts which is now built-in in `vela-core` helm chart.
+- `application-observability.yaml` will help developer  [observability](../../../vela-templates/addons/observability).

docs/examples/obervability/application-observability.yaml

@@ -0,0 +1,130 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: observability
+spec: { }
+
+---
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  annotations:
+    addons.oam.dev/description: "An out of the box solution for KubeVela observability"
+  name: grafana
+  namespace: observability
+spec:
+  components:
+    # install grafana datasource registration chart
+    - name: grafana-registration-release
+      type: helm
+      properties:
+        repoType: git
+        url: https://github.com/oam-dev/grafana-registration
+        git:
+          branch: master
+        chart: ./chart
+        targetNamespace: observability
+        values:
+          replicaCount: 1
+
+    # install Grafana
+    - name: grafana
+      properties:
+        chart: grafana
+        version: 6.14.1
+        repoType: helm
+        # original url: https://grafana.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: grafana
+      type: helm
+      traits:
+        - type: pure-ingress
+          properties:
+            domain: grafana.c58136db32cbc44cca364bf1cf7f90519.cn-hongkong.alicontainer.com
+            http:
+              "/": 80
+        - type: import-grafana-dashboard
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            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/flux2/cluster.json"
+              - "https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json"
+
+    # install loki
+    - name: loki
+      type: helm
+      properties:
+        chart: loki-stack
+        version: 2.4.1
+        repoType: helm
+        # original url: https://grafana.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: loki
+      traits:
+        - type: register-grafana-datasource # register loki datasource to Grafana
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            name: loki
+            service: loki
+            namespace: observability
+            type: loki
+            access: proxy
+
+      # install Prometheus
+    - name: prometheus-server
+      type: helm
+      properties:
+        chart: prometheus
+        version: 14.4.1
+        repoType: helm
+        # original url: https://prometheus-community.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: prometheus
+        values:
+          alertmanager:
+            persistentVolume:
+              storageClass: "alicloud-disk-available"
+              size: "20Gi"
+          server:
+            persistentVolume:
+              storageClass: "alicloud-disk-available"
+              size: "20Gi"
+
+      traits:
+        - type: register-grafana-datasource # register Prometheus datasource to Grafana
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            name: prometheus
+            service: prometheus-server
+            namespace: observability
+            type: prometheus
+            access: proxy
+
+    # install kube-state-metrics
+    - name: kube-state-metrics
+      type: helm
+      properties:
+        chart: kube-state-metrics
+        version: 3.4.1
+        repoType: helm
+        # original url: https://prometheus-community.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        values:
+          image:
+            repository: oamdev/kube-state-metrics
+            tag: v2.1.0

docs/examples/obervability/definitions/trait-import-grafana-dashboard.yaml

@@ -0,0 +1,31 @@
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Import dashboards to Grafana"
+  name: import-grafana-dashboard
+  namespace: vela-system
+spec:
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "ImportDashboard"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		urls: parameter.urls
+        	}
+        }
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: *"default" | string
+        	urls: [...string]
+        }

docs/examples/obervability/definitions/trait-pure-ingress.yaml

@@ -0,0 +1,58 @@
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Enable public web traffic for the component without creating a Service."
+  name: pure-ingress
+  namespace: vela-system
+spec:
+  status:
+    customStatus: |-
+      let igs = context.outputs.ingress.status.loadBalancer.ingress
+      if igs == _|_ {
+        message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+      }
+      if len(igs) > 0 {
+        if igs[0].ip != _|_ {
+          message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+        }
+        if igs[0].ip == _|_ {
+          message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+        }
+      }
+    healthPolicy: |
+      isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+  schematic:
+    cue:
+      template: |
+
+        outputs: ingress: {
+        	apiVersion: "networking.k8s.io/v1beta1"
+        	kind:       "Ingress"
+        	metadata:
+        		name: context.name
+        	spec: {
+        		rules: [{
+        			host: parameter.domain
+        			http: {
+        				paths: [
+        					for k, v in parameter.http {
+        						path: k
+        						backend: {
+        							serviceName: context.name
+        							servicePort: v
+        						}
+        					},
+        				]
+        			}
+        		}]
+        	}
+        }
+
+        parameter: {
+        	// +usage=Specify the domain you want to expose
+        	domain: string
+
+        	// +usage=Specify the mapping relationship between the http path and the workload port
+        	http: [string]: int
+        }

docs/examples/obervability/definitions/trait-register-grafana-datasource.yaml

@@ -0,0 +1,42 @@
+apiVersion: core.oam.dev/v1beta1
+kind: TraitDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: "Add a datasource to Grafana"
+  name: register-grafana-datasource
+  namespace: vela-system
+spec:
+  schematic:
+    cue:
+      template: |
+        outputs: registerdatasource: {
+        	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+        	kind:       "DatasourceRegistration"
+        	spec: {
+        		grafana: {
+        			service:                   parameter.grafanaServiceName
+        			namespace:                 parameter.grafanaServiceNamespace
+        			credentialSecret:          parameter.credentialSecret
+        			credentialSecretNamespace: parameter.credentialSecretNamespace
+        		}
+        		datasource: {
+        			name:      parameter.name
+        			type:      parameter.type
+        			access:    parameter.access
+        			service:   parameter.service
+        			namespace: parameter.namespace
+        		}
+        	}
+        }
+
+        parameter: {
+        	grafanaServiceName:        string
+        	grafanaServiceNamespace:   *"default" | string
+        	credentialSecret:          string
+        	credentialSecretNamespace: string
+        	name:                      string
+        	type:                      string
+        	access:                    *"proxy" | string
+        	service:                   string
+        	namespace:                 *"default" | string
+        }

docs/examples/obervability/initializer-observability.yaml

@@ -1,159 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: observability
-spec: { }
-
----
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  name: grafana
-  namespace: observability
-spec:
-  appTemplate:
-    spec:
-      components:
-        # install grafana datasource registration chart
-        - name: grafana-registration-release
-          properties:
-            apiVersion: helm.toolkit.fluxcd.io/v2beta1
-            kind: HelmRelease
-            metadata:
-              name: grafana-registration-release
-              namespace: observability
-            spec:
-              chart:
-                spec:
-                  chart: ./chart
-                  interval: 1m
-                  sourceRef:
-                    kind: GitRepository
-                    name: grafana-registration-repo
-                    namespace: observability
-              interval: 5m
-              values:
-                replicaCount: 1
-          type: raw
-        - name: grafana-registration-repo
-          properties:
-            apiVersion: source.toolkit.fluxcd.io/v1beta1
-            kind: GitRepository
-            metadata:
-              name: grafana-registration-repo
-              namespace: observability
-            spec:
-              interval: 5m
-              ref:
-                branch: master
-              url: https://github.com/oam-dev/grafana-registration
-          type: raw
-
-        # install Grafana
-        - name: grafana
-          properties:
-            chart: grafana
-            version: 6.14.1
-            repoType: helm
-            # original url: https://grafana.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: grafana
-          type: helm
-          traits:
-            - type: pure-ingress
-              properties:
-                domain: grafana.cf7223b8abedc4691b7eccfe3c675850a.cn-hongkong.alicontainer.com
-                http:
-                  "/": 80
-            - type: import-grafana-dashboard
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                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/flux2/cluster.json"
-                  - "https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json"
-
-        # install loki
-        - name: loki
-          type: helm
-          properties:
-            chart: loki-stack
-            version: 2.4.1
-            repoType: helm
-            # original url: https://grafana.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: loki
-          traits:
-            - type: register-grafana-datasource # register loki datasource to Grafana
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                name: loki
-                service: loki
-                namespace: observability
-                type: loki
-                access: proxy
-
-          # install Prometheus
-        - name: prometheus-server
-          type: helm
-          properties:
-            chart: prometheus
-            version: 14.4.1
-            repoType: helm
-            # original url: https://prometheus-community.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: prometheus
-            values:
-              alertmanager:
-                persistentVolume:
-                  storageClass: "alicloud-disk-available"
-                  size: "20Gi"
-              server:
-                persistentVolume:
-                  storageClass: "alicloud-disk-available"
-                  size: "20Gi"
-
-          traits:
-            - type: register-grafana-datasource # register Prometheus datasource to Grafana
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                name: prometheus
-                service: prometheus-server
-                namespace: observability
-                type: prometheus
-                access: proxy
-
-        # install kube-state-metrics
-        - name: kube-state-metrics
-          type: helm
-          properties:
-            chart: kube-state-metrics
-            version: 3.4.1
-            repoType: helm
-            # original url: https://prometheus-community.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            values:
-              image:
-                repository: oamdev/kube-state-metrics
-                tag: v2.1.0
-
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system

docs/examples/obervability/trait-import-grafana-dashboard.cue

@@ -1,21 +0,0 @@
-outputs: registerdatasource: {
-	apiVersion: "grafana.extension.oam.dev/v1alpha1"
-	kind:       "ImportDashboard"
-	spec: {
-		grafana: {
-			service:                   parameter.grafanaServiceName
-			namespace:                 parameter.grafanaServiceNamespace
-			credentialSecret:          parameter.credentialSecret
-			credentialSecretNamespace: parameter.credentialSecretNamespace
-		}
-		urls: parameter.urls
-	}
-}
-
-parameter: {
-	grafanaServiceName:        string
-	grafanaServiceNamespace:   *"default" | string
-	credentialSecret:          string
-	credentialSecretNamespace: *"default" | string
-	urls: [...string]
-}

docs/examples/obervability/trait-register-grafana-datasource.cue

@@ -1,31 +0,0 @@
-outputs: registerdatasource: {
-	apiVersion: "grafana.extension.oam.dev/v1alpha1"
-	kind:       "DatasourceRegistration"
-	spec: {
-		grafana: {
-			service:                   parameter.grafanaServiceName
-			namespace:                 parameter.grafanaServiceNamespace
-			credentialSecret:          parameter.credentialSecret
-			credentialSecretNamespace: parameter.credentialSecretNamespace
-		}
-		datasource: {
-			name:      parameter.name
-			type:      parameter.type
-			access:    parameter.access
-			service:   parameter.service
-			namespace: parameter.namespace
-		}
-	}
-}
-
-parameter: {
-	grafanaServiceName:        string
-	grafanaServiceNamespace:   *"default" | string
-	credentialSecret:          string
-	credentialSecretNamespace: string
-	name:                      string
-	type:                      string
-	access:                    *"proxy" | string
-	service:                   string
-	namespace:                 *"default" | string
-}

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

@@ -0,0 +1,13 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-ask-sample
+spec:
+  components:
+    - name: sample-ask
+      type: alibaba-ask
+      properties:
+        name: kubevela
+
+        writeConnectionSecretToRef:
+          name: ask-conn

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

@@ -0,0 +1,14 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-rds-sample
+spec:
+  components:
+    - name: sample-db
+      type: alibaba-rds
+      properties:
+        instance_name: sample-db
+        account_name: oamtest
+        password: U34rfwefwefffaked
+        writeConnectionSecretToRef:
+          name: db-conn

docs/examples/terraform/cloud-resource-provision-and-consume/application-sls-project.yaml

@@ -0,0 +1,14 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-sls-project-sample
+spec:
+  components:
+    - name: sample-sls-project
+      type: alibaba-sls-project
+      properties:
+        name: kubevela-1112
+        description: "Managed by KubeVela"
+
+        writeConnectionSecretToRef:
+          name: sls-project-conn

docs/examples/terraform/cloud-resource-provision-and-consume/application-sls-store.yaml

@@ -0,0 +1,16 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-sls-store-sample
+spec:
+  components:
+    - name: sample-sls-store
+      type: alibaba-sls-store
+      properties:
+        store_name: kubevela-1111
+        store_retention_period: 30
+        store_shard_count: 2
+        store_max_split_shard_count: 2
+
+        writeConnectionSecretToRef:
+          name: sls-store-conn

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

@@ -0,0 +1,13 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-vpc-sample
+spec:
+  components:
+    - name: sample-vpc
+      type: alibaba-vpc
+      properties:
+        vpc_cidr: "172.16.0.0/12"
+
+        writeConnectionSecretToRef:
+          name: vpc-conn

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

@@ -0,0 +1,15 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: app-vpc-sample
+spec:
+  components:
+    - name: sample-vswitch
+      type: alibaba-vswitch
+      properties:
+        vpc_cidr: "172.16.0.0/12"
+        vswitch_cidr: "172.16.0.0/18"
+        zone_id: cn-beijing-a
+
+        writeConnectionSecretToRef:
+          name: vswitch-conn

docs/examples/workflow/apply-object/app.yaml

@@ -21,18 +21,21 @@ spec:
       - name: apply-pvc
         type: apply-object
         properties:
-          apiVersion: v1
-          kind: PersistentVolumeClaim
-          metadata:
-            name: myclaim
-            namespace: default
-          spec:
-            accessModes:
-            - ReadWriteOnce
-            resources:
-              requests:
-                storage: 8Gi
-            storageClassName: standard
+          value:
+            apiVersion: v1
+            kind: PersistentVolumeClaim
+            metadata:
+              name: myclaim
+              namespace: default
+            spec:
+              accessModes:
+              - ReadWriteOnce
+              resources:
+                requests:
+                  storage: 8Gi
+              storageClassName: standard
+          # for multi-cluster
+          # cluster: my-cluster
       - name: apply-server
         type: apply-component
         properties:

docs/examples/workflow/read-object/app.yaml

@@ -23,6 +23,8 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         name: my-cm-name
+        # for multi cluster
+        # cluster: my-cluster
     - name: apply
       type: apply-component
       inputs:

e2e/application/application_test.go

@@ -49,11 +49,11 @@ var _ = ginkgo.Describe("Test Vela Application", func() {
 	e2e.EnvInitContext("env init", envName)
 	e2e.EnvSetContext("env set", envName)
 	e2e.JsonAppFileContext("deploy app-basic", appbasicJsonAppFile)
+	ApplicationExecContext("exec -- COMMAND", applicationName)
 	e2e.JsonAppFileContext("update app-basic, add scaler trait with replicas 2", appbasicAddTraitJsonAppFile)
 	e2e.ComponentListContext("ls", applicationName, workloadType, traitAlias)
 	ApplicationStatusContext("status", applicationName, workloadType)
 	ApplicationStatusDeeplyContext("status", applicationName, workloadType, envName)
-	ApplicationExecContext("exec -- COMMAND", applicationName)
 	// ApplicationPortForwardContext("port-forward", applicationName)
 	e2e.WorkloadDeleteContext("delete", applicationName)
 
@@ -88,9 +88,8 @@ var ApplicationStatusDeeplyContext = func(context string, applicationName, workl
 			}, 180*time.Second, 1*time.Second).Should(gomega.BeTrue())
 
 			cli := fmt.Sprintf("vela status %s", applicationName)
-			output, err := e2e.LongTimeExec(cli, 120*time.Second)
+			_, err = e2e.LongTimeExec(cli, 120*time.Second)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(output).To(gomega.ContainSubstring("Checking health status"))
 			// TODO(zzxwill) need to check workloadType after app status is refined
 		})
 	})

e2e/application/vela.yaml

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

e2e/commonContext.go

@@ -127,7 +127,7 @@ var (
 				cli := fmt.Sprintf("vela delete %s", applicationName)
 				output, err := Exec(cli)
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				gomega.Expect(output).To(gomega.ContainSubstring("deleted from env"))
+				gomega.Expect(output).To(gomega.ContainSubstring("already deleted"))
 			})
 		})
 	}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/briandowns/spinner v1.11.1
-	github.com/containerd/containerd v1.4.11
+	github.com/containerd/containerd v1.4.12
 	github.com/coreos/prometheus-operator v0.41.1
 	github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd
 	github.com/davecgh/go-spew v1.1.1
@@ -29,28 +29,32 @@ require (
 	github.com/gosuri/uitable v0.0.4
 	github.com/hashicorp/hcl/v2 v2.9.1
 	github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174
+	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.12
 	github.com/kyokomi/emoji v2.2.4+incompatible
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.1
-	github.com/oam-dev/cluster-gateway v1.1.2
+	github.com/oam-dev/cluster-gateway v1.1.6
 	github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28
-	github.com/oam-dev/terraform-controller v0.2.4
+	github.com/oam-dev/terraform-controller v0.2.8
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.16.0
 	github.com/opencontainers/runc v1.0.0-rc95 // indirect
 	github.com/openkruise/kruise-api v0.9.0
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	github.com/tidwall/gjson v1.6.8
+	github.com/tidwall/gjson v1.9.3
 	github.com/wercker/stern v0.0.0-20190705090245-4fa46dd6987f
 	github.com/wonderflow/cert-manager-api v1.0.3
 	go.mongodb.org/mongo-driver v1.5.1
 	go.uber.org/zap v1.18.1
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	gotest.tools v2.2.0+incompatible
 	helm.sh/helm/v3 v3.6.1
@@ -77,5 +81,6 @@ require (
 
 replace (
 	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
-	github.com/wercker/stern => github.com/oam-dev/stern v1.13.0-alpha
+	github.com/wercker/stern => github.com/oam-dev/stern v1.13.1
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24
 )

go.sum

@@ -77,6 +77,7 @@ github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+B
 github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.10.0/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
 github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
+github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
 github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
@@ -84,6 +85,7 @@ github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEg
 github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
 github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
+github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 github.com/Azure/go-autorest/autorest/adal v0.9.13 h1:Mp5hbtOePIzM8pJVRa3YLrWWmZtoxRXqUEzCfJt3+/Q=
 github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
@@ -94,6 +96,7 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
+github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
@@ -178,6 +181,7 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/alessio/shellescape v1.2.2 h1:8LnL+ncxhWT2TR00dfJRT25JWWrhkMZXneHVWnetDZg=
 github.com/alessio/shellescape v1.2.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1318/go.mod h1:9CMdKNL3ynIGPpfTcdwTvIm8SGuAZYYC4jFVSSvE1YQ=
 github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
@@ -307,8 +311,8 @@ github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on
 github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
 github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.4.11 h1:QCGOUN+i70jEEL/A6JVIbhy4f4fanzAzSR4kNG7SlcE=
-github.com/containerd/containerd v1.4.11/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.12 h1:V+SHzYmhng/iju6M5nFrpTTusrhidoxKTwdwLw+u4c4=
+github.com/containerd/containerd v1.4.12/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 h1:6ejg6Lkk8dskcM7wQ28gONkukbQkM4qpj4RnYbpFzrI=
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
@@ -670,6 +674,7 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
@@ -905,8 +910,9 @@ github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
-github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
+github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -960,6 +966,7 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -1121,8 +1128,9 @@ github.com/minio/minio-go/v6 v6.0.49/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tB
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/copystructure v1.1.1 h1:Bp6x9R1Wn16SIz3OfeDr0b7RnCG2OB66Y7PQyC/cvq4=
 github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -1143,13 +1151,15 @@ github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=
 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:NT0cwArZg/wGdvY8pzej4tPr+9WGmDdkF8Suj+mkz2g=
 github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
 github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 h1:yH0SvLzcbZxcJXho2yh7CqdENGMQe73Cw3woZBpPli0=
 github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
@@ -1182,6 +1192,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo=
 github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
@@ -1200,14 +1211,14 @@ github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/oam-dev/cluster-gateway v1.1.2 h1:sxC8Uyx/d3Yu8nIFSz31i+4JKhJfDAS9XVIPEWa1y+Q=
-github.com/oam-dev/cluster-gateway v1.1.2/go.mod h1:EjPUZwTYBe+gFtPV/yGohLE19fDr3CUg4tfSRY72fkM=
-github.com/oam-dev/stern v1.13.0-alpha h1:EVjM8Qvh6LssB6t4RZrjf9DtCq1cz+/cy6OF7fpy9wk=
-github.com/oam-dev/stern v1.13.0-alpha/go.mod h1:AOkvfFUv0Arz7GBi0jz7S0Jsu4K/kdvSjNsnRt1+BIg=
+github.com/oam-dev/cluster-gateway v1.1.6 h1:CY6m2Qcs6XJ/l/NY48CdHD7GAel9zZ/erUOz2zYzxkI=
+github.com/oam-dev/cluster-gateway v1.1.6/go.mod h1:SF7S4Ss+VUs2OVxmvSrrFGcaNFoXy6JWxHAnUxC1QcY=
+github.com/oam-dev/stern v1.13.1 h1:Gt7xMBmQjRueHVFjRo5CHDTVhiYrssjlmvPwRiZtq7c=
+github.com/oam-dev/stern v1.13.1/go.mod h1:0pLjZt0amXE/ErF16Rdrgd98H2owN8Hmn3/7CX5+AeA=
 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU=
 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28/go.mod h1:Mu8i0/DdplvnjwRbAYPsc8+LRR27n/mp8VWdkN10GzE=
-github.com/oam-dev/terraform-controller v0.2.4 h1:yGgIzm2EWNghuRutnChrRfhMjdlU/jE/cLfBizCgE24=
-github.com/oam-dev/terraform-controller v0.2.4/go.mod h1:wd4rnqnJzz274Sg1/qoeIhBx1rvTZ/ECzXoMff0ucR0=
+github.com/oam-dev/terraform-controller v0.2.8 h1:DXqDDP4mWLNThVgPwr/9uvHC1TR40drBCU2XnlRkmm0=
+github.com/oam-dev/terraform-controller v0.2.8/go.mod h1:6YPAr54np9qwBCmOdK7OAhJ9sOlm3JgSFMP4QfiS4FY=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
@@ -1296,7 +1307,6 @@ github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.0.0-20180311214515-816c9085562c/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -1511,13 +1521,13 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
 github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tetafro/godot v1.4.7/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
 github.com/thanos-io/thanos v0.11.0/go.mod h1:N/Yes7J68KqvmY+xM6J5CJqEvWIvKSR5sqGtmuD6wDc=
-github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
-github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E=
+github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
-github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek=
@@ -1955,6 +1965,7 @@ golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1982,8 +1993,9 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraC
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2002,6 +2014,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
@@ -2367,6 +2380,7 @@ k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
 k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA=
 k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
 k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY=
+k8s.io/api v0.20.10/go.mod h1:0kei3F6biGjtRQBo5dUeujq6Ji3UCh9aOSfp/THYd7I=
 k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
 k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
 k8s.io/api v0.21.2/go.mod h1:Lv6UGJZ1rlMI1qusN8ruAp9PUBFyBwpEHAdG24vIsiU=
@@ -2394,6 +2408,7 @@ k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftc
 k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
 k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
 k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
+k8s.io/apimachinery v0.20.10/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
 k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
 k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
 k8s.io/apimachinery v0.21.2/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
@@ -2423,6 +2438,7 @@ k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
 k8s.io/client-go v0.18.3/go.mod h1:4a/dpQEvzAhT1BbuWW09qvIaGw6Gbu1gZYiQZIi1DMw=
 k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
 k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
+k8s.io/client-go v0.20.10/go.mod h1:fFg+aLoasv/R+xiVaWjxeqGFYltzgQcOQzkFaSRfnJ0=
 k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
 k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs=
 k8s.io/client-go v0.21.2/go.mod h1:HdJ9iknWpbl3vMGtib6T2PyI/VYxiZfq936WNVHBRrA=
@@ -2444,6 +2460,7 @@ k8s.io/component-base v0.0.0-20191122220729-2684fb322cb9/go.mod h1:NFuUusy/X4Tk2
 k8s.io/component-base v0.17.0/go.mod h1:rKuRAokNMY2nn2A6LP/MiwpoaMRHpfRnrPaUJJj1Yoc=
 k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
 k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=
+k8s.io/component-base v0.20.10/go.mod h1:ZKOEin1xu68aJzxgzl5DZSp5J1IrjAOPlPN90/t6OI8=
 k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
 k8s.io/component-base v0.21.2/go.mod h1:9lvmIThzdlrJj5Hp8Z/TOgIkdfsNARQ1pT+3PByuiuc=
 k8s.io/component-base v0.21.3/go.mod h1:kkuhtfEHeZM6LkX0saqSK8PbdO7A0HigUngmhhrwfGQ=
@@ -2509,6 +2526,7 @@ mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE=
+open-cluster-management.io/api v0.0.0-20210610125115-f57c747b84aa/go.mod h1:9qiA5h/8kvPQnJEOlAPHVjRO9a1jCmDhGzvgMBvXEaE=
 open-cluster-management.io/api v0.0.0-20210804091127-340467ff6239 h1:ToDTkftv88UVZSCqTCzYZTkYoba28z+An08Yrm9aOAA=
 open-cluster-management.io/api v0.0.0-20210804091127-340467ff6239/go.mod h1:9qiA5h/8kvPQnJEOlAPHVjRO9a1jCmDhGzvgMBvXEaE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
@@ -2517,11 +2535,10 @@ rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 h1:fmRfl9WJ4ApJn7LxNuED4m0t18qivVQOxP6aAYG9J6c=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
+sigs.k8s.io/apiserver-network-proxy v0.0.24 h1:yaswrAqidc2XdLK2GRacVEBb55g4dg91f/B7b0SYliY=
+sigs.k8s.io/apiserver-network-proxy v0.0.24/go.mod h1:z/U9KltvRVSMttVl3cdQo8cPuXEjr+Qn3A5sUJR55XI=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24 h1:bCO6TN9VG1bK3nCG5ghQ5httx1HpsG5MD8XtRDySHDM=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-runtime v1.0.3-0.20210913073608-0663f60bfee2 h1:c6RYHA1wUg9IEsfjnxg0WsPwvDC2Qw2eryXKXgSEF1c=
 sigs.k8s.io/apiserver-runtime v1.0.3-0.20210913073608-0663f60bfee2/go.mod h1:gvPfh5FX3Wi3kIRpkh7qvY0i/DQl3SDpRtvqMGZE3Vo=
 sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo=

hack/e2e/build_runtime_rollout.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+TEMP_DIR="./runtime/rollout/e2e/tmp/"
+
+mkdir -p $TEMP_DIR
+cp -r go.mod $TEMP_DIR
+cp -r go.sum $TEMP_DIR
+cp -r entrypoint.sh $TEMP_DIR
+cp -r runtime/rollout/cmd/main.go $TEMP_DIR
+cp -r ./apis $TEMP_DIR
+cp -r ./pkg $TEMP_DIR
+cp -r ./version $TEMP_DIR

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

@@ -1232,6 +1232,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1645,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1956,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3390,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3696,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4091,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4365,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4441,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4659,16 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                deleteResource:
+                                  default: true
+                                  description: DeleteResource will determine whether
+                                    provisioned cloud resources will be deleted when
+                                    CR is deleted
+                                  type: boolean
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -179,6 +179,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -463,6 +472,15 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      deleteResource:
+                        default: true
+                        description: DeleteResource will determine whether provisioned
+                          cloud resources will be deleted when CR is deleted
+                        type: boolean
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -222,6 +222,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +516,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +803,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1071,16 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              deleteResource:
+                                default: true
+                                description: DeleteResource will determine whether
+                                  provisioned cloud resources will be deleted when
+                                  CR is deleted
+                                type: boolean
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1147,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties: