Style: rename multi-env to deploy2env (#2309)

fix ci

Fix: apply remaing bug

fix ci

.github/CODEOWNERS

@@ -0,0 +1,36 @@
+# This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
+
+*                                  @hongchaodeng @wonderflow @leejanee
+design/                            @hongchaodeng @resouer @wonderflow
+
+# Owner of CUE
+pkg/cue                            @leejanee @FogDong
+pkg/stdlib                         @leejanee @FogDong
+
+# Owner of Workflow
+pkg/workflow                       @leejanee @FogDong
+
+# Owner of rollout
+pkg/controller/common/rollout/                              @wangyikewxgm @wonderflow
+pkg/controller/core.oam.dev/v1alpha2/applicationrollout     @wangyikewxgm @wonderflow
+pkg/controller/standard.oam.dev/v1alpha1/rollout            @wangyikewxgm @wonderflow
+runtime/rollout                                             @wangyikewxgm @wonderflow
+
+# Owner of definition controller
+pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition  @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/policies/policydefinition        @yangsoon @Somefive
+pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition   @yangsoon @zzxwill
+pkg/controller/core.oam.dev/v1alpha2/core/traits/traitdefinition           @yangsoon @zzxwill
+
+# Owner of health scope controller
+pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope     @captainroy-hy @zzxwill
+
+# Owner of vela templates
+vela-templates/                     @Somefive @barnettZQG @wonderflow
+
+# Owner of vela CLI
+references/cli/                     @Somefive @zzxwill 
+
+# Owner of vela APIServer
+pkg/apiserver/                     @barnettZQG @yangsoon
+

.github/workflows/commit-lint.yml

@@ -0,0 +1,13 @@
+name: Lint Commit Messages
+on: [push, pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        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/workflows/e2e-rollout-test.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Wait for e2e preparation ready
         run: |
-          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/components)" != "200" ]]; do sleep 5; done' || false
+          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:37081/api/components)" != "200" ]]; do sleep 5; done' || false
 
       - name: Run api e2e tests
         run: make e2e-api-test

.github/workflows/e2e-test.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Wait for e2e preparation ready
         run: |
-          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:38081/api/components)" != "200" ]]; do sleep 5; done' || false
+          timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:37081/api/components)" != "200" ]]; do sleep 5; done' || false
 
       - name: Run api e2e tests
         run: make e2e-api-test

.github/workflows/sync-api.yml

@@ -11,10 +11,10 @@ jobs:
   sync-core-api:
     runs-on: ubuntu-20.04
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.16
         uses: actions/setup-go@v1
         env:
-          GO_VERSION: '1.14'
+          GO_VERSION: '1.16'
           GOLANGCI_VERSION: 'v1.38'
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -33,4 +33,5 @@ jobs:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
           COMMIT_ID: ${{ github.sha }}
         run: |
-          bash ./hack/apis/sync.sh
+          bash ./hack/apis/clientgen.sh
+          bash ./hack/apis/sync.sh

CONTRIBUTING.md

@@ -22,75 +22,6 @@ You can contribute to KubeVela in several ways. Here are some examples:
 
 For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
 
-### Commit Conventions
-
-KubeVela follows the [conventional-commits](https://www.conventionalcommits.org/en/v1.0.0/) and [commit messages best practices](https://chris.beams.io/posts/git-commit/) to improve better history information.
-
-The commit message should be structured as follows:
-
-```
-<type>[optional scope]: <subject>
-
-[optional body]
-```
-
-#### Examples:
-
-Commit message with scope:
-
-```
-Feat(lang): add polish language
-```
-
-Commit message with no body:
-
-```
-Docs: correct spelling of CHANGELOG
-```
-
-Commit message with multi-paragraph body:
-
-```
-Fix: correct minor typos in code
-
-see the issue for details
-
-on typos fixed.
-
-Reviewed-by: Z
-Refs #133
-```
-
-#### `<type>` (required)
-
-Type is required to better capture the area of the commit, based on the [Angular convention](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines).
-
-We capitalize the `<type>` to make sure the subject line is capitalized. `<type>` can be one of the following:
-
-* **Feat**: A new feature
-* **Fix**: A bug fix
-* **Docs**: Documentation only changes
-* **Build**: Changes that affect the build system or external dependencies 
-* **Style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
-* **Refactor**: A code change that neither fixes a bug nor adds a feature
-* **Perf**: A code change that improves performance
-* **Test**: Adding missing or correcting existing tests
-* **Chore**: Changes to the build process or auxiliary tools and libraries such as documentation generation
-
-#### `<scope>` (optional)
-
-Scope is optional, it may be provided to a commit’s type, to provide additional contextual information and is contained within parenthesis, it is could be anything specifying place of the commit change. Github issue link is
-also a valid scope. For example: Fix(cli), Feat(api), Fix(#233), etc.
-
-You can use `*` when the change affects more than a single scope.
-
-#### `<subject>` (required)
-
-The subject MUST immediately follow the colon and space after the type/scope prefix. The description is a short summary of the code changes, e.g., "Fix: array parsing issue when multiple spaces were contained in string", instead of "Fix: bug".
-
-#### `<body>` (optional)
-
-A longer commit body may be provided after the short subject, providing additional contextual information about the code changes. The body MUST begin one blank line after the description.
 
 ### Report bugs
 

Makefile

@@ -65,25 +65,7 @@ doc-gen:
 	rm -r docs/en/cli/*
 	go run hack/docgen/gen.go
 
-PWD := $(shell pwd)
-docs-build:
-	docker run -it -v $(PWD)/docs/sidebars.js:/workspace/kubevela.io/sidebars.js \
-	 -v $(PWD)/docs/en:/workspace/kubevela.io/docs \
-	 oamdev/vela-webtool:v1 -t build
-
-docs-start:
-	docker run -it -p 3000:3000 -v $(PWD)/docs/sidebars.js:/workspace/kubevela.io/sidebars.js \
-	 -v $(PWD)/docs/en:/workspace/kubevela.io/docs \
-	 oamdev/vela-webtool:v1 -t start
-
-api-gen:
-	swag init -g references/apiserver/route.go --output references/apiserver/docs
-	swagger-codegen generate -l html2 -i references/apiserver/docs/swagger.yaml -o references/apiserver/docs
-	mv references/apiserver/docs/index.html docs/en/developers/references/restful-api/
-
-generate-source:
-	go run hack/frontend/source.go
-
+PWD := $(shell pwd)	
 cross-build:
 	rm -rf _bin
 	go get github.com/mitchellh/gox@v0.4.0
@@ -113,16 +95,18 @@ compress:
 	)
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
-run: fmt vet
-	go run ./cmd/core/main.go
+run:
+	go run ./cmd/core/main.go --application-revision-limit 5
 
 # Run go fmt against code
 fmt: goimports installcue
 	go fmt ./...
 	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w $$(go list -f {{.Dir}} ./...)
-	$(CUE) fmt ./vela-templates/definitions/internal/
-	$(CUE) fmt ./vela-templates/definitions/registry/
-
+	$(CUE) fmt ./vela-templates/definitions/internal/*
+	$(CUE) fmt ./vela-templates/definitions/registry/*
+	$(CUE) fmt ./pkg/stdlib/pkgs/*
+	$(CUE) fmt ./pkg/stdlib/op.cue
+	$(CUE) fmt ./pkg/workflow/tasks/template/static/*
 # Run go vet against code
 vet:
 	go vet ./...
@@ -159,7 +143,6 @@ e2e-setup:
 	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 ocm-cluster-manager
 	ginkgo version
 	ginkgo -v -r e2e/setup
@@ -253,10 +236,9 @@ manifests: installcue kustomize
 	$(KUSTOMIZE) build config/crd -o config/crd/base/core.oam.dev_applications.yaml
 	./hack/crd/cleanup.sh
 	go run ./hack/crd/dispatch/dispatch.go config/crd/base charts/vela-core/crds charts/oam-runtime/crds runtime/
-	go run hack/crd/update.go charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml
 	rm -f config/crd/base/*
 	./vela-templates/gen_definitions.sh
-	go run ./vela-templates/gen_addons.go --addons-path=./vela-templates/addons --store-path=./charts/vela-core/templates/addons
+	go run ./vela-templates/gen_addons.go
 
 GOLANGCILINT_VERSION ?= v1.31.0
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
@@ -331,15 +313,8 @@ else
 KUSTOMIZE=$(shell which kustomize)
 endif
 
-start-dashboard:
-	go run references/cmd/apiserver/main.go &
-	cd references/dashboard && npm install && npm start && cd ..
-
-swagger-gen:
-	$(GOBIN)/swag init -g apiserver/route.go -d pkg/ -o references/apiserver/docs/
-
 check-license-header:
 	./hack/licence/header-check.sh
 
-check-install-def:
+def-install:
 	./hack/utils/installdefinition.sh

README.md

@@ -28,7 +28,7 @@ KubeVela is a modern application platform that makes deploying and managing appl
 
 - [Introduction](https://kubevela.io/docs)
 - [Installation](https://kubevela.io/docs/install)
-- [Design Your First Deployment Plan](https://kubevela.io/docs/end-user/application)
+- [Design Your First Deployment Plan](https://kubevela.io/docs/quick-start)
 
 ## Documentation
 

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

@@ -163,23 +163,44 @@ type ApplicationPhase string
 const (
 	// ApplicationRollingOut means the app is in the middle of rolling out
 	ApplicationRollingOut ApplicationPhase = "rollingOut"
+	// ApplicationStarting means the app is preparing for reconcile
+	ApplicationStarting ApplicationPhase = "starting"
 	// ApplicationRendering means the app is rendering
 	ApplicationRendering ApplicationPhase = "rendering"
+	// ApplicationPolicyGenerating means the app is generating policies
+	ApplicationPolicyGenerating ApplicationPhase = "generatingPolicy"
 	// ApplicationRunningWorkflow means the app is running workflow
 	ApplicationRunningWorkflow ApplicationPhase = "runningWorkflow"
 	// ApplicationWorkflowSuspending means the app's workflow is suspending
 	ApplicationWorkflowSuspending ApplicationPhase = "workflowSuspending"
 	// ApplicationWorkflowTerminated means the app's workflow is terminated
 	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
+	// ApplicationWorkflowFinished means the app's workflow is finished
+	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
 	// ApplicationRunning means the app finished rendering and applied result to the cluster
 	ApplicationRunning ApplicationPhase = "running"
-	// ApplicationHealthChecking means the app finished rendering and applied result to the cluster, but still unhealthy
-	ApplicationHealthChecking ApplicationPhase = "healthChecking"
+	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
+	ApplicationUnhealthy ApplicationPhase = "unhealthy"
+)
+
+// WorkflowState is a string that mark the workflow state
+type WorkflowState string
+
+const (
+	// WorkflowStateTerminated means workflow is terminated manually, and it won't be started unless the spec changed.
+	WorkflowStateTerminated WorkflowState = "terminated"
+	// WorkflowStateSuspended means workflow is suspended manually, and it can be resumed.
+	WorkflowStateSuspended WorkflowState = "suspended"
+	// WorkflowStateFinished means workflow is running successfully, all steps finished.
+	WorkflowStateFinished WorkflowState = "finished"
+	// WorkflowStateExecuting means workflow is still running or waiting some steps.
+	WorkflowStateExecuting WorkflowState = "executing"
 )
 
 // ApplicationComponentStatus record the health status of App component
 type ApplicationComponentStatus struct {
 	Name string `json:"name"`
+	Env  string `json:"env,omitempty"`
 	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
 	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
 	Healthy            bool                     `json:"healthy"`
@@ -213,14 +234,27 @@ type RawComponent struct {
 
 // WorkflowStepStatus record the status of a workflow step
 type WorkflowStepStatus struct {
+	ID    string            `json:"id"`
 	Name  string            `json:"name,omitempty"`
 	Type  string            `json:"type,omitempty"`
 	Phase WorkflowStepPhase `json:"phase,omitempty"`
 	// A human readable message indicating details about why the workflowStep is in this state.
 	Message string `json:"message,omitempty"`
 	// A brief CamelCase message indicating details about why the workflowStep is in this state.
-	Reason      string                 `json:"reason,omitempty"`
-	ResourceRef corev1.ObjectReference `json:"resourceRef,omitempty"`
+	Reason   string          `json:"reason,omitempty"`
+	SubSteps *SubStepsStatus `json:"subSteps,omitempty"`
+}
+
+// WorkflowSubStepStatus record the status of a workflow step
+type WorkflowSubStepStatus struct {
+	ID    string            `json:"id"`
+	Name  string            `json:"name,omitempty"`
+	Type  string            `json:"type,omitempty"`
+	Phase WorkflowStepPhase `json:"phase,omitempty"`
+	// A human readable message indicating details about why the workflowStep is in this state.
+	Message string `json:"message,omitempty"`
+	// A brief CamelCase message indicating details about why the workflowStep is in this state.
+	Reason string `json:"reason,omitempty"`
 }
 
 // AppStatus defines the observed state of Application
@@ -252,18 +286,30 @@ type AppStatus struct {
 	// LatestRevision of the application configuration it generates
 	// +optional
 	LatestRevision *Revision `json:"latestRevision,omitempty"`
+
+	// AppliedResources record the resources that the  workflow step apply.
+	AppliedResources []ClusterObjectReference `json:"appliedResources,omitempty"`
 }
 
 // WorkflowStatus record the status of workflow
 type WorkflowStatus struct {
-	AppRevision    string                  `json:"appRevision,omitempty"`
-	StepIndex      int                     `json:"stepIndex,omitempty"`
-	Suspend        bool                    `json:"suspend"`
-	Terminated     bool                    `json:"terminated"`
-	ContextBackend *corev1.ObjectReference `json:"contextBackend"`
+	AppRevision string       `json:"appRevision,omitempty"`
+	Mode        WorkflowMode `json:"mode"`
+
+	Suspend    bool `json:"suspend"`
+	Terminated bool `json:"terminated"`
+
+	ContextBackend *corev1.ObjectReference `json:"contextBackend,omitempty"`
 	Steps          []WorkflowStepStatus    `json:"steps,omitempty"`
 }
 
+// SubStepsStatus record the status of workflow steps.
+type SubStepsStatus struct {
+	StepIndex int                     `json:"stepIndex,omitempty"`
+	Mode      WorkflowMode            `json:"mode,omitempty"`
+	Steps     []WorkflowSubStepStatus `json:"steps,omitempty"`
+}
+
 // WorkflowStepPhase describes the phase of a workflow step.
 type WorkflowStepPhase string
 
@@ -296,6 +342,16 @@ const (
 	WorkflowStepType DefinitionType = "WorkflowStep"
 )
 
+// WorkflowMode describes the mode of workflow
+type WorkflowMode string
+
+const (
+	// WorkflowModeDAG describes the DAG mode of workflow
+	WorkflowModeDAG WorkflowMode = "DAG"
+	// WorkflowModeStep describes the step by step mode of workflow
+	WorkflowModeStep WorkflowMode = "StepByStep"
+)
+
 // AppRolloutStatus defines the observed state of AppRollout
 type AppRolloutStatus struct {
 	v1alpha1.RolloutStatus `json:",inline"`
@@ -325,6 +381,9 @@ type ApplicationComponent struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Properties runtime.RawExtension `json:"properties,omitempty"`
 
+	Inputs  StepInputs  `json:"inputs,omitempty"`
+	Outputs StepOutputs `json:"outputs,omitempty"`
+
 	// Traits define the trait of one component, the type must be array to keep the order.
 	Traits []ApplicationTrait `json:"traits,omitempty"`
 
@@ -334,6 +393,22 @@ type ApplicationComponent struct {
 	Scopes map[string]string `json:"scopes,omitempty"`
 }
 
+// StepOutputs defines output variable of WorkflowStep
+type StepOutputs []outputItem
+
+// StepInputs defines variable input of WorkflowStep
+type StepInputs []inputItem
+
+type inputItem struct {
+	ParameterKey string `json:"parameterKey"`
+	From         string `json:"from"`
+}
+
+type outputItem struct {
+	ValueFrom string `json:"valueFrom"`
+	Name      string `json:"name"`
+}
+
 // ClusterSelector defines the rules to select a Cluster resource.
 // Either name or labels is needed.
 type ClusterSelector struct {
@@ -359,3 +434,20 @@ type ClusterPlacement struct {
 	// Distribution defines the replica distribution of an AppRevision to a cluster.
 	Distribution Distribution `json:"distribution,omitempty"`
 }
+
+// ResourceCreatorRole defines the resource creator.
+type ResourceCreatorRole string
+
+const (
+	// PolicyResourceCreator create the policy resource.
+	PolicyResourceCreator ResourceCreatorRole = "policy"
+	// WorkflowResourceCreator create the resource in workflow.
+	WorkflowResourceCreator ResourceCreatorRole = "workflow"
+)
+
+// ClusterObjectReference defines the object reference with cluster.
+type ClusterObjectReference struct {
+	Cluster                string              `json:"cluster,omitempty"`
+	Creator                ResourceCreatorRole `json:"creator,omitempty"`
+	corev1.ObjectReference `json:",inline"`
+}

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

@@ -72,6 +72,11 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 		*out = new(Revision)
 		**out = **in
 	}
+	if in.AppliedResources != nil {
+		in, out := &in.AppliedResources, &out.AppliedResources
+		*out = make([]ClusterObjectReference, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppStatus.
@@ -88,6 +93,16 @@ func (in *AppStatus) DeepCopy() *AppStatus {
 func (in *ApplicationComponent) DeepCopyInto(out *ApplicationComponent) {
 	*out = *in
 	in.Properties.DeepCopyInto(&out.Properties)
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
 	if in.Traits != nil {
 		in, out := &in.Traits, &out.Traits
 		*out = make([]ApplicationTrait, len(*in))
@@ -208,6 +223,22 @@ func (in *ChildResourceKind) DeepCopy() *ChildResourceKind {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterObjectReference) DeepCopyInto(out *ClusterObjectReference) {
+	*out = *in
+	out.ObjectReference = in.ObjectReference
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterObjectReference.
+func (in *ClusterObjectReference) DeepCopy() *ClusterObjectReference {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterObjectReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterPlacement) DeepCopyInto(out *ClusterPlacement) {
 	*out = *in
@@ -432,6 +463,64 @@ func (in *Status) DeepCopy() *Status {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepInputs) DeepCopyInto(out *StepInputs) {
+	{
+		in := &in
+		*out = make(StepInputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepInputs.
+func (in StepInputs) DeepCopy() StepInputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepInputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StepOutputs) DeepCopyInto(out *StepOutputs) {
+	{
+		in := &in
+		*out = make(StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepOutputs.
+func (in StepOutputs) DeepCopy() StepOutputs {
+	if in == nil {
+		return nil
+	}
+	out := new(StepOutputs)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SubStepsStatus) DeepCopyInto(out *SubStepsStatus) {
+	*out = *in
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]WorkflowSubStepStatus, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SubStepsStatus.
+func (in *SubStepsStatus) DeepCopy() *SubStepsStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(SubStepsStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // 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
@@ -458,7 +547,9 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
 	if in.Steps != nil {
 		in, out := &in.Steps, &out.Steps
 		*out = make([]WorkflowStepStatus, len(*in))
-		copy(*out, *in)
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
 }
 
@@ -475,7 +566,11 @@ func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
 	*out = *in
-	out.ResourceRef = in.ResourceRef
+	if in.SubSteps != nil {
+		in, out := &in.SubSteps, &out.SubSteps
+		*out = new(SubStepsStatus)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.
@@ -488,6 +583,21 @@ func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowSubStepStatus) DeepCopyInto(out *WorkflowSubStepStatus) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSubStepStatus.
+func (in *WorkflowSubStepStatus) DeepCopy() *WorkflowSubStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowSubStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkloadGVK) DeepCopyInto(out *WorkloadGVK) {
 	*out = *in

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

@@ -17,6 +17,7 @@
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -31,8 +32,11 @@ const (
 	// OCMEngine represents Open-Cluster-Management multi-cluster management solution
 	OCMEngine ClusterManagementEngine = "ocm"
 
-	// LocalEngine represents single cluster ClusterManagerEngine
-	LocalEngine ClusterManagementEngine = "local"
+	// SingleClusterEngine represents single cluster ClusterManagerEngine
+	SingleClusterEngine ClusterManagementEngine = "single-cluster"
+
+	// ClusterGatewayEngine represents multi-cluster management solution with cluster-gateway
+	ClusterGatewayEngine ClusterManagementEngine = "cluster-gateway"
 )
 
 // EnvBindingPhase is a label for the condition of a EnvBinding at the current time
@@ -72,10 +76,16 @@ type EnvPlacement struct {
 	NamespaceSelector *NamespaceSelector      `json:"namespaceSelector,omitempty"`
 }
 
+// EnvSelector defines which components should this env contains
+type EnvSelector struct {
+	Components []string `json:"components,omitempty"`
+}
+
 // EnvConfig is the configuration for different environments.
 type EnvConfig struct {
 	Name      string       `json:"name"`
 	Placement EnvPlacement `json:"placement,omitempty"`
+	Selector  *EnvSelector `json:"selector,omitempty"`
 	Patch     EnvPatch     `json:"patch"`
 }
 
@@ -124,7 +134,10 @@ type EnvBindingStatus struct {
 
 	Phase EnvBindingPhase `json:"phase,omitempty"`
 
-	ClusterDecisions []ClusterDecision `json:"cluster_decisions,omitempty"`
+	ClusterDecisions []ClusterDecision `json:"clusterDecisions,omitempty"`
+
+	// ResourceTracker record the status of the ResourceTracker
+	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
 }
 
 // EnvBinding is the Schema for the EnvBinding API

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

@@ -0,0 +1,116 @@
+/*
+ Copyright 2021. The KubeVela Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
+)
+
+// WorkflowStepPhase describes the phase of a workflow step.
+type WorkflowStepPhase string
+
+const (
+	// WorkflowStepPhaseSucceeded will make the controller run the next step.
+	WorkflowStepPhaseSucceeded WorkflowStepPhase = "succeeded"
+	// WorkflowStepPhaseFailed will make the controller stop the workflow and report error in `message`.
+	WorkflowStepPhaseFailed WorkflowStepPhase = "failed"
+	// WorkflowStepPhaseTerminated will make the controller terminate the workflow.
+	WorkflowStepPhaseTerminated WorkflowStepPhase = "terminated"
+	// WorkflowStepPhaseSuspending will make the controller suspend the workflow.
+	WorkflowStepPhaseSuspending WorkflowStepPhase = "suspending"
+	// WorkflowStepPhaseRunning will make the controller continue the workflow.
+	WorkflowStepPhaseRunning WorkflowStepPhase = "running"
+)
+
+// WorkflowStep defines how to execute a workflow step.
+type WorkflowStep struct {
+	// Name is the unique name of the workflow step.
+	Name string `json:"name"`
+	Type string `json:"type"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Properties runtime.RawExtension `json:"properties,omitempty"`
+	Inputs     common.StepInputs    `json:"inputs,omitempty"`
+	Outputs    common.StepOutputs   `json:"outputs,omitempty"`
+}
+
+// A WorkflowSpec defines the desired state of a Workflow.
+type WorkflowSpec struct {
+	Steps []WorkflowStep `json:"steps,omitempty"`
+}
+
+// A WorkflowStatus is the status of Workflow
+type WorkflowStatus struct {
+	// ConditionedStatus reflects the observed status of a resource
+	condition.ConditionedStatus `json:",inline"`
+	ObservedGeneration          int64                   `json:"observedGeneration,omitempty"`
+	StepIndex                   int                     `json:"stepIndex,omitempty"`
+	Suspend                     bool                    `json:"suspend"`
+	Terminated                  bool                    `json:"terminated"`
+	ContextBackend              *corev1.ObjectReference `json:"contextBackend"`
+	Steps                       []WorkflowStepStatus    `json:"steps,omitempty"`
+}
+
+// WorkflowStepStatus record the status of a workflow step
+type WorkflowStepStatus struct {
+	Name  string            `json:"name,omitempty"`
+	Type  string            `json:"type,omitempty"`
+	Phase WorkflowStepPhase `json:"phase,omitempty"`
+	// A human readable message indicating details about why the workflowStep is in this state.
+	Message string `json:"message,omitempty"`
+	// A brief CamelCase message indicating details about why the workflowStep is in this state.
+	Reason      string                 `json:"reason,omitempty"`
+	ResourceRef corev1.ObjectReference `json:"resourceRef,omitempty"`
+}
+
+// Workflow is the Schema for the Workflow API
+// +kubebuilder:object:root=true
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workflow
+// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
+// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+type Workflow struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   WorkflowSpec   `json:"spec,omitempty"`
+	Status WorkflowStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// WorkflowList contains a list of Workflow.
+type WorkflowList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Workflow `json:"items"`
+}
+
+// SetConditions set condition for Workflow
+func (w *Workflow) SetConditions(c ...condition.Condition) {
+	w.Status.SetConditions(c...)
+}
+
+// GetCondition gets condition from Workflow
+func (w *Workflow) GetCondition(conditionType condition.ConditionType) condition.Condition {
+	return w.Status.GetCondition(conditionType)
+}

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

@@ -21,6 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -168,6 +169,11 @@ func (in *EnvBindingStatus) DeepCopyInto(out *EnvBindingStatus) {
 		*out = make([]ClusterDecision, len(*in))
 		copy(*out, *in)
 	}
+	if in.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvBindingStatus.
@@ -184,6 +190,11 @@ func (in *EnvBindingStatus) DeepCopy() *EnvBindingStatus {
 func (in *EnvConfig) DeepCopyInto(out *EnvConfig) {
 	*out = *in
 	in.Placement.DeepCopyInto(&out.Placement)
+	if in.Selector != nil {
+		in, out := &in.Selector, &out.Selector
+		*out = new(EnvSelector)
+		(*in).DeepCopyInto(*out)
+	}
 	in.Patch.DeepCopyInto(&out.Patch)
 }
 
@@ -244,6 +255,26 @@ func (in *EnvPlacement) DeepCopy() *EnvPlacement {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EnvSelector) DeepCopyInto(out *EnvSelector) {
+	*out = *in
+	if in.Components != nil {
+		in, out := &in.Components, &out.Components
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvSelector.
+func (in *EnvSelector) DeepCopy() *EnvSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(EnvSelector)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NamespaceSelector) DeepCopyInto(out *NamespaceSelector) {
 	*out = *in
@@ -265,3 +296,152 @@ func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Workflow) DeepCopyInto(out *Workflow) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Workflow.
+func (in *Workflow) DeepCopy() *Workflow {
+	if in == nil {
+		return nil
+	}
+	out := new(Workflow)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Workflow) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowList) DeepCopyInto(out *WorkflowList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Workflow, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowList.
+func (in *WorkflowList) DeepCopy() *WorkflowList {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *WorkflowList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowSpec) DeepCopyInto(out *WorkflowSpec) {
+	*out = *in
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]WorkflowStep, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowSpec.
+func (in *WorkflowSpec) DeepCopy() *WorkflowSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.ContextBackend != nil {
+		in, out := &in.ContextBackend, &out.ContextBackend
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
+	if in.Steps != nil {
+		in, out := &in.Steps, &out.Steps
+		*out = make([]WorkflowStepStatus, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
+func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
+	*out = *in
+	in.Properties.DeepCopyInto(&out.Properties)
+	if in.Inputs != nil {
+		in, out := &in.Inputs, &out.Inputs
+		*out = make(common.StepInputs, len(*in))
+		copy(*out, *in)
+	}
+	if in.Outputs != nil {
+		in, out := &in.Outputs, &out.Outputs
+		*out = make(common.StepOutputs, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStep.
+func (in *WorkflowStep) DeepCopy() *WorkflowStep {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStep)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkflowStepStatus) DeepCopyInto(out *WorkflowStepStatus) {
+	*out = *in
+	out.ResourceRef = in.ResourceRef
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStepStatus.
+func (in *WorkflowStepStatus) DeepCopy() *WorkflowStepStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkflowStepStatus)
+	in.DeepCopyInto(out)
+	return out
+}

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

@@ -87,6 +87,7 @@ type HealthScopeStatus struct {
 // AppHealthCondition represents health condition of an application
 type AppHealthCondition struct {
 	AppName    string                     `json:"appName"`
+	EnvName    string                     `json:"envName,omitempty"`
 	Components []*WorkloadHealthCondition `json:"components,omitempty"`
 }
 

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

@@ -156,6 +156,8 @@ type AppDeploymentStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories={oam},shortName=appdeploy
 // +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type AppDeployment struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -166,6 +168,7 @@ type AppDeployment struct {
 
 // AppDeploymentList contains a list of AppDeployment
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type AppDeploymentList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

@@ -25,8 +25,17 @@ import (
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+const (
+	// TypeHealthy application are believed to be determined as healthy by a health scope.
+	TypeHealthy condition.ConditionType = "Healthy"
+)
+
+// Reasons an application is or is not healthy
+const (
+	ReasonHealthy        condition.ConditionReason = "AllComponentsHealthy"
+	ReasonUnhealthy      condition.ConditionReason = "UnhealthyOrUnknownComponents"
+	ReasonHealthCheckErr condition.ConditionReason = "HealthCheckeError"
+)
 
 // AppPolicy defines a global policy for all components in the app.
 type AppPolicy struct {
@@ -48,27 +57,11 @@ type WorkflowStep struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Properties runtime.RawExtension `json:"properties,omitempty"`
 
-	Inputs StepInputs `json:"inputs,omitempty"`
+	Inputs common.StepInputs `json:"inputs,omitempty"`
 
-	Outputs StepOutputs `json:"outputs,omitempty"`
+	Outputs common.StepOutputs `json:"outputs,omitempty"`
 }
 
-type inputItem struct {
-	ParameterKey string `json:"parameterKey"`
-	From         string `json:"from"`
-}
-
-// StepInputs defines variable input of WorkflowStep
-type StepInputs []inputItem
-
-type outputItem struct {
-	ExportKey string `json:"exportKey"`
-	Name      string `json:"name"`
-}
-
-// StepOutputs defines output variable of WorkflowStep
-type StepOutputs []outputItem
-
 // Workflow defines workflow steps and other attributes
 type Workflow struct {
 	Steps []WorkflowStep `json:"steps,omitempty"`
@@ -110,6 +103,8 @@ type ApplicationSpec struct {
 // +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy`
 // +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type Application struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -121,6 +116,7 @@ type Application struct {
 // +kubebuilder:object:root=true
 
 // ApplicationList contains a list of Application
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

@@ -43,14 +43,25 @@ type ApplicationRevisionSpec struct {
 	// ScopeDefinitions records the snapshot of the scopeDefinitions related with the created/modified Application
 	ScopeDefinitions map[string]ScopeDefinition `json:"scopeDefinitions,omitempty"`
 
+	// PolicyDefinitions records the snapshot of the PolicyDefinitions related with the created/modified Application
+	PolicyDefinitions map[string]PolicyDefinition `json:"policyDefinitions,omitempty"`
+
+	// WorkflowStepDefinitions records the snapshot of the WorkflowStepDefinitions related with the created/modified Application
+	WorkflowStepDefinitions map[string]WorkflowStepDefinition `json:"workflowStepDefinitions,omitempty"`
+
+	// ScopeGVK records the apiVersion to GVK mapping
+	ScopeGVK map[string]metav1.GroupVersionKind `json:"scopeGVK,omitempty"`
+
 	// Components records the rendered components from Application, it will contains the whole K8s CR of workload in it.
+	// +deprecated
 	Components []common.RawComponent `json:"components,omitempty"`
 
 	// ApplicationConfiguration records the rendered applicationConfiguration from Application,
 	// it will contains the whole K8s CR of trait and the reference component in it.
 	// +kubebuilder:validation:EmbeddedResource
 	// +kubebuilder:pruning:PreserveUnknownFields
-	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration"`
+	// +deprecated
+	ApplicationConfiguration runtime.RawExtension `json:"applicationConfiguration,omitempty"`
 
 	// ResourcesConfigMap references the ConfigMap that's generated to contain all final rendered resources.
 	ResourcesConfigMap corev1.LocalObjectReference `json:"resourcesConfigMap,omitempty"`
@@ -62,6 +73,8 @@ type ApplicationRevisionSpec struct {
 // +kubebuilder:storageversion
 // +kubebuilder:resource:categories={oam},shortName=apprev
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -72,6 +85,7 @@ type ApplicationRevision struct {
 // +kubebuilder:object:root=true
 
 // ApplicationRevisionList contains a list of ApplicationRevision
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ApplicationRevisionList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

@@ -61,6 +61,8 @@ type AppRolloutSpec struct {
 // +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState`
 // +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type AppRollout struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -71,6 +73,7 @@ type AppRollout struct {
 
 // AppRolloutList contains a list of AppRollout
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type AppRolloutList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

@@ -41,6 +41,8 @@ type ClusterStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Cluster is the Schema for the clusters API
 type Cluster struct {
@@ -52,6 +54,7 @@ type Cluster struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ClusterList contains a list of Cluster
 type ClusterList struct {

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

@@ -76,6 +76,8 @@ type ComponentDefinitionStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ComponentDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -95,6 +97,7 @@ func (cd *ComponentDefinition) GetCondition(conditionType condition.ConditionTyp
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ComponentDefinitionList contains a list of ComponentDefinition
 type ComponentDefinitionList struct {

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

@@ -73,6 +73,8 @@ type WorkloadDefinitionStatus struct {
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type WorkloadDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -94,6 +96,7 @@ func (wd *WorkloadDefinition) GetCondition(conditionType condition.ConditionType
 // +kubebuilder:object:root=true
 
 // WorkloadDefinitionList contains a list of WorkloadDefinition.
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type WorkloadDefinitionList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
@@ -179,6 +182,8 @@ type TraitDefinitionStatus struct {
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads"
 // +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type TraitDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -198,6 +203,7 @@ func (td *TraitDefinition) GetCondition(conditionType condition.ConditionType) c
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // TraitDefinitionList contains a list of TraitDefinition.
 type TraitDefinitionList struct {
@@ -233,6 +239,8 @@ type ScopeDefinitionSpec struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=scope
 // +kubebuilder:storageversion
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ScopeDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -241,6 +249,7 @@ type ScopeDefinition struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ScopeDefinitionList contains a list of ScopeDefinition.
 type ScopeDefinitionList struct {
@@ -251,6 +260,8 @@ type ScopeDefinitionList struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // An ResourceTracker represents a tracker for track cross namespace resources
 // +kubebuilder:resource:scope=Cluster,categories={oam},shortName=tracker
@@ -267,6 +278,7 @@ type ResourceTrackerStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ResourceTrackerList contains a list of ResourceTracker
 type ResourceTrackerList struct {

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

@@ -53,6 +53,8 @@ type DefinitionRevisionSpec struct {
 // +kubebuilder:printcolumn:name="REVISION",type=integer,JSONPath=".spec.revision"
 // +kubebuilder:printcolumn:name="HASH",type=string,JSONPath=".spec.revisionHash"
 // +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=".spec.definitionType"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type DefinitionRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -61,6 +63,7 @@ type DefinitionRevision struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // DefinitionRevisionList contains a list of DefinitionRevision
 type DefinitionRevisionList struct {

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

@@ -69,6 +69,8 @@ type InitializerStatus struct {
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=init
 // +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type Initializer struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -78,6 +80,7 @@ type Initializer struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // InitializerList contains a list of Initializer.
 type InitializerList struct {

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

@@ -32,6 +32,10 @@ type PolicyDefinitionSpec struct {
 	// Schematic defines the data format and template of the encapsulation of the policy definition
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
+
+	// ManageHealthCheck means the policy will handle health checking and skip application controller
+	// built-in health checking.
+	ManageHealthCheck bool `json:"manageHealthCheck,omitempty"`
 }
 
 // PolicyDefinitionStatus is the status of PolicyDefinition
@@ -60,6 +64,8 @@ func (d *PolicyDefinition) GetCondition(conditionType condition.ConditionType) c
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=policy
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type PolicyDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -69,6 +75,7 @@ type PolicyDefinition struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // PolicyDefinitionList contains a list of PolicyDefinition
 type PolicyDefinitionList struct {

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

@@ -35,6 +35,9 @@ var (
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
 )
 
 // ComponentDefinition type metadata.
@@ -165,3 +168,8 @@ func init() {
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
 	SchemeBuilder.Register(&Initializer{}, &InitializerList{})
 }
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}

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

@@ -60,6 +60,8 @@ func (d *WorkflowStepDefinition) GetCondition(conditionType condition.ConditionT
 // +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workflowstep
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type WorkflowStepDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -69,6 +71,7 @@ type WorkflowStepDefinition struct {
 }
 
 // +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // WorkflowStepDefinitionList contains a list of WorkflowStepDefinition
 type WorkflowStepDefinitionList struct {

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

@@ -21,7 +21,8 @@ limitations under the License.
 package v1beta1
 
 import (
-	v1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -404,6 +405,27 @@ func (in *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 			(*out)[key] = *val.DeepCopy()
 		}
 	}
+	if in.PolicyDefinitions != nil {
+		in, out := &in.PolicyDefinitions, &out.PolicyDefinitions
+		*out = make(map[string]PolicyDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.WorkflowStepDefinitions != nil {
+		in, out := &in.WorkflowStepDefinitions, &out.WorkflowStepDefinitions
+		*out = make(map[string]WorkflowStepDefinition, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+	}
+	if in.ScopeGVK != nil {
+		in, out := &in.ScopeGVK, &out.ScopeGVK
+		*out = make(map[string]v1.GroupVersionKind, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.Components != nil {
 		in, out := &in.Components, &out.Components
 		*out = make([]common.RawComponent, len(*in))
@@ -1126,7 +1148,7 @@ func (in *ResourceTrackerStatus) DeepCopyInto(out *ResourceTrackerStatus) {
 	*out = *in
 	if in.TrackedResources != nil {
 		in, out := &in.TrackedResources, &out.TrackedResources
-		*out = make([]v1.ObjectReference, len(*in))
+		*out = make([]corev1.ObjectReference, len(*in))
 		copy(*out, *in)
 	}
 }
@@ -1220,44 +1242,6 @@ func (in *ScopeDefinitionSpec) DeepCopy() *ScopeDefinitionSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in StepInputs) DeepCopyInto(out *StepInputs) {
-	{
-		in := &in
-		*out = make(StepInputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepInputs.
-func (in StepInputs) DeepCopy() StepInputs {
-	if in == nil {
-		return nil
-	}
-	out := new(StepInputs)
-	in.DeepCopyInto(out)
-	return *out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in StepOutputs) DeepCopyInto(out *StepOutputs) {
-	{
-		in := &in
-		*out = make(StepOutputs, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepOutputs.
-func (in StepOutputs) DeepCopy() StepOutputs {
-	if in == nil {
-		return nil
-	}
-	out := new(StepOutputs)
-	in.DeepCopyInto(out)
-	return *out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Traffic) DeepCopyInto(out *Traffic) {
 	*out = *in
@@ -1469,12 +1453,12 @@ func (in *WorkflowStep) DeepCopyInto(out *WorkflowStep) {
 	in.Properties.DeepCopyInto(&out.Properties)
 	if in.Inputs != nil {
 		in, out := &in.Inputs, &out.Inputs
-		*out = make(StepInputs, len(*in))
+		*out = make(common.StepInputs, len(*in))
 		copy(*out, *in)
 	}
 	if in.Outputs != nil {
 		in, out := &in.Outputs, &out.Outputs
-		*out = make(StepOutputs, len(*in))
+		*out = make(common.StepOutputs, len(*in))
 		copy(*out, *in)
 	}
 }

apis/generate.go

@@ -22,10 +22,10 @@ limitations under the License.
 // NOTE(@wonderflow) We don't remove existing CRDs here, because the crd folders contain not only auto generated.
 
 // Generate deepcopy methodsets and CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../config/crd/base
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1,generateEmbeddedObjectMeta=true output:artifacts:config=../config/crd/base
 
 // Generate legacy_support for K8s 1.12~1.15 versions CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd output:artifacts:config=../legacy/charts/vela-core-legacy/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:generateEmbeddedObjectMeta=true output:artifacts:config=../legacy/charts/vela-core-legacy/crds
 //go:generate go run ../legacy/convert/main.go ../legacy/charts/vela-core-legacy/crds
 
 package apis

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

@@ -1,82 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// PodSpecWorkloadSpec defines the desired state of PodSpecWorkload
-type PodSpecWorkloadSpec struct {
-	// Replicas is the desired number of replicas of the given podSpec.
-	// These are replicas in the sense that they are instantiations of the same podSpec.
-	// If unspecified, defaults to 1.
-	Replicas *int32 `json:"replicas,omitempty"`
-
-	// PodSpec describes the pods that will be created,
-	// we omit the meta part as it will be exactly the same as the PodSpecWorkload
-	PodSpec v1.PodSpec `json:"podSpec"`
-}
-
-// PodSpecWorkloadStatus defines the observed state of PodSpecWorkload
-type PodSpecWorkloadStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-
-	// Resources managed by this workload.
-	Resources []v1.ObjectReference `json:"resources,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PodSpecWorkload is the Schema for the PodSpec API
-// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
-// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type PodSpecWorkload struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   PodSpecWorkloadSpec   `json:"spec,omitempty"`
-	Status PodSpecWorkloadStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PodSpecWorkloadList contains a list of PodSpecWorkload
-type PodSpecWorkloadList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []PodSpecWorkload `json:"items"`
-}
-
-var _ oam.Workload = &PodSpecWorkload{}
-
-// SetConditions set condition for this CR
-func (in *PodSpecWorkload) SetConditions(c ...condition.Condition) {
-	in.Status.SetConditions(c...)
-}
-
-// GetCondition set condition for this CR
-func (in *PodSpecWorkload) GetCondition(c condition.ConditionType) condition.Condition {
-	return in.Status.GetCondition(c)
-}

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

@@ -32,5 +32,4 @@ var (
 
 func init() {
 	SchemeBuilder.Register(&Rollout{}, &RolloutList{})
-	SchemeBuilder.Register(&PodSpecWorkload{}, &PodSpecWorkloadList{})
 }

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

@@ -1,90 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// RolloutTraitSpec defines the desired state of RolloutTrait
-type RolloutTraitSpec struct {
-	// TargetRef references a target resource that contains the newer version
-	// of the software. We assumed that new resource already exists.
-	// This is the only resource we work on if the resource is a stateful resource (cloneset/statefulset)
-	TargetRef corev1.ObjectReference `json:"targetRef"`
-
-	// SourceRef references the list of resources that contains the older version
-	// of the software. We assume that it's the first time to deploy when we cannot find any source.
-	// +optional
-	SourceRef []corev1.ObjectReference `json:"sourceRef,omitempty"`
-
-	// RolloutPlan is the details on how to rollout the resources
-	RolloutPlan RolloutPlan `json:"rolloutPlan"`
-}
-
-// RolloutTrait is the Schema for the RolloutTrait API
-// +kubebuilder:object:root=true
-// +genclient
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type RolloutTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   RolloutTraitSpec `json:"spec,omitempty"`
-	Status RolloutStatus    `json:"status,omitempty"`
-}
-
-// RolloutTraitList contains a list of RolloutTrait
-// +kubebuilder:object:root=true
-// +genclient
-type RolloutTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []RolloutTrait `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&RolloutTrait{}, &RolloutTraitList{})
-}
-
-var _ oam.Trait = &RolloutTrait{}
-
-// SetConditions for set CR condition
-func (tr *RolloutTrait) SetConditions(c ...condition.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetCondition for get CR condition
-func (tr *RolloutTrait) GetCondition(c condition.ConditionType) condition.Condition {
-	return tr.Status.GetCondition(c)
-}
-
-// GetWorkloadReference of this MetricsTrait.
-func (tr *RolloutTrait) GetWorkloadReference() corev1.ObjectReference {
-	return tr.Spec.TargetRef
-}
-
-// SetWorkloadReference of this MetricsTrait.
-func (tr *RolloutTrait) SetWorkloadReference(r corev1.ObjectReference) {
-	tr.Spec.TargetRef = r
-}

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

@@ -92,107 +92,6 @@ func (in *MetricsExpectedRange) DeepCopy() *MetricsExpectedRange {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodSpecWorkload) DeepCopyInto(out *PodSpecWorkload) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkload.
-func (in *PodSpecWorkload) DeepCopy() *PodSpecWorkload {
-	if in == nil {
-		return nil
-	}
-	out := new(PodSpecWorkload)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *PodSpecWorkload) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodSpecWorkloadList) DeepCopyInto(out *PodSpecWorkloadList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]PodSpecWorkload, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadList.
-func (in *PodSpecWorkloadList) DeepCopy() *PodSpecWorkloadList {
-	if in == nil {
-		return nil
-	}
-	out := new(PodSpecWorkloadList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *PodSpecWorkloadList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodSpecWorkloadSpec) DeepCopyInto(out *PodSpecWorkloadSpec) {
-	*out = *in
-	if in.Replicas != nil {
-		in, out := &in.Replicas, &out.Replicas
-		*out = new(int32)
-		**out = **in
-	}
-	in.PodSpec.DeepCopyInto(&out.PodSpec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadSpec.
-func (in *PodSpecWorkloadSpec) DeepCopy() *PodSpecWorkloadSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(PodSpecWorkloadSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodSpecWorkloadStatus) DeepCopyInto(out *PodSpecWorkloadStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Resources != nil {
-		in, out := &in.Resources, &out.Resources
-		*out = make([]v1.ObjectReference, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadStatus.
-func (in *PodSpecWorkloadStatus) DeepCopy() *PodSpecWorkloadStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(PodSpecWorkloadStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Rollout) DeepCopyInto(out *Rollout) {
 	*out = *in
@@ -380,87 +279,6 @@ func (in *RolloutStatus) DeepCopy() *RolloutStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutTrait) DeepCopyInto(out *RolloutTrait) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutTrait.
-func (in *RolloutTrait) DeepCopy() *RolloutTrait {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutTrait)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RolloutTrait) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutTraitList) DeepCopyInto(out *RolloutTraitList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]RolloutTrait, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutTraitList.
-func (in *RolloutTraitList) DeepCopy() *RolloutTraitList {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutTraitList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RolloutTraitList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RolloutTraitSpec) DeepCopyInto(out *RolloutTraitSpec) {
-	*out = *in
-	out.TargetRef = in.TargetRef
-	if in.SourceRef != nil {
-		in, out := &in.SourceRef, &out.SourceRef
-		*out = make([]v1.ObjectReference, len(*in))
-		copy(*out, *in)
-	}
-	in.RolloutPlan.DeepCopyInto(&out.RolloutPlan)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RolloutTraitSpec.
-func (in *RolloutTraitSpec) DeepCopy() *RolloutTraitSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RolloutTraitSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RolloutWebhook) DeepCopyInto(out *RolloutWebhook) {
 	*out = *in

apis/types/capability.go

@@ -162,6 +162,7 @@ type Capability struct {
 	Center         string             `json:"center,omitempty"`
 	Status         string             `json:"status,omitempty"`
 	Description    string             `json:"description,omitempty"`
+	Labels         map[string]string  `json:"labels,omitempty"`
 	Category       CapabilityCategory `json:"category,omitempty"`
 
 	// trait only

apis/types/componentmanifest.go

@@ -36,9 +36,4 @@ type ComponentManifest struct {
 	// Release, Git Repo or anything that can package and run a workload.
 	PackagedWorkloadResources []*unstructured.Unstructured
 	PackagedTraitResources    map[string][]*unstructured.Unstructured
-
-	// InsertConfigNotReady is true indicates the ComponentManifest is not ready to apply for insertSecret and configs
-	// it's possible for some of the component not ready while others are ready, we should not block all of them if only
-	// part is not ready
-	InsertConfigNotReady bool
 }

apis/types/event.go

@@ -38,13 +38,14 @@ const (
 
 // event message for Application
 const (
-	MessageParsed      = "Parsed successfully"
-	MessageRendered    = "Rendered successfully"
-	MessageRevisioned  = "Revisioned successfully"
-	MessageApplied     = "Applied successfully"
-	MessageHealthCheck = "Health checked healthy"
-	MessageDeployed    = "Deployed successfully"
-	MessageRollout     = "Rollout successfully"
+	MessageParsed           = "Parsed successfully"
+	MessageRendered         = "Rendered successfully"
+	MessageRevisioned       = "Revisioned successfully"
+	MessageApplied          = "Applied successfully"
+	MessageWorkflowFinished = "Workflow finished"
+	MessageHealthCheck      = "Health checked healthy"
+	MessageDeployed         = "Deployed successfully"
+	MessageRollout          = "Rollout successfully"
 
 	MessageFailedParse       = "fail to parse application, err: %v"
 	MessageFailedRender      = "fail to render application, err: %v"

apis/types/types.go

@@ -16,6 +16,8 @@ limitations under the License.
 
 package types
 
+import "github.com/oam-dev/kubevela/pkg/oam"
+
 const (
 	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
 	DefaultKubeVelaNS = "vela-system"
@@ -71,3 +73,15 @@ const (
 	// TypePlugin defines one category used in Kubectl Plugin
 	TypePlugin = "Plugin Command"
 )
+
+// LabelArg is the argument `label` of a definition
+const LabelArg = "label"
+
+// DefaultFilterAnnots are annotations that won't pass to workload or trait
+var DefaultFilterAnnots = []string{
+	oam.AnnotationAppRollout,
+	oam.AnnotationRollingComponent,
+	oam.AnnotationInplaceUpgrade,
+	oam.AnnotationFilterLabelKeys,
+	oam.AnnotationFilterAnnotationKeys,
+}

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: applicationconfigurations.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: components.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: containerizedworkloads.core.oam.dev
 spec:
   group: core.oam.dev
@@ -354,9 +354,13 @@ spec:
                           description: CPU required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required CPU count. 1.0 represents one
                                 CPU core.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -386,8 +390,12 @@ spec:
                           description: GPU required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required GPU count.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -395,8 +403,12 @@ spec:
                           description: Memory required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required memory.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -420,8 +432,12 @@ spec:
                                       disk needs to be mounted.
                                     type: boolean
                                   required:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
                                     description: Required disk space.
-                                    type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
                                 required:
                                 - required
                                 type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: healthscopes.core.oam.dev
 spec:
   group: core.oam.dev
@@ -402,6 +402,8 @@ spec:
                         - healthStatus
                         type: object
                       type: array
+                    envName:
+                      type: string
                   required:
                   - appName
                   type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: manualscalertraits.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: scopedefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: traitdefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workloaddefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: appdeployments.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: applicationcontexts.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: vela-system/kubevela-vela-core-root-cert
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: applications.core.oam.dev
 spec:
   conversion:
@@ -335,6 +335,39 @@ spec:
           status:
             description: AppStatus defines the observed state of Application
             properties:
+              appliedResources:
+                description: AppliedResources record the resources that the  workflow step apply.
+                items:
+                  description: ClusterObjectReference defines the object reference with cluster.
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    cluster:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
               components:
                 description: Components record the related Components created by Application Controller
                 items:
@@ -516,6 +549,8 @@ spec:
                 items:
                   description: ApplicationComponentStatus record the health status of App component
                   properties:
+                    env:
+                      type: string
                     healthy:
                       type: boolean
                     message:
@@ -613,12 +648,15 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  stepIndex:
-                    type: integer
+                  mode:
+                    description: WorkflowMode describes the mode of workflow
+                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow step
                       properties:
+                        id:
+                          type: string
                         message:
                           description: A human readable message indicating details about why the workflowStep is in this state.
                           type: string
@@ -630,33 +668,42 @@ spec:
                         reason:
                           description: A brief CamelCase message indicating details about why the workflowStep is in this state.
                           type: string
-                        resourceRef:
-                          description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs.  1. Ignored fields.  It includes many fields which are not generally honored.  For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage.  2. Invalid usage help.  It is impossible to add specific help for individual usage.  In most embedded usages, there are particular     restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted".     Those cannot be well described when embedded.  3. Inconsistent validation.  Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen.  4. The fields are both imprecise and overly precise.  Kind is not a precise mapping to a URL. This can produce ambiguity     during interpretation and require a REST mapping.  In most cases, the dependency is on the group,resource tuple     and the version of the actual struct is irrelevant.  5. We cannot easily change it.  Because this type is embedded in many locations, updates to this type     will affect numerous schemas.  Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
+                        subSteps:
+                          description: SubStepsStatus record the status of workflow steps.
                           properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            mode:
+                              description: WorkflowMode describes the mode of workflow
                               type: string
+                            stepIndex:
+                              type: integer
+                            steps:
+                              items:
+                                description: WorkflowSubStepStatus record the status of a workflow step
+                                properties:
+                                  id:
+                                    type: string
+                                  message:
+                                    description: A human readable message indicating details about why the workflowStep is in this state.
+                                    type: string
+                                  name:
+                                    type: string
+                                  phase:
+                                    description: WorkflowStepPhase describes the phase of a workflow step.
+                                    type: string
+                                  reason:
+                                    description: A brief CamelCase message indicating details about why the workflowStep is in this state.
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - id
+                                type: object
+                              type: array
                           type: object
                         type:
                           type: string
+                      required:
+                      - id
                       type: object
                     type: array
                   suspend:
@@ -664,7 +711,7 @@ spec:
                   terminated:
                     type: boolean
                 required:
-                - contextBackend
+                - mode
                 - suspend
                 - terminated
                 type: object
@@ -716,8 +763,34 @@ spec:
                     externalRevision:
                       description: ExternalRevision specified the component revisionName
                       type: string
+                    inputs:
+                      description: StepInputs defines variable input of WorkflowStep
+                      items:
+                        properties:
+                          from:
+                            type: string
+                          parameterKey:
+                            type: string
+                        required:
+                        - from
+                        - parameterKey
+                        type: object
+                      type: array
                     name:
                       type: string
+                    outputs:
+                      description: StepOutputs defines output variable of WorkflowStep
+                      items:
+                        properties:
+                          name:
+                            type: string
+                          valueFrom:
+                            type: string
+                        required:
+                        - name
+                        - valueFrom
+                        type: object
+                      type: array
                     properties:
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
@@ -1021,13 +1094,13 @@ spec:
                           description: StepOutputs defines output variable of WorkflowStep
                           items:
                             properties:
-                              exportKey:
-                                type: string
                               name:
                                 type: string
+                              valueFrom:
+                                type: string
                             required:
-                            - exportKey
                             - name
+                            - valueFrom
                             type: object
                           type: array
                         properties:
@@ -1047,6 +1120,39 @@ spec:
           status:
             description: AppStatus defines the observed state of Application
             properties:
+              appliedResources:
+                description: AppliedResources record the resources that the  workflow step apply.
+                items:
+                  description: ClusterObjectReference defines the object reference with cluster.
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    cluster:
+                      type: string
+                    creator:
+                      description: ResourceCreatorRole defines the resource creator.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                  type: object
+                type: array
               components:
                 description: Components record the related Components created by Application Controller
                 items:
@@ -1228,6 +1334,8 @@ spec:
                 items:
                   description: ApplicationComponentStatus record the health status of App component
                   properties:
+                    env:
+                      type: string
                     healthy:
                       type: boolean
                     message:
@@ -1325,12 +1433,15 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                  stepIndex:
-                    type: integer
+                  mode:
+                    description: WorkflowMode describes the mode of workflow
+                    type: string
                   steps:
                     items:
                       description: WorkflowStepStatus record the status of a workflow step
                       properties:
+                        id:
+                          type: string
                         message:
                           description: A human readable message indicating details about why the workflowStep is in this state.
                           type: string
@@ -1342,33 +1453,42 @@ spec:
                         reason:
                           description: A brief CamelCase message indicating details about why the workflowStep is in this state.
                           type: string
-                        resourceRef:
-                          description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs.  1. Ignored fields.  It includes many fields which are not generally honored.  For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage.  2. Invalid usage help.  It is impossible to add specific help for individual usage.  In most embedded usages, there are particular     restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted".     Those cannot be well described when embedded.  3. Inconsistent validation.  Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen.  4. The fields are both imprecise and overly precise.  Kind is not a precise mapping to a URL. This can produce ambiguity     during interpretation and require a REST mapping.  In most cases, the dependency is on the group,resource tuple     and the version of the actual struct is irrelevant.  5. We cannot easily change it.  Because this type is embedded in many locations, updates to this type     will affect numerous schemas.  Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
+                        subSteps:
+                          description: SubStepsStatus record the status of workflow steps.
                           properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            mode:
+                              description: WorkflowMode describes the mode of workflow
                               type: string
+                            stepIndex:
+                              type: integer
+                            steps:
+                              items:
+                                description: WorkflowSubStepStatus record the status of a workflow step
+                                properties:
+                                  id:
+                                    type: string
+                                  message:
+                                    description: A human readable message indicating details about why the workflowStep is in this state.
+                                    type: string
+                                  name:
+                                    type: string
+                                  phase:
+                                    description: WorkflowStepPhase describes the phase of a workflow step.
+                                    type: string
+                                  reason:
+                                    description: A brief CamelCase message indicating details about why the workflowStep is in this state.
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - id
+                                type: object
+                              type: array
                           type: object
                         type:
                           type: string
+                      required:
+                      - id
                       type: object
                     type: array
                   suspend:
@@ -1376,7 +1496,7 @@ spec:
                   terminated:
                     type: boolean
                 required:
-                - contextBackend
+                - mode
                 - suspend
                 - terminated
                 type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: approllouts.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: clusters.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: componentdefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: containerizedworkloads.core.oam.dev
 spec:
   group: core.oam.dev
@@ -354,9 +354,13 @@ spec:
                           description: CPU required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required CPU count. 1.0 represents one
                                 CPU core.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -386,8 +390,12 @@ spec:
                           description: GPU required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required GPU count.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -395,8 +403,12 @@ spec:
                           description: Memory required by this container.
                           properties:
                             required:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: Required memory.
-                              type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
                           required:
                           - required
                           type: object
@@ -420,8 +432,12 @@ spec:
                                       disk needs to be mounted.
                                     type: boolean
                                   required:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
                                     description: Required disk space.
-                                    type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
                                 required:
                                 - required
                                 type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: definitionrevisions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -66,6 +66,23 @@ spec:
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   metadata:
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      finalizers:
+                        items:
+                          type: string
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      name:
+                        type: string
+                      namespace:
+                        type: string
                     type: object
                   spec:
                     description: ComponentDefinitionSpec defines the desired state
@@ -337,6 +354,23 @@ spec:
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   metadata:
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      finalizers:
+                        items:
+                          type: string
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      name:
+                        type: string
+                      namespace:
+                        type: string
                     type: object
                   spec:
                     description: PolicyDefinitionSpec defines the desired state of
@@ -357,6 +391,11 @@ spec:
                         required:
                         - name
                         type: object
+                      manageHealthCheck:
+                        description: ManageHealthCheck means the policy will handle
+                          health checking and skip application controller built-in
+                          health checking.
+                        type: boolean
                       schematic:
                         description: Schematic defines the data format and template
                           of the encapsulation of the policy definition
@@ -546,6 +585,23 @@ spec:
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   metadata:
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      finalizers:
+                        items:
+                          type: string
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      name:
+                        type: string
+                      namespace:
+                        type: string
                     type: object
                   spec:
                     description: A TraitDefinitionSpec defines the desired state of
@@ -808,6 +864,23 @@ spec:
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   metadata:
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      finalizers:
+                        items:
+                          type: string
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      name:
+                        type: string
+                      namespace:
+                        type: string
                     type: object
                   spec:
                     description: WorkflowStepDefinitionSpec defines the desired state

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: envbindings.core.oam.dev
 spec:
   group: core.oam.dev
@@ -77,8 +77,36 @@ spec:
                                 description: ExternalRevision specified the component
                                   revisionName
                                 type: string
+                              inputs:
+                                description: StepInputs defines variable input of
+                                  WorkflowStep
+                                items:
+                                  properties:
+                                    from:
+                                      type: string
+                                    parameterKey:
+                                      type: string
+                                  required:
+                                  - from
+                                  - parameterKey
+                                  type: object
+                                type: array
                               name:
                                 type: string
+                              outputs:
+                                description: StepOutputs defines output variable of
+                                  WorkflowStep
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    valueFrom:
+                                      type: string
+                                  required:
+                                  - name
+                                  - valueFrom
+                                  type: object
+                                type: array
                               properties:
                                 type: object
                                 x-kubernetes-preserve-unknown-fields: true
@@ -150,6 +178,15 @@ spec:
                               type: string
                           type: object
                       type: object
+                    selector:
+                      description: EnvSelector defines which components should this
+                        env contains
+                      properties:
+                        components:
+                          items:
+                            type: string
+                          type: array
+                      type: object
                   required:
                   - name
                   - patch
@@ -176,7 +213,7 @@ spec:
           status:
             description: A EnvBindingStatus is the status of EnvBinding
             properties:
-              cluster_decisions:
+              clusterDecisions:
                 items:
                   description: ClusterDecision recorded the mapping of environment
                     and cluster
@@ -228,6 +265,42 @@ spec:
                 description: EnvBindingPhase is a label for the condition of a EnvBinding
                   at the current time
                 type: string
+              resourceTracker:
+                description: ResourceTracker record the status of the ResourceTracker
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: 'If referring to a piece of an object instead of
+                      an entire object, this string should contain a valid JSON/Go
+                      field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within
+                      a pod, this would take on a value like: "spec.containers{name}"
+                      (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]"
+                      (container with index 2 in this pod). This syntax is chosen
+                      only to have some well-defined way of referencing a part of
+                      an object. TODO: this design is not final and this field is
+                      subject to change in the future.'
+                    type: string
+                  kind:
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                    type: string
+                  namespace:
+                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                    type: string
+                  resourceVersion:
+                    description: 'Specific resourceVersion to which this reference
+                      is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                    type: string
+                  uid:
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                    type: string
+                type: object
             type: object
         type: object
     served: true

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: healthscopes.core.oam.dev
 spec:
   group: core.oam.dev
@@ -402,6 +402,8 @@ spec:
                         - healthStatus
                         type: object
                       type: array
+                    envName:
+                      type: string
                   required:
                   - appName
                   type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: initializers.core.oam.dev
 spec:
   group: core.oam.dev
@@ -63,6 +63,23 @@ spec:
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   metadata:
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      finalizers:
+                        items:
+                          type: string
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      name:
+                        type: string
+                      namespace:
+                        type: string
                     type: object
                   spec:
                     description: ApplicationSpec is the spec of Application
@@ -76,8 +93,35 @@ spec:
                               description: ExternalRevision specified the component
                                 revisionName
                               type: string
+                            inputs:
+                              description: StepInputs defines variable input of WorkflowStep
+                              items:
+                                properties:
+                                  from:
+                                    type: string
+                                  parameterKey:
+                                    type: string
+                                required:
+                                - from
+                                - parameterKey
+                                type: object
+                              type: array
                             name:
                               type: string
+                            outputs:
+                              description: StepOutputs defines output variable of
+                                WorkflowStep
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  valueFrom:
+                                    type: string
+                                required:
+                                - name
+                                - valueFrom
+                                type: object
+                              type: array
                             properties:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
@@ -489,13 +533,13 @@ spec:
                                     of WorkflowStep
                                   items:
                                     properties:
-                                      exportKey:
-                                        type: string
                                       name:
                                         type: string
+                                      valueFrom:
+                                        type: string
                                     required:
-                                    - exportKey
                                     - name
+                                    - valueFrom
                                     type: object
                                   type: array
                                 properties:
@@ -515,6 +559,55 @@ spec:
                   status:
                     description: AppStatus defines the observed state of Application
                     properties:
+                      appliedResources:
+                        description: AppliedResources record the resources that the  workflow
+                          step apply.
+                        items:
+                          description: ClusterObjectReference defines the object reference
+                            with cluster.
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            cluster:
+                              type: string
+                            creator:
+                              description: ResourceCreatorRole defines the resource
+                                creator.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                        type: array
                       components:
                         description: Components record the related Components created
                           by Application Controller
@@ -791,6 +884,8 @@ spec:
                           description: ApplicationComponentStatus record the health
                             status of App component
                           properties:
+                            env:
+                              type: string
                             healthy:
                               type: boolean
                             message:
@@ -982,13 +1077,16 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                          stepIndex:
-                            type: integer
+                          mode:
+                            description: WorkflowMode describes the mode of workflow
+                            type: string
                           steps:
                             items:
                               description: WorkflowStepStatus record the status of
                                 a workflow step
                               properties:
+                                id:
+                                  type: string
                                 message:
                                   description: A human readable message indicating
                                     details about why the workflowStep is in this
@@ -1005,83 +1103,50 @@ spec:
                                     details about why the workflowStep is in this
                                     state.
                                   type: string
-                                resourceRef:
-                                  description: 'ObjectReference contains enough information
-                                    to let you inspect or modify the referred object.
-                                    --- New uses of this type are discouraged because
-                                    of difficulty describing its usage when embedded
-                                    in APIs.  1. Ignored fields.  It includes many
-                                    fields which are not generally honored.  For instance,
-                                    ResourceVersion and FieldPath are both very rarely
-                                    valid in actual usage.  2. Invalid usage help.  It
-                                    is impossible to add specific help for individual
-                                    usage.  In most embedded usages, there are particular     restrictions
-                                    like, "must refer only to types A and B" or "UID
-                                    not honored" or "name must be restricted".     Those
-                                    cannot be well described when embedded.  3. Inconsistent
-                                    validation.  Because the usages are different,
-                                    the validation rules are different by usage, which
-                                    makes it hard for users to predict what will happen.  4.
-                                    The fields are both imprecise and overly precise.  Kind
-                                    is not a precise mapping to a URL. This can produce
-                                    ambiguity     during interpretation and require
-                                    a REST mapping.  In most cases, the dependency
-                                    is on the group,resource tuple     and the version
-                                    of the actual struct is irrelevant.  5. We cannot
-                                    easily change it.  Because this type is embedded
-                                    in many locations, updates to this type     will
-                                    affect numerous schemas.  Don''t make new APIs
-                                    embed an underspecified API type they do not control.
-                                    Instead of using this type, create a locally provided
-                                    and used type that is well-focused on your reference.
-                                    For example, ServiceReferences for admission registration:
-                                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                    .'
+                                subSteps:
+                                  description: SubStepsStatus record the status of
+                                    workflow steps.
                                   properties:
-                                    apiVersion:
-                                      description: API version of the referent.
-                                      type: string
-                                    fieldPath:
-                                      description: 'If referring to a piece of an
-                                        object instead of an entire object, this string
-                                        should contain a valid JSON/Go field access
-                                        statement, such as desiredState.manifest.containers[2].
-                                        For example, if the object reference is to
-                                        a container within a pod, this would take
-                                        on a value like: "spec.containers{name}" (where
-                                        "name" refers to the name of the container
-                                        that triggered the event) or if no container
-                                        name is specified "spec.containers[2]" (container
-                                        with index 2 in this pod). This syntax is
-                                        chosen only to have some well-defined way
-                                        of referencing a part of an object. TODO:
-                                        this design is not final and this field is
-                                        subject to change in the future.'
-                                      type: string
-                                    kind:
-                                      description: 'Kind of the referent. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                      type: string
-                                    name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                      type: string
-                                    namespace:
-                                      description: 'Namespace of the referent. More
-                                        info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                      type: string
-                                    resourceVersion:
-                                      description: 'Specific resourceVersion to which
-                                        this reference is made, if any. More info:
-                                        https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                      type: string
-                                    uid:
-                                      description: 'UID of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                                    mode:
+                                      description: WorkflowMode describes the mode
+                                        of workflow
                                       type: string
+                                    stepIndex:
+                                      type: integer
+                                    steps:
+                                      items:
+                                        description: WorkflowSubStepStatus record
+                                          the status of a workflow step
+                                        properties:
+                                          id:
+                                            type: string
+                                          message:
+                                            description: A human readable message
+                                              indicating details about why the workflowStep
+                                              is in this state.
+                                            type: string
+                                          name:
+                                            type: string
+                                          phase:
+                                            description: WorkflowStepPhase describes
+                                              the phase of a workflow step.
+                                            type: string
+                                          reason:
+                                            description: A brief CamelCase message
+                                              indicating details about why the workflowStep
+                                              is in this state.
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - id
+                                        type: object
+                                      type: array
                                   type: object
                                 type:
                                   type: string
+                              required:
+                              - id
                               type: object
                             type: array
                           suspend:
@@ -1089,7 +1154,7 @@ spec:
                           terminated:
                             type: boolean
                         required:
-                        - contextBackend
+                        - mode
                         - suspend
                         - terminated
                         type: object

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: manualscalertraits.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: policydefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -54,6 +54,10 @@ spec:
                 required:
                 - name
                 type: object
+              manageHealthCheck:
+                description: ManageHealthCheck means the policy will handle health
+                  checking and skip application controller built-in health checking.
+                type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
                   encapsulation of the policy definition

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: resourcetrackers.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: scopedefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: traitdefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -0,0 +1,348 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.2
+  name: workflows.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: Workflow
+    listKind: WorkflowList
+    plural: workflows
+    shortNames:
+    - workflow
+    singular: workflow
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: PHASE
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Workflow is the Schema for the Workflow API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: A WorkflowSpec defines the desired state of a Workflow.
+            properties:
+              steps:
+                items:
+                  description: WorkflowStep defines how to execute a workflow step.
+                  properties:
+                    inputs:
+                      description: StepInputs defines variable input of WorkflowStep
+                      items:
+                        properties:
+                          from:
+                            type: string
+                          parameterKey:
+                            type: string
+                        required:
+                        - from
+                        - parameterKey
+                        type: object
+                      type: array
+                    name:
+                      description: Name is the unique name of the workflow step.
+                      type: string
+                    outputs:
+                      description: StepOutputs defines output variable of WorkflowStep
+                      items:
+                        properties:
+                          name:
+                            type: string
+                          valueFrom:
+                            type: string
+                        required:
+                        - name
+                        - valueFrom
+                        type: object
+                      type: array
+                    properties:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    type:
+                      type: string
+                  required:
+                  - name
+                  - type
+                  type: object
+                type: array
+            type: object
+          status:
+            description: A WorkflowStatus is the status of Workflow
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              contextBackend:
+                description: 'ObjectReference contains enough information to let you
+                  inspect or modify the referred object. --- New uses of this type
+                  are discouraged because of difficulty describing its usage when
+                  embedded in APIs.  1. Ignored fields.  It includes many fields which
+                  are not generally honored.  For instance, ResourceVersion and FieldPath
+                  are both very rarely valid in actual usage.  2. Invalid usage help.  It
+                  is impossible to add specific help for individual usage.  In most
+                  embedded usages, there are particular     restrictions like, "must
+                  refer only to types A and B" or "UID not honored" or "name must
+                  be restricted".     Those cannot be well described when embedded.  3.
+                  Inconsistent validation.  Because the usages are different, the
+                  validation rules are different by usage, which makes it hard for
+                  users to predict what will happen.  4. The fields are both imprecise
+                  and overly precise.  Kind is not a precise mapping to a URL. This
+                  can produce ambiguity     during interpretation and require a REST
+                  mapping.  In most cases, the dependency is on the group,resource
+                  tuple     and the version of the actual struct is irrelevant.  5.
+                  We cannot easily change it.  Because this type is embedded in many
+                  locations, updates to this type     will affect numerous schemas.  Don''t
+                  make new APIs embed an underspecified API type they do not control.
+                  Instead of using this type, create a locally provided and used type
+                  that is well-focused on your reference. For example, ServiceReferences
+                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                  .'
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: 'If referring to a piece of an object instead of
+                      an entire object, this string should contain a valid JSON/Go
+                      field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within
+                      a pod, this would take on a value like: "spec.containers{name}"
+                      (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]"
+                      (container with index 2 in this pod). This syntax is chosen
+                      only to have some well-defined way of referencing a part of
+                      an object. TODO: this design is not final and this field is
+                      subject to change in the future.'
+                    type: string
+                  kind:
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                    type: string
+                  namespace:
+                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                    type: string
+                  resourceVersion:
+                    description: 'Specific resourceVersion to which this reference
+                      is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                    type: string
+                  uid:
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                    type: string
+                type: object
+              observedGeneration:
+                format: int64
+                type: integer
+              stepIndex:
+                type: integer
+              steps:
+                items:
+                  description: WorkflowStepStatus record the status of a workflow
+                    step
+                  properties:
+                    message:
+                      description: A human readable message indicating details about
+                        why the workflowStep is in this state.
+                      type: string
+                    name:
+                      type: string
+                    phase:
+                      description: WorkflowStepPhase describes the phase of a workflow
+                        step.
+                      type: string
+                    reason:
+                      description: A brief CamelCase message indicating details about
+                        why the workflowStep is in this state.
+                      type: string
+                    resourceRef:
+                      description: 'ObjectReference contains enough information to
+                        let you inspect or modify the referred object. --- New uses
+                        of this type are discouraged because of difficulty describing
+                        its usage when embedded in APIs.  1. Ignored fields.  It includes
+                        many fields which are not generally honored.  For instance,
+                        ResourceVersion and FieldPath are both very rarely valid in
+                        actual usage.  2. Invalid usage help.  It is impossible to
+                        add specific help for individual usage.  In most embedded
+                        usages, there are particular     restrictions like, "must
+                        refer only to types A and B" or "UID not honored" or "name
+                        must be restricted".     Those cannot be well described when
+                        embedded.  3. Inconsistent validation.  Because the usages
+                        are different, the validation rules are different by usage,
+                        which makes it hard for users to predict what will happen.  4.
+                        The fields are both imprecise and overly precise.  Kind is
+                        not a precise mapping to a URL. This can produce ambiguity     during
+                        interpretation and require a REST mapping.  In most cases,
+                        the dependency is on the group,resource tuple     and the
+                        version of the actual struct is irrelevant.  5. We cannot
+                        easily change it.  Because this type is embedded in many locations,
+                        updates to this type     will affect numerous schemas.  Don''t
+                        make new APIs embed an underspecified API type they do not
+                        control. Instead of using this type, create a locally provided
+                        and used type that is well-focused on your reference. For
+                        example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                        .'
+                      properties:
+                        apiVersion:
+                          description: API version of the referent.
+                          type: string
+                        fieldPath:
+                          description: 'If referring to a piece of an object instead
+                            of an entire object, this string should contain a valid
+                            JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                            For example, if the object reference is to a container
+                            within a pod, this would take on a value like: "spec.containers{name}"
+                            (where "name" refers to the name of the container that
+                            triggered the event) or if no container name is specified
+                            "spec.containers[2]" (container with index 2 in this pod).
+                            This syntax is chosen only to have some well-defined way
+                            of referencing a part of an object. TODO: this design
+                            is not final and this field is subject to change in the
+                            future.'
+                          type: string
+                        kind:
+                          description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          type: string
+                        namespace:
+                          description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                          type: string
+                        resourceVersion:
+                          description: 'Specific resourceVersion to which this reference
+                            is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                          type: string
+                        uid:
+                          description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                          type: string
+                      type: object
+                    type:
+                      type: string
+                  type: object
+                type: array
+              suspend:
+                type: boolean
+              terminated:
+                type: boolean
+            required:
+            - contextBackend
+            - suspend
+            - terminated
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: Workflow defines workflow steps and other attributes
+        properties:
+          steps:
+            items:
+              description: WorkflowStep defines how to execute a workflow step.
+              properties:
+                inputs:
+                  description: StepInputs defines variable input of WorkflowStep
+                  items:
+                    properties:
+                      from:
+                        type: string
+                      parameterKey:
+                        type: string
+                    required:
+                    - from
+                    - parameterKey
+                    type: object
+                  type: array
+                name:
+                  description: Name is the unique name of the workflow step.
+                  type: string
+                outputs:
+                  description: StepOutputs defines output variable of WorkflowStep
+                  items:
+                    properties:
+                      name:
+                        type: string
+                      valueFrom:
+                        type: string
+                    required:
+                    - name
+                    - valueFrom
+                    type: object
+                  type: array
+                properties:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type:
+                  type: string
+              required:
+              - name
+              - type
+              type: object
+            type: array
+        type: object
+    served: true
+    storage: false
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workflowstepdefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workloaddefinitions.core.oam.dev
 spec:
   group: core.oam.dev

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

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: rollouts.standard.oam.dev
 spec:
   group: standard.oam.dev

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

@@ -1,540 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: rollouttraits.standard.oam.dev
-spec:
-  group: standard.oam.dev
-  names:
-    categories:
-    - oam
-    kind: RolloutTrait
-    listKind: RolloutTraitList
-    plural: rollouttraits
-    singular: rollouttrait
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: RolloutTrait is the Schema for the RolloutTrait API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: RolloutTraitSpec defines the desired state of RolloutTrait
-            properties:
-              rolloutPlan:
-                description: RolloutPlan is the details on how to rollout the resources
-                properties:
-                  batchPartition:
-                    description: All pods in the batches up to the batchPartition
-                      (included) will have the target resource specification while
-                      the rest still have the source resource This is designed for
-                      the operators to manually rollout Default is the the number
-                      of batches which will rollout all the batches
-                    format: int32
-                    type: integer
-                  canaryMetric:
-                    description: CanaryMetric provides a way for the rollout process
-                      to automatically check certain metrics before complete the process
-                    items:
-                      description: CanaryMetric holds the reference to metrics used
-                        for canary analysis
-                      properties:
-                        interval:
-                          description: Interval represents the windows size
-                          type: string
-                        metricsRange:
-                          description: Range value accepted for this metric
-                          properties:
-                            max:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Maximum value
-                              x-kubernetes-int-or-string: true
-                            min:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Minimum value
-                              x-kubernetes-int-or-string: true
-                          type: object
-                        name:
-                          description: Name of the metric
-                          type: string
-                        templateRef:
-                          description: TemplateRef references a metric template object
-                          properties:
-                            apiVersion:
-                              description: API version of the referent.
-                              type: string
-                            fieldPath:
-                              description: 'If referring to a piece of an object instead
-                                of an entire object, this string should contain a
-                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
-                                For example, if the object reference is to a container
-                                within a pod, this would take on a value like: "spec.containers{name}"
-                                (where "name" refers to the name of the container
-                                that triggered the event) or if no container name
-                                is specified "spec.containers[2]" (container with
-                                index 2 in this pod). This syntax is chosen only to
-                                have some well-defined way of referencing a part of
-                                an object. TODO: this design is not final and this
-                                field is subject to change in the future.'
-                              type: string
-                            kind:
-                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                            namespace:
-                              description: 'Namespace of the referent. More info:
-                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                              type: string
-                            resourceVersion:
-                              description: 'Specific resourceVersion to which this
-                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                              type: string
-                            uid:
-                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                              type: string
-                          type: object
-                      required:
-                      - name
-                      type: object
-                    type: array
-                  numBatches:
-                    description: The number of batches, default = 1
-                    format: int32
-                    type: integer
-                  paused:
-                    description: Paused the rollout, default is false
-                    type: boolean
-                  rolloutBatches:
-                    description: The exact distribution among batches. its size has
-                      to be exactly the same as the NumBatches (if set) The total
-                      number cannot exceed the targetSize or the size of the source
-                      resource We will IGNORE the last batch's replica field if it's
-                      a percentage since round errors can lead to inaccurate sum We
-                      highly recommend to leave the last batch's replica field empty
-                    items:
-                      description: RolloutBatch is used to describe how the each batch
-                        rollout should be
-                      properties:
-                        batchRolloutWebhooks:
-                          description: RolloutWebhooks provides a way for the batch
-                            rollout to interact with an external process
-                          items:
-                            description: RolloutWebhook holds the reference to external
-                              checks used for canary analysis
-                            properties:
-                              expectedStatus:
-                                description: ExpectedStatus contains all the expected
-                                  http status code that we will accept as success
-                                items:
-                                  type: integer
-                                type: array
-                              metadata:
-                                additionalProperties:
-                                  type: string
-                                description: Metadata (key-value pairs) for this webhook
-                                type: object
-                              method:
-                                description: Method the HTTP call method, default
-                                  is POST
-                                type: string
-                              name:
-                                description: Name of this webhook
-                                type: string
-                              type:
-                                description: Type of this webhook
-                                type: string
-                              url:
-                                description: URL address of this webhook
-                                type: string
-                            required:
-                            - name
-                            - type
-                            - url
-                            type: object
-                          type: array
-                        canaryMetric:
-                          description: CanaryMetric provides a way for the batch rollout
-                            process to automatically check certain metrics before
-                            moving to the next batch
-                          items:
-                            description: CanaryMetric holds the reference to metrics
-                              used for canary analysis
-                            properties:
-                              interval:
-                                description: Interval represents the windows size
-                                type: string
-                              metricsRange:
-                                description: Range value accepted for this metric
-                                properties:
-                                  max:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Maximum value
-                                    x-kubernetes-int-or-string: true
-                                  min:
-                                    anyOf:
-                                    - type: integer
-                                    - type: string
-                                    description: Minimum value
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              name:
-                                description: Name of the metric
-                                type: string
-                              templateRef:
-                                description: TemplateRef references a metric template
-                                  object
-                                properties:
-                                  apiVersion:
-                                    description: API version of the referent.
-                                    type: string
-                                  fieldPath:
-                                    description: 'If referring to a piece of an object
-                                      instead of an entire object, this string should
-                                      contain a valid JSON/Go field access statement,
-                                      such as desiredState.manifest.containers[2].
-                                      For example, if the object reference is to a
-                                      container within a pod, this would take on a
-                                      value like: "spec.containers{name}" (where "name"
-                                      refers to the name of the container that triggered
-                                      the event) or if no container name is specified
-                                      "spec.containers[2]" (container with index 2
-                                      in this pod). This syntax is chosen only to
-                                      have some well-defined way of referencing a
-                                      part of an object. TODO: this design is not
-                                      final and this field is subject to change in
-                                      the future.'
-                                    type: string
-                                  kind:
-                                    description: 'Kind of the referent. More info:
-                                      https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                  name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                  namespace:
-                                    description: 'Namespace of the referent. More
-                                      info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                                    type: string
-                                  resourceVersion:
-                                    description: 'Specific resourceVersion to which
-                                      this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                                    type: string
-                                  uid:
-                                    description: 'UID of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                                    type: string
-                                type: object
-                            required:
-                            - name
-                            type: object
-                          type: array
-                        instanceInterval:
-                          description: The wait time, in seconds, between instances
-                            upgrades, default = 0
-                          format: int32
-                          type: integer
-                        maxUnavailable:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: MaxUnavailable is the max allowed number of
-                            pods that is unavailable during the upgrade. We will mark
-                            the batch as ready as long as there are less or equal
-                            number of pods unavailable than this number. default =
-                            0
-                          x-kubernetes-int-or-string: true
-                        podList:
-                          description: The list of Pods to get upgraded it is mutually
-                            exclusive with the Replicas field
-                          items:
-                            type: string
-                          type: array
-                        replicas:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          description: 'Replicas is the number of pods to upgrade
-                            in this batch it can be an absolute number (ex: 5) or
-                            a percentage of total pods we will ignore the percentage
-                            of the last batch to just fill the gap it is mutually
-                            exclusive with the PodList field'
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    type: array
-                  rolloutStrategy:
-                    description: RolloutStrategy defines strategies for the rollout
-                      plan The default is IncreaseFirstRolloutStrategyType
-                    type: string
-                  rolloutWebhooks:
-                    description: RolloutWebhooks provide a way for the rollout to
-                      interact with an external process
-                    items:
-                      description: RolloutWebhook holds the reference to external
-                        checks used for canary analysis
-                      properties:
-                        expectedStatus:
-                          description: ExpectedStatus contains all the expected http
-                            status code that we will accept as success
-                          items:
-                            type: integer
-                          type: array
-                        metadata:
-                          additionalProperties:
-                            type: string
-                          description: Metadata (key-value pairs) for this webhook
-                          type: object
-                        method:
-                          description: Method the HTTP call method, default is POST
-                          type: string
-                        name:
-                          description: Name of this webhook
-                          type: string
-                        type:
-                          description: Type of this webhook
-                          type: string
-                        url:
-                          description: URL address of this webhook
-                          type: string
-                      required:
-                      - name
-                      - type
-                      - url
-                      type: object
-                    type: array
-                  targetSize:
-                    description: The size of the target resource. The default is the
-                      same as the size of the source resource.
-                    format: int32
-                    type: integer
-                type: object
-              sourceRef:
-                description: SourceRef references the list of resources that contains
-                  the older version of the software. We assume that it's the first
-                  time to deploy when we cannot find any source.
-                items:
-                  description: 'ObjectReference contains enough information to let
-                    you inspect or modify the referred object. --- New uses of this
-                    type are discouraged because of difficulty describing its usage
-                    when embedded in APIs.  1. Ignored fields.  It includes many fields
-                    which are not generally honored.  For instance, ResourceVersion
-                    and FieldPath are both very rarely valid in actual usage.  2.
-                    Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
-                  properties:
-                    apiVersion:
-                      description: API version of the referent.
-                      type: string
-                    fieldPath:
-                      description: 'If referring to a piece of an object instead of
-                        an entire object, this string should contain a valid JSON/Go
-                        field access statement, such as desiredState.manifest.containers[2].
-                        For example, if the object reference is to a container within
-                        a pod, this would take on a value like: "spec.containers{name}"
-                        (where "name" refers to the name of the container that triggered
-                        the event) or if no container name is specified "spec.containers[2]"
-                        (container with index 2 in this pod). This syntax is chosen
-                        only to have some well-defined way of referencing a part of
-                        an object. TODO: this design is not final and this field is
-                        subject to change in the future.'
-                      type: string
-                    kind:
-                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                      type: string
-                    name:
-                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                      type: string
-                    namespace:
-                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                      type: string
-                    resourceVersion:
-                      description: 'Specific resourceVersion to which this reference
-                        is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                      type: string
-                    uid:
-                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                      type: string
-                  type: object
-                type: array
-              targetRef:
-                description: TargetRef references a target resource that contains
-                  the newer version of the software. We assumed that new resource
-                  already exists. This is the only resource we work on if the resource
-                  is a stateful resource (cloneset/statefulset)
-                properties:
-                  apiVersion:
-                    description: API version of the referent.
-                    type: string
-                  fieldPath:
-                    description: 'If referring to a piece of an object instead of
-                      an entire object, this string should contain a valid JSON/Go
-                      field access statement, such as desiredState.manifest.containers[2].
-                      For example, if the object reference is to a container within
-                      a pod, this would take on a value like: "spec.containers{name}"
-                      (where "name" refers to the name of the container that triggered
-                      the event) or if no container name is specified "spec.containers[2]"
-                      (container with index 2 in this pod). This syntax is chosen
-                      only to have some well-defined way of referencing a part of
-                      an object. TODO: this design is not final and this field is
-                      subject to change in the future.'
-                    type: string
-                  kind:
-                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  name:
-                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                    type: string
-                  namespace:
-                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                    type: string
-                  resourceVersion:
-                    description: 'Specific resourceVersion to which this reference
-                      is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                    type: string
-                  uid:
-                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                    type: string
-                type: object
-            required:
-            - rolloutPlan
-            - targetRef
-            type: object
-          status:
-            description: RolloutStatus defines the observed state of a rollout plan
-            properties:
-              batchRollingState:
-                description: BatchRollingState only meaningful when the Status is
-                  rolling
-                type: string
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              currentBatch:
-                description: The current batch the rollout is working on/blocked it
-                  starts from 0
-                format: int32
-                type: integer
-              lastAppliedPodTemplateIdentifier:
-                description: lastAppliedPodTemplateIdentifier is a string that uniquely
-                  represent the last pod template each workload type could use different
-                  ways to identify that so we cannot compare between resources We
-                  update this field only after a successful rollout
-                type: string
-              rollingState:
-                description: RollingState is the Rollout State
-                type: string
-              rolloutOriginalSize:
-                description: RolloutTargetSize is the size of the target resources.
-                  This is determined once the initial spec verification and does not
-                  change until the rollout is restarted
-                format: int32
-                type: integer
-              rolloutTargetSize:
-                description: RolloutTargetSize is the size of the target resources.
-                  This is determined once the initial spec verification and does not
-                  change until the rollout is restarted
-                format: int32
-                type: integer
-              targetGeneration:
-                description: NewPodTemplateIdentifier is a string that uniquely represent
-                  the new pod template each workload type could use different ways
-                  to identify that so we cannot compare between resources
-                type: string
-              upgradedReadyReplicas:
-                description: UpgradedReadyReplicas is the number of Pods upgraded
-                  by the rollout controller that have a Ready Condition.
-                format: int32
-                type: integer
-              upgradedReplicas:
-                description: UpgradedReplicas is the number of Pods upgraded by the
-                  rollout controller
-                format: int32
-                type: integer
-            required:
-            - currentBatch
-            - rollingState
-            - upgradedReadyReplicas
-            - upgradedReplicas
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/vela-core/templates/_helpers.tpl

@@ -51,6 +51,16 @@ app.kubernetes.io/name: {{ include "kubevela.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
+{{- define "kubevela-apiserver.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubevela.name" . }}-apiserver
+app.kubernetes.io/instance: {{ .Release.Name }}-apiserver
+{{- end -}}
+
+{{- define "kubevela-cluster-gateway.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubevela.name" . }}-cluster-gateway
+app.kubernetes.io/instance: {{ .Release.Name }}-cluster-gateway
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

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

@@ -0,0 +1,43 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Initializer
+metadata:
+  annotations:
+    addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
+      Terraform.
+    helm.sh/hook: post-install, post-upgrade, pre-delete
+  name: terraform
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  appTemplate:
+    spec:
+      components:
+      - name: terraform-controller
+        properties:
+          chart: terraform-controller
+          repoType: helm
+          url: https://charts.kubevela.net/addons
+          version: 0.1.19
+        type: helm
+      - name: terraform-system
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: terraform-system
+        type: raw
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+  dependsOn:
+  - ref:
+      apiVersion: core.oam.dev/v1beta1
+      kind: Initializer
+      name: fluxcd
+      namespace: vela-system
+status:
+  observedGeneration: 0

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

@@ -5963,7 +5963,10 @@ data:
                       +usage=Chart version\n\tversion: *\"*\" | string\n\t// +usage=The
                       namespace for helm chart, optional\n\ttargetNamespace?: string\n\t//
                       +usage=The release name\n\treleaseName?: string\n\t// +usage=Chart
-                      values\n\tvalues?: #nestedmap\n}\n\n#nestedmap: {\n\t...\n} \n"
+                      values\n\tvalues?: #nestedmap\n}\n\n#nestedmap: {\n\t...\n}\n"
+                status:
+                  healthPolicy: 'isHealth: len(context.outputs.release.status.conditions)
+                    != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
                 workload:
                   type: autodetects.core.oam.dev
             type: raw
@@ -5982,7 +5985,11 @@ data:
                     template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
                       {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
                       +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
-                      {\n\t\top:     string\n\t\tpath:   string\n\t\tvalue?: string\n\t}\n}\n\n//
+                      [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
+                      | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
+                      +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
+                      source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
+                      opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
                       +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
                       \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
                       \         string\n\tname?:               string\n\tannotationSelector?:
@@ -6025,26 +6032,86 @@ data:
                 schematic:
                   cue:
                     template: "output: {\n\tapiVersion: \"kustomize.toolkit.fluxcd.io/v1beta1\"\n\tkind:
-                      \      \"Kustomization\"\n\tmetadata: {\n\t\tname: context.name\n\t}\n\tspec:
-                      {\n\t\tinterval: parameter.pullInterval\n\t\tsourceRef: {\n\t\t\tif
-                      parameter.repoType == \"git\" {\n\t\t\t\tkind: \"GitRepository\"\n\t\t\t}\n\t\t\tif
+                      \      \"Kustomization\"\n\tmetadata: {\n\t\tname: context.name\n
+                      \   namespace: context.namespace\n\t}\n\tspec: {\n\t\tinterval:
+                      parameter.pullInterval\n\t\tsourceRef: {\n\t\t\tif parameter.repoType
+                      == \"git\" {\n\t\t\t\tkind: \"GitRepository\"\n\t\t\t}\n\t\t\tif
                       parameter.repoType == \"oss\" {\n\t\t\t\tkind: \"Bucket\"\n\t\t\t}\n\t\t\tname:
                       \     context.name\n\t\t\tnamespace: context.namespace\n\t\t}\n\t\tpath:
                       \      parameter.path\n\t\tprune:      true\n\t\tvalidation: \"client\"\n\t}\n}\n\noutputs:
-                      repo:{\n\tapiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\tmetadata:
-                      {\n\t\tname: context.name\n\t}\n\tif parameter.repoType == \"git\"
-                      {\n\t\tkind: \"GitRepository\"\n\t\tspec: {\n\t\t\turl: parameter.url\n\t\t\tif
-                      parameter.git.branch != _|_ {\n\t\t\t\tref: branch: parameter.git.branch\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
-                      parameter.repoType == \"oss\" {\n\t\tkind: \"Bucket\"\n\t\tspec:
-                      {\n\t\t\tendpoint:   parameter.url\n\t\t\tbucketName: parameter.oss.bucketName\n\t\t\tprovider:
-                      \  parameter.oss.provider\n\t\t\tif parameter.oss.region != _|_
-                      {\n\t\t\t\tregion: parameter.oss.region\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n}\n\n_secret:
+                      {\n  repo: {\n\t  apiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\t
+                      \ metadata: {\n\t\t  name: context.name\n      namespace: context.namespace\n\t
+                      \ }\n\t  if parameter.repoType == \"git\" {\n\t\t  kind: \"GitRepository\"\n\t\t
+                      \ spec: {\n\t\t\t  url: parameter.url\n\t\t\t  if parameter.git.branch
+                      != _|_ {\n\t\t\t\t  ref: branch: parameter.git.branch\n\t\t\t  }\n\t\t\t
+                      \ _secret\n\t\t\t  _sourceCommonArgs\n\t\t  }\n\t  }\n\t  if parameter.repoType
+                      == \"oss\" {\n\t\t  kind: \"Bucket\"\n\t\t  spec: {\n\t\t\t  endpoint:
+                      \  parameter.url\n\t\t\t  bucketName: parameter.oss.bucketName\n\t\t\t
+                      \ provider:   parameter.oss.provider\n\t\t\t  if parameter.oss.region
+                      != _|_ {\n\t\t\t\t  region: parameter.oss.region\n\t\t\t  }\n\t\t\t
+                      \ _secret\n\t\t\t  _sourceCommonArgs\n\t\t  }\n\t  }\n  }\n\n  if
+                      parameter.imageRepository != _|_ {\n    imageRepo: {\n      apiVersion:
+                      \"image.toolkit.fluxcd.io/v1beta1\"\n      kind: \"ImageRepository\"\n\t
+                      \   metadata: {\n\t\t    name: context.name\n        namespace:
+                      context.namespace\n\t    }\n      spec: {\n        image: parameter.imageRepository.image\n
+                      \       interval: parameter.pullInterval\n        if parameter.imageRepository.secretRef
+                      != _|_ {\n          secretRef: name: parameter.imageRepository.secretRef\n
+                      \       }\n      }\n    }\n\n    imagePolicy: {\n      apiVersion:
+                      \"image.toolkit.fluxcd.io/v1beta1\"\n      kind: \"ImagePolicy\"\n\t
+                      \   metadata: {\n\t\t    name: context.name\n        namespace:
+                      context.namespace\n\t    }\n      spec: {\n        imageRepositoryRef:
+                      name: context.name\n        policy: parameter.imageRepository.policy\n
+                      \       if parameter.imageRepository.filterTags != _|_ {\n          filterTags:
+                      parameter.imageRepository.filterTags\n        }\n      }\n    }\n\n
+                      \   imageUpdate: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
+                      \     kind: \"ImageUpdateAutomation\"\n\t    metadata: {\n\t\t    name:
+                      context.name\n        namespace: context.namespace\n\t    }\n      spec:
+                      {\n        interval: parameter.pullInterval\n        sourceRef:
+                      {\n          kind: \"GitRepository\"\n          name: context.name\n
+                      \       }\n        git: {\n          checkout: ref: branch: parameter.git.branch\n
+                      \         commit: {\n            author: {\n              email:
+                      \"kubevelabot@users.noreply.github.com\"\n              name: \"kubevelabot\"\n
+                      \           }\n            if parameter.imageRepository.commitMessage
+                      != _|_ {\n              messageTemplate: \"Update image automatically.\\n\"
+                      + parameter.imageRepository.commitMessage\n            }\n            if
+                      parameter.imageRepository.commitMessage == _|_ {\n              messageTemplate:
+                      \"Update image automatically.\"\n            }\n          }\n          push:
+                      branch: parameter.git.branch\n        }\n        update: {\n          path:\tparameter.path\n
+                      \         strategy: \"Setters\"\n        }\n      }\n    }\n  }\n}\n\n_secret:
                       {\n\tif parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname:
                       parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs: {\n\tinterval:
                       parameter.pullInterval\n\tif parameter.timeout != _|_ {\n\t\ttimeout:
                       parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType: *\"git\"
-                      | \"oss\"\n\t// +usage=The interval at which to check for repository/bucket
-                      and relese updates, default to 5m\n\tpullInterval: *\"5m\" | string\n\t//
+                      | \"oss\"\n  // +usage=The image repository for automatically update
+                      image to git\n  imageRepository?: {\n    // +usage=The image url\n
+                      \   image: string\n    // +usage=The name of the secret containing
+                      authentication credentials\n    secretRef?: string\n    // +usage=Policy
+                      gives the particulars of the policy to be followed in selecting
+                      the most recent image.\n    policy: {\n      // +usage=Alphabetical
+                      set of rules to use for alphabetical ordering of the tags.\n      alphabetical?:
+                      {\n        // +usage=Order specifies the sorting order of the tags.\n
+                      \       // +usage=Given the letters of the alphabet as tags, ascending
+                      order would select Z, and descending order would select A.\n        order?:
+                      \"asc\" | \"desc\"\n      }\n      // +usage=Numerical set of rules
+                      to use for numerical ordering of the tags.\n      numerical?: {\n
+                      \       // +usage=Order specifies the sorting order of the tags.\n
+                      \       // +usage=Given the integer values from 0 to 9 as tags,
+                      ascending order would select 9, and descending order would select
+                      0.\n        order: \"asc\" | \"desc\"\n      }\n      // +usage=SemVer
+                      gives a semantic version range to check against the tags available.\n
+                      \     semver?: {\n        // +usage=Range gives a semver range for
+                      the image tag; the highest version within the range that's a tag
+                      yields the latest image.\n        range: string\n      }\n    }\n
+                      \   // +usage=FilterTags enables filtering for only a subset of
+                      tags based on a set of rules. If no rules are provided, all the
+                      tags from the repository will be ordered and compared.\n    filterTags?:
+                      {\n      // +usage=Extract allows a capture group to be extracted
+                      from the specified regular expression pattern, useful before tag
+                      evaluation.\n      extract?: string\n      // +usage=Pattern specifies
+                      a regular expression pattern used to filter for image tags.\n      pattern?:
+                      string\n    }\n    // +usage=The image url\n    commitMessage?:
+                      string\n  }\n\t// +usage=The interval at which to check for repository/bucket
+                      and release updates, default to 5m\n\tpullInterval: *\"5m\" | string\n\t//
                       +usage=The Git or Helm repository URL, OSS endpoint, accept HTTP/S
                       or SSH address as git url,\n\turl: string\n\t// +usage=The name
                       of the secret containing authentication credentials\n\tsecretRef?:
@@ -6101,6 +6168,7 @@ metadata:
   annotations:
     addons.oam.dev/description: Flux is a set of continuous and progressive delivery
       solutions for Kubernetes
+    addons.oam.dev/name: fluxcd
   labels:
     addons.oam.dev/type: fluxcd
   name: fluxcd

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

@@ -0,0 +1,186 @@
+apiVersion: v1
+data:
+  initializer: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Initializer
+    metadata:
+      annotations:
+        addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
+          traffic.
+      name: istio
+      namespace: istio-system
+    spec:
+      appTemplate:
+        spec:
+          components:
+          - name: istio
+            properties:
+              chart: istio
+              repoType: helm
+              url: https://getindata.github.io/helm-charts/
+              version: 1.11.1
+            type: helm
+          - name: canary-rollout
+            properties:
+              apiVersion: core.oam.dev/v1beta1
+              kind: WorkflowStepDefinition
+              metadata:
+                name: canary-rollout
+                namespace: vela-system
+              spec:
+                schematic:
+                  cue:
+                    template: |-
+                      import ("vela/op")
+
+                      parameter: {
+                              batchPartition: int
+                              traffic: weightedTargets: [...{
+                                      revision: string
+                                      weight:   int
+                              }]
+                      }
+
+                      comps__: op.#Load
+                      compNames__: [ for name, c in comps__.value {name}]
+                      comp__: compNames__[0]
+
+                      apply: op.#ApplyComponent & {
+                              value: comps__.value[comp__]
+                              patch: {
+                                      traits: "rollout": {
+                                             spec: rolloutPlan: batchPartition: parameter.batchPartition
+                                      }
+
+                                      traits: "virtualService": {
+                                              spec:
+                                                 // +patchStrategy=retainKeys
+                                                 http: [
+                                                      {
+                                                              route: [
+                                                                      for i, t in parameter.traffic.weightedTargets {
+                                                                              destination: {
+                                                                                      host:   comp__
+                                                                                      subset: t.revision
+                                                                              }
+                                                                              weight: t.weight
+                                                                      }]
+                                                      },
+                                              ]
+                                      }
+
+                                      traits: "destinationRule": {
+                                               // +patchStrategy=retainKeys
+                                               spec: {
+                                                 host: comp__
+                                                 subsets: [
+                                                      for i, t in parameter.traffic.weightedTargets {
+                                                              name: t.revision
+                                                              labels: {"app.oam.dev/revision": t.revision}
+                                                      },
+                                              ]}
+                                      }
+                              }
+                      }
+
+                      applyRemaining: op.#ApplyRemaining & {
+                          exceptions: [comp__]
+                      }
+            type: raw
+          - name: istio-gateway
+            properties:
+              apiVersion: core.oam.dev/v1beta1
+              kind: TraitDefinition
+              metadata:
+                annotations:
+                  definition.oam.dev/description: use istio to manage in-cluster traffic
+                name: istio-gateway
+                namespace: vela-system
+              spec:
+                appliesToWorkloads:
+                - deployments.apps
+                podDisruptive: true
+                schematic:
+                  cue:
+                    template: "\noutputs: gateway: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
+                      \   kind: \"Gateway\"\n    metadata: {\n        name:      context.name\n
+                      \       namespace: context.namespace\n    }\n    spec: {\n      selector:
+                      {\n        istio: parameter.gateway\n      }\n      servers: [{\n
+                      \        hosts: parameter.hosts\n         port: {\n              name:
+                      \"http\"\n              number: 80\n              protocol: \"HTTP\"\n
+                      \        }\n      }]\n    }\n}\n\noutputs: virtualService: {\n    apiVersion:
+                      \"networking.istio.io/v1alpha3\"\n    kind: \"VirtualService\"\n
+                      \   metadata: {\n         name:      context.name\n         namespace:
+                      context.namespace\n    }\n    spec: {\n       gateways: [context.name]\n
+                      \      hosts: parameter.hosts\n       http:[{\n       match: [ for
+                      i, u in parameter.match { uri: u} ]\n       route: [{destination:
+                      {\n           host: context.name\n           port: number: parameter.port\n
+                      \      }}]\n       }]\n    }\n}\n\nparameter: {\n    hosts: [string]\n
+                      \   gateway: *\"ingressgateway\"|string\n    match: [...#uri]\n
+                      \   port: int\n}\n\n#uri: {\n   exact?: string\n   prefix?: string\n}
+                      \n"
+            type: raw
+          - name: canary-traffic
+            properties:
+              apiVersion: core.oam.dev/v1beta1
+              kind: TraitDefinition
+              metadata:
+                annotations:
+                  definition.oam.dev/description: use istio to manage traffic
+                name: canary-traffic
+                namespace: vela-system
+              spec:
+                appliesToWorkloads:
+                - deployments.apps
+                podDisruptive: true
+                schematic:
+                  cue:
+                    template: "outputs: service: {\n\t\tapiVersion: \"v1\"\n\t\tkind:
+                      \      \"Service\"\n\t\tmetadata: name: context.name\n\t\tspec:
+                      {\n\t\t\tselector: \"app.oam.dev/component\": context.name\n\t\t\tports:
+                      [\n\t\t\t\tfor p in parameter.port {\n\t\t\t\t\tport:       p\n\t\t\t\t\ttargetPort:
+                      p\n\t\t\t\t},\n\t\t\t]\n\t\t\ttype: \"ClusterIP\"\n\t\t}\n}\n\noutputs:
+                      virtualService: {\n    apiVersion: \"networking.istio.io/v1alpha3\"\n
+                      \   kind: \"VirtualService\"\n    metadata: {\n        name:      context.name\n
+                      \       namespace: context.namespace\n    }\n    spec: {\n       hosts:
+                      [context.name]\n       http: [{route: [\n       {destination: {\n
+                      \         host: context.name\n          port: {number: parameter.port[0]}\n
+                      \      }}]}]\n    }\n}\n\noutputs: destinationRule: {\n       apiVersion:
+                      \"networking.istio.io/v1alpha3\"\n       kind: \"DestinationRule\"\n
+                      \      metadata: {\n           name:      context.name\n           namespace:
+                      context.namespace\n       }\n       spec: {\n          host: context.name\n
+                      \         subsets: [{\n             name: context.revision\n             labels:
+                      {\"app.oam.dev/revision\": context.revision}\n          }]\n       }\n}\n\nparameter:
+                      {\n   port: [int]\n} \n"
+            type: raw
+        status:
+          rollout:
+            batchRollingState: ""
+            currentBatch: 0
+            lastTargetAppRevision: ""
+            rollingState: ""
+            upgradedReadyReplicas: 0
+            upgradedReplicas: 0
+      dependsOn:
+      - ref:
+          apiVersion: core.oam.dev/v1beta1
+          kind: Initializer
+          name: fluxcd
+          namespace: vela-system
+      - ref:
+          apiVersion: core.oam.dev/v1beta1
+          kind: Initializer
+          name: ns-istio-system
+          namespace: vela-system
+    status:
+      observedGeneration: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: istio Controller is a Kubernetes Controller for manage
+      traffic.
+    addons.oam.dev/name: istio
+  labels:
+    addons.oam.dev/type: istio
+  name: istio
+  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -38,6 +38,7 @@ kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
+    addons.oam.dev/name: keda
   labels:
     addons.oam.dev/type: keda
   name: keda

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

@@ -23,7 +23,7 @@ data:
               values:
                 featureGates: PreDownloadImageForInPlaceUpdate=true
             type: helm
-          - name: cloneset-service
+          - name: cloneset
             properties:
               apiVersion: core.oam.dev/v1beta1
               kind: ComponentDefinition
@@ -33,7 +33,7 @@ data:
                     services that have a stable network endpoint to receive external network
                     traffic from customers. If workload type is skipped for any service
                     defined in Appfile, it will be defaulted to `webservice` type.
-                name: cloneset-service
+                name: cloneset
                 namespace: vela-system
               spec:
                 schematic:
@@ -58,14 +58,14 @@ data:
                       \  parameter.memory\n\t\t\t\t\t\t\trequests: memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
                       parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe:
                       parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"readinessProbe\"]
-                      != _|_ {\n\t\t\t\t\t\treadinessProbe: parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                      parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\t\timagePullSecrets:
-                      [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle:
+                      != _|_ {\n\t\t\t\t\t\treadinessProbe: parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle:
                       {\n\t\t\t\t\t\tif parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart:
                       exec: command: parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif
                       parameter.preStop != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command:
                       parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
-                      parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
+                      parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
+                      parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+                      [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
                       parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
                       parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter:
                       {\n\t// +usage=Which image would you like to use for your service\n\t//
@@ -191,6 +191,7 @@ metadata:
   annotations:
     addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
       automations
+    addons.oam.dev/name: kruise
   labels:
     addons.oam.dev/type: kruise
   name: kruise

charts/vela-core/templates/addons/ns-flux-system.yaml

@@ -33,6 +33,7 @@ kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: Create namespace for flux-system
+    addons.oam.dev/name: ns-flux-system
   labels:
     addons.oam.dev/type: ns-flux-system
   name: ns-flux-system

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

@@ -0,0 +1,40 @@
+apiVersion: v1
+data:
+  initializer: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Initializer
+    metadata:
+      annotations:
+        addons.oam.dev/description: Create namespace for istio-system
+      name: ns-istio-system
+      namespace: vela-system
+    spec:
+      appTemplate:
+        spec:
+          components:
+          - name: istio-system
+            properties:
+              apiVersion: v1
+              kind: Namespace
+              metadata:
+                name: istio-system
+            type: raw
+        status:
+          rollout:
+            batchRollingState: ""
+            currentBatch: 0
+            lastTargetAppRevision: ""
+            rollingState: ""
+            upgradedReadyReplicas: 0
+            upgradedReplicas: 0
+    status:
+      observedGeneration: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Create namespace for istio-system
+    addons.oam.dev/name: ns-istio-system
+  labels:
+    addons.oam.dev/type: ns-istio-system
+  name: ns-istio-system
+  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -121,6 +121,7 @@ kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: Preparations that observability need
+    addons.oam.dev/name: observability-asset
   labels:
     addons.oam.dev/type: observability-asset
   name: observability-asset

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

@@ -45,6 +45,8 @@ data:
                 urls:
                 - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_logging.json
                 - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_monitoring.json
+                - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/flux2/cluster.json
+                - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_application_logging.json
               type: import-grafana-dashboard
             type: helm
           - name: loki
@@ -113,6 +115,14 @@ data:
                   tag: v2.1.0
               version: 3.4.1
             type: helm
+          - name: kube-prometheus-stack
+            properties:
+              chart: kube-prometheus-stack
+              repoType: helm
+              targetNamespace: observability
+              url: https://prometheus-community.github.io/helm-charts
+              version: 18.0.0
+            type: helm
         status:
           rollout:
             batchRollingState: ""
@@ -138,6 +148,7 @@ kind: ConfigMap
 metadata:
   annotations:
     addons.oam.dev/description: An out of the box solution for KubeVela observability
+    addons.oam.dev/name: observability
   labels:
     addons.oam.dev/type: observability
   name: observability

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

@@ -517,6 +517,7 @@ metadata:
   annotations:
     addons.oam.dev/description: ocm-cluster-manager can deploy an OCM hub cluster
       environment.
+    addons.oam.dev/name: ocm-cluster-manager
   labels:
     addons.oam.dev/type: ocm-cluster-manager
   name: ocm-cluster-manager

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

@@ -40,6 +40,7 @@ metadata:
   annotations:
     addons.oam.dev/description: Prometheus is an open-source systems monitoring and
       alerting toolkit
+    addons.oam.dev/name: prometheus
   labels:
     addons.oam.dev/type: prometheus
   name: prometheus

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

@@ -0,0 +1,65 @@
+apiVersion: v1
+data:
+  initializer: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Initializer
+    metadata:
+      annotations:
+        addons.oam.dev/description: terraform provider (alibaba)
+        addons.oam.dev/name: terraform/provider-alibaba
+      name: terraform-provider-alibaba
+      namespace: default
+    spec:
+      appTemplate:
+        spec:
+          components:
+          - name: alibaba-account-creds
+            properties:
+              apiVersion: v1
+              kind: Secret
+              metadata:
+                name: alibaba-provider-secret
+                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: default
+            properties:
+              apiVersion: terraform.core.oam.dev/v1beta1
+              kind: Provider
+              metadata:
+                name: default
+                namespace: default
+              spec:
+                credentials:
+                  secretRef:
+                    key: credentials
+                    name: alibaba-account-creds
+                    namespace: vela-system
+                  source: Secret
+                provider: alibaba
+                region: '[[ index .Args "ALICLOUD_REGION" ]]'
+            type: raw
+        status:
+          rollout:
+            batchRollingState: ""
+            currentBatch: 0
+            lastTargetAppRevision: ""
+            rollingState: ""
+            upgradedReadyReplicas: 0
+            upgradedReplicas: 0
+    status:
+      observedGeneration: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: terraform provider (alibaba)
+    addons.oam.dev/name: terraform/provider-alibaba
+  labels:
+    addons.oam.dev/type: terraform-provider-alibaba
+  name: terraform-provider-alibaba
+  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -15,9 +15,10 @@ data:
           components:
           - name: terraform-controller
             properties:
-              chart: ./chart
-              repoType: git
-              url: https://github.com/oam-dev/terraform-controller
+              chart: terraform-controller
+              repoType: helm
+              url: https://charts.kubevela.net/addons
+              version: 0.1.19
             type: helm
           - name: terraform-system
             properties:
@@ -26,276 +27,6 @@ data:
               metadata:
                 name: terraform-system
             type: raw
-          - name: alibaba-ack
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud ACK cluster
-                  type: terraform
-                name: alibaba-ack
-                namespace: vela-system
-              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
-                      }
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: alibaba-oss
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud OSS object
-                  type: terraform
-                name: alibaba-oss
-              spec:
-                schematic:
-                  terraform:
-                    configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n
-                      \ bucket = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\"
-                      {\n  value = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
-                      \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
-                      \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
-                      ACL, supported 'private', 'public-read', 'public-read-write'\"\n
-                      \ default = \"private\"\n  type = string\n} \n"
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: alibaba-rds
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud RDS object
-                  type: terraform
-                name: alibaba-rds
-              spec:
-                schematic:
-                  terraform:
-                    configuration: "module \"rds\" {\n  source = \"terraform-alicloud-modules/rds/alicloud\"\n
-                      \ engine = \"MySQL\"\n  engine_version = \"8.0\"\n  instance_type
-                      = \"rds.mysql.c1.large\"\n  instance_storage = \"20\"\n  instance_name
-                      = var.instance_name\n  account_name = var.account_name\n  password
-                      = var.password\n}\noutput \"DB_NAME\" {\n  value = module.rds.this_db_instance_name\n}\noutput
-                      \"DB_USER\" {\n  value = module.rds.this_db_database_account\n}\noutput
-                      \"DB_PORT\" {\n  value = module.rds.this_db_instance_port\n}\noutput
-                      \"DB_HOST\" {\n  value = module.rds.this_db_instance_connection_string\n}\noutput
-                      \"DB_PASSWORD\" {\n  value = module.rds.this_db_instance_port\n}\nvariable
-                      \"instance_name\" {\n  description = \"RDS instance name\"\n  type
-                      = string\n  default = \"poc\"\n}\nvariable \"account_name\" {\n
-                      \ description = \"RDS instance user account name\"\n  type = string\n
-                      \ default = \"oam\"\n}\nvariable \"password\" {\n  description =
-                      \"RDS instance account password\"\n  type = string\n  default =
-                      \"Xyfff83jfewGGfaked\"\n} \n"
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
         status:
           rollout:
             batchRollingState: ""
@@ -317,6 +48,7 @@ metadata:
   annotations:
     addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
       Terraform.
+    addons.oam.dev/name: terraform
   labels:
     addons.oam.dev/type: terraform
   name: terraform

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

@@ -0,0 +1,84 @@
+{{ if .Values.multicluster.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-cluster-gateway
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "kubevela.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.multicluster.clusterGateway.replicaCount }}
+  selector:
+    matchLabels:
+    {{- include "kubevela-cluster-gateway.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+      {{- include "kubevela-cluster-gateway.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "kubevela.serviceAccountName" . }}
+      securityContext:
+      {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ include "kubevela.fullname" . }}-cluster-gateway
+          securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+          args:
+            - "apiserver"
+            - "--secure-port={{ .Values.multicluster.clusterGateway.port }}"
+            - "--secret-namespace={{ .Release.Namespace }}"
+            - "--feature-gates=APIPriorityAndFairness=false"
+          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
+          resources:
+          {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
+          ports:
+            - containerPort: {{ .Values.multicluster.clusterGateway.port }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{ end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-cluster-gateway-service
+  namespace: {{ .Release.Namespace }}
+spec:
+  selector:
+  {{- include "kubevela-cluster-gateway.selectorLabels" . | nindent 4 }}
+  ports:
+    - protocol: TCP
+      port: {{ .Values.multicluster.clusterGateway.port }}
+      targetPort: {{ .Values.multicluster.clusterGateway.port }}
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v1alpha1.cluster.core.oam.dev
+  labels:
+    api: cluster-extension-apiserver
+    apiserver: "true"
+spec:
+  version: v1alpha1
+  group: cluster.core.oam.dev
+  groupPriorityMinimum: 2000
+  service:
+    name: {{ .Release.Name }}-cluster-gateway-service
+    namespace: {{ .Release.Namespace }}
+    port: {{ .Values.multicluster.clusterGateway.port }}
+  versionPriority: 10
+  insecureSkipTLSVerify: true

charts/vela-core/templates/definitions/terraform-alibaba-ack.yaml

@@ -2,9 +2,10 @@ apiVersion: core.oam.dev/v1beta1
 kind: ComponentDefinition
 metadata:
   name: alibaba-ack
-  namespace: vela-system
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     definition.oam.dev/description: Terraform configuration for Alibaba Cloud ACK cluster
+  labels:
     type: terraform
 spec:
   workload:

charts/vela-core/templates/definitions/terraform-alibaba-eip.yaml

@@ -0,0 +1,39 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: ComponentDefinition
+metadata:
+  name: alibaba-eip
+  namespace: {{.Values.systemDefinitionNamespace}}
+  annotations:
+    definition.oam.dev/description: Terraform configuration for Alibaba Cloud Elastic IP
+  labels:
+    type: terraform
+spec:
+  workload:
+    definition:
+      apiVersion: terraform.core.oam.dev/v1beta1
+      kind: Configuration
+  schematic:
+    terraform:
+      configuration: |
+        module "eip" {
+          source = "github.com/zzxwill/terraform-alicloud-eip"
+          name = var.name
+          bandwidth = var.bandwidth
+        }
+
+        variable "name" {
+          description = "Name to be used on all resources as prefix. Default to 'TF-Module-EIP'."
+          default = "TF-Module-EIP"
+          type = string
+        }
+
+        variable "bandwidth" {
+          description = "Maximum bandwidth to the elastic public network, measured in Mbps (Mega bit per second)."
+          type = number
+          default = 5
+        }
+
+        output "EIP_ADDRESS" {
+          description = "The elastic ip address."
+          value       = module.eip.this_eip_address.0
+        }

charts/vela-core/templates/definitions/terraform-alibaba-oss.yaml

@@ -2,8 +2,10 @@ apiVersion: core.oam.dev/v1alpha2
 kind: ComponentDefinition
 metadata:
   name: alibaba-oss
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     definition.oam.dev/description: Terraform configuration for Alibaba Cloud OSS object
+  labels:
     type: terraform
 spec:
   workload:

charts/vela-core/templates/definitions/terraform-alibaba-rds.yaml

@@ -2,8 +2,10 @@ apiVersion: core.oam.dev/v1alpha2
 kind: ComponentDefinition
 metadata:
   name: alibaba-rds
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     definition.oam.dev/description: Terraform configuration for Alibaba Cloud RDS object
+  labels:
     type: terraform
 spec:
   workload:
@@ -37,7 +39,7 @@ spec:
           value = module.rds.this_db_instance_connection_string
         }
         output "DB_PASSWORD" {
-          value = module.rds.this_db_instance_port
+          value = var.password
         }
 
         variable "instance_name" {

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

@@ -4,19 +4,26 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add annotations for your Workload.
+    definition.oam.dev/description: Add annotations on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: annotations
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployments.apps
+    - '*'
   podDisruptive: true
   schematic:
     cue:
       template: |
-        patch: spec: template: metadata: annotations: {
-        	for k, v in parameter {
-        		"\(k)": v
+        patch: {
+        	metadata: annotations: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        	spec: template: metadata: annotations: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
         	}
         }
         parameter: [string]: string

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

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

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

@@ -4,12 +4,12 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Create/Attach configmaps to workloads.
+    definition.oam.dev/description: Create/Attach configmaps on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: configmap
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployments.apps
+    - '*'
   podDisruptive: true
   schematic:
     cue:

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

@@ -0,0 +1,65 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/depends-on-app.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: check or install depends-on Application
+  name: depends-on-app
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        	"encoding/yaml"
+        )
+
+        dependsOn: op.#Read & {
+        	value: {
+        		apiVersion: "core.oam.dev/v1beta1"
+        		kind:       "Application"
+        		metadata: {
+        			name:      parameter.name
+        			namespace: parameter.namespace
+        		}
+        	}
+        }
+        load: op.#Steps & {
+        	if dependsOn.err != _|_ {
+        		configMap: op.#Read & {
+        			value: {
+        				apiVersion: "v1"
+        				kind:       "ConfigMap"
+        				metadata: {
+        					name:      parameter.name
+        					namespace: parameter.namespace
+        				}
+        			}
+        		}
+        		apply: op.#Apply & {
+        			value: {
+        				yaml.Unmarshal(configMap.value.data[parameter.name])
+        			}
+        		}
+        	}
+        	if dependsOn.err == _|_ {
+        		apply: op.#Apply & {
+        			value: {
+        				dependsOn.value
+        			}
+        		}
+        	}
+        }
+        phase: load.apply.value.status.status
+        wait:  op.#ConditionalWait & {
+        	continue: phase == "running"
+        }
+        parameter: {
+        	// +usage=Specify the name of the dependent Application
+        	name: string
+        	// +usage=Specify the namespace of the dependent Application
+        	namespace: string
+        }
+

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

@@ -1,11 +1,11 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/multi-env.cue
+# Definition source cue file: vela-templates/definitions/internal/deploy2env.cue
 apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Apply env binding component
-  name: multi-env
+    definition.oam.dev/description: Deploy env binding component to target env
+  name: deploy2env
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   schematic:
@@ -15,16 +15,14 @@ spec:
         	"vela/op"
         )
 
-        component: op.#ApplyEnvBindComponent & {
-        	env:       parameter.env
-        	policy:    parameter.policy
-        	component: parameter.component
+        app: op.#ApplyEnvBindApp & {
+        	env:    parameter.env
+        	policy: parameter.policy
+        	app:    context.name
         	// context.namespace indicates the namespace of the app
         	namespace: context.namespace
         }
         parameter: {
-        	// +usage=Declare the name of the component
-        	component: string
         	// +usage=Declare the name of the policy
         	policy: string
         	// +usage=Declare the name of the env in policy

charts/vela-core/templates/defwithtemplate/env-binding.yaml

@@ -15,7 +15,7 @@ spec:
         	apiVersion: "core.oam.dev/v1alpha1"
         	kind:       "EnvBinding"
         	spec: {
-        		engine: parameter.engine
+        		engine: parameter.clusterManagementEngine
         		appTemplate: {
         			apiVersion: "core.oam.dev/v1beta1"
         			kind:       "Application"
@@ -26,11 +26,9 @@ spec:
         			spec: components: context.components
         		}
         		envs: parameter.envs
-        		if !parameter.created {
-        			outputResourcesTo: {
-        				name:      context.name
-        				namespace: context.namespace
-        			}
+        		outputResourcesTo: {
+        			name:      context.name
+        			namespace: context.namespace
         		}
         	}
         }
@@ -55,10 +53,10 @@ spec:
         			name?: string
         		}
         	}
+        	selector?: components: [...string]
         }
         parameter: {
-        	engine: *"ocm" | string
+        	clusterManagementEngine: *"cluster-gateway" | string
         	envs: [...#Env]
-        	created: *true | bool
         }
 

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

@@ -1,15 +1,15 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/registry/env.cue
+# Definition source cue file: vela-templates/definitions/internal/env.cue
 apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: add env into your pods
+    definition.oam.dev/description: add env on K8s pod for your workload which follows the pod spec in path 'spec.template.'
   name: env
-  namespace: vela-system
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployments.apps
+    - '*'
   schematic:
     cue:
       template: |

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

@@ -0,0 +1,34 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/health.cue
+apiVersion: core.oam.dev/v1beta1
+kind: PolicyDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply periodical health checking to the application.
+  name: health
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  manageHealthCheck: true
+  schematic:
+    cue:
+      template: |
+        output: {
+        	apiVersion: "core.oam.dev/v1alpha2"
+        	kind:       "HealthScope"
+        	spec: {
+        		"probe-timeout":  parameter.probeTimeout
+        		"probe-interval": parameter.probeInterval
+        		appReferences: [{
+        			appName: context.appName
+        		}]
+        		workloadRefs: []
+        		manageHealthCheck: true
+        	}
+        }
+        parameter: {
+        	// +usage=Specify health checking timeout(seconds), default 10s
+        	probeTimeout: *10 | int
+        	// +usage=Specify health checking interval(seconds), default 30s
+        	probeInterval: *30 | int
+        }
+

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

@@ -4,12 +4,12 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add host aliases to workloads.
+    definition.oam.dev/description: Add host aliases on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: hostalias
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployment.apps
+    - '*'
   podDisruptive: false
   schematic:
     cue:

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

@@ -56,7 +56,7 @@ spec:
     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"
+        message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
       if len(igs) > 0 {
         if igs[0].ip != _|_ {

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

@@ -55,7 +55,7 @@ spec:
     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"
+      	message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + "'\n"
       }
       if len(igs) > 0 {
       	if igs[0].ip != _|_ {

charts/vela-core/templates/defwithtemplate/init-container.yaml

@@ -1,12 +1,12 @@
 # Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/registry/init-container.cue
+# Definition source cue file: vela-templates/definitions/internal/init-container.cue
 apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
     definition.oam.dev/description: add an init container and use shared volume with pod
   name: init-container
-  namespace: vela-system
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -4,19 +4,26 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add labels for your Workload.
+    definition.oam.dev/description: Add labels on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: labels
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployments.apps
+    - '*'
   podDisruptive: true
   schematic:
     cue:
       template: |
-        patch: spec: template: metadata: labels: {
-        	for k, v in parameter {
-        		"\(k)": v
+        patch: {
+        	metadata: labels: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
+        	}
+        	spec: template: metadata: labels: {
+        		for k, v in parameter {
+        			"\(k)": v
+        		}
         	}
         }
         parameter: [string]: string

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

@@ -4,12 +4,12 @@ apiVersion: core.oam.dev/v1beta1
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: Add lifecycle hooks to workloads.
+    definition.oam.dev/description: Add lifecycle hooks for the first container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: lifecycle
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - deployments.apps
+    - '*'
   podDisruptive: true
   schematic:
     cue: