Backport #2541 to release 1.1 (#2709)

When golangci-lint doesn't locate in $PATH, it will be installed in
$GOBIN every single time.

(cherry picked from commit bff846b7fe)

Co-authored-by: zzxwill <zzxwill@gmail.com>

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

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

.github/workflows/commit-lint.yml

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

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

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

.github/workflows/e2e-test.yml

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

.gitignore

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

Dockerfile

@@ -5,6 +5,10 @@ WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
+
+# It's a proxy for CN developer, please unblock it if you have network issue
+# RUN go env -w GOPROXY=https://goproxy.cn,direct
+
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download

Makefile

@@ -39,6 +39,9 @@ endif
 VELA_CORE_IMAGE      ?= vela-core:latest
 VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
 VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest
+VELA_RUNTIME_ROLLOUT_TEST_IMAGE  ?= vela-runtime-rollout-test:$(GIT_COMMIT)
+RUNTIME_CLUSTER_CONFIG ?= /tmp/worker.kubeconfig
+RUNTIME_CLUSTER_NAME ?= worker
 
 all: build
 
@@ -143,6 +146,9 @@ e2e-setup-core:
 	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --set multicluster.enabled=true --wait kubevela ./charts/vela-core
 	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
 
+setup-runtime-e2e-cluster:
+	helm upgrade --install --create-namespace --namespace vela-system --kubeconfig=$(RUNTIME_CLUSTER_CONFIG) --set image.pullPolicy=IfNotPresent --set image.repository=vela-runtime-rollout-test --set image.tag=$(GIT_COMMIT) --wait vela-rollout ./runtime/rollout/charts
+
 e2e-setup:
 	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.9.0/kruise-chart.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
 	sh ./hack/e2e/modify_charts.sh
@@ -168,6 +174,11 @@ e2e-test:
 	ginkgo -v  --skip="rollout related e2e-test." ./test/e2e-test
 	@$(OK) tests pass
 
+e2e-addon-test:
+	cp bin/vela /tmp/
+	ginkgo -v ./test/e2e-addon-test
+	@$(OK) tests pass
+
 e2e-rollout-test:
 	ginkgo -v  --focus="rollout related e2e-test." ./test/e2e-test
 	@$(OK) tests pass
@@ -209,6 +220,12 @@ kind-load:
 	docker build -t $(VELA_CORE_TEST_IMAGE) -f Dockerfile.e2e .
 	kind load docker-image $(VELA_CORE_TEST_IMAGE) || { echo >&2 "kind not installed or error loading image: $(VELA_CORE_TEST_IMAGE)"; exit 1; }
 
+kind-load-runtime-cluster:
+	/bin/sh hack/e2e/build_runtime_rollout.sh
+	docker build -t $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) -f runtime/rollout/e2e/Dockerfile.e2e runtime/rollout/e2e/
+	rm -rf runtime/rollout/e2e/tmp
+	kind load docker-image $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE) --name=$(RUNTIME_CLUSTER_NAME)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
+
 # Run tests
 core-test: fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
@@ -258,16 +275,20 @@ HOSTARCH := amd64
 endif
 
 golangci:
-ifeq (, $(shell which golangci-lint))
+ifneq ($(shell which golangci-lint),)
+	@$(OK) golangci-lint is already installed
+GOLANGCILINT=$(shell which golangci-lint)
+else ifeq (, $(shell which $(GOBIN)/golangci-lint))
 	@{ \
 	set -e ;\
 	echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCILINT_VERSION) ;\
-	echo 'Install succeed' ;\
+	echo 'Successfully installed' ;\
 	}
 GOLANGCILINT=$(GOBIN)/golangci-lint
 else
-GOLANGCILINT=$(shell which golangci-lint)
+	@$(OK) golangci-lint is already installed
+GOLANGCILINT=$(GOBIN)/golangci-lint
 endif
 
 .PHONY: staticchecktool

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

@@ -114,6 +114,9 @@ type Terraform struct {
 	// +kubebuilder:validation:Enum:=hcl;json;remote
 	Type string `json:"type,omitempty"`
 
+	// Path is the sub-directory of remote git repository. It's valid when remote is set
+	Path string `json:"path,omitempty"`
+
 	// ProviderReference specifies the reference to Provider
 	ProviderReference *types.Reference `json:"providerRef,omitempty"`
 }

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

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

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

@@ -188,6 +188,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +472,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -193,6 +193,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +458,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -1232,6 +1232,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1639,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1944,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3372,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3672,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4061,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4329,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4399,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4617,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -179,6 +179,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -463,6 +467,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -222,6 +222,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +510,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +791,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1053,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1123,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -151,6 +151,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -188,6 +188,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +472,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -148,6 +148,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -212,6 +216,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +458,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

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

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

@@ -0,0 +1,61 @@
+apiVersion: v1
+data:
+  application: |
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        addons.oam.dev/description: Kubernetes Terraform Controller for AWS
+        addons.oam.dev/name: terraform/provider-aws
+      name: terraform-provider-aws
+      namespace: vela-system
+    spec:
+      components:
+      - name: aws-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: aws-account-creds
+            namespace: vela-system
+          stringData:
+            credentials: |
+              awsAccessKeyID: [[ index .Args "AWS_ACCESS_KEY_ID" ]]
+              awsSecretAccessKey: [[ index .Args "AWS_SECRET_ACCESS_KEY" ]]
+              awsSessionToken: [[ index .Args "AWS_SESSION_TOKEN" ]]
+          type: Opaque
+        type: raw
+      - name: aws
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: aws
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
+                name: aws-account-creds
+                namespace: vela-system
+              source: Secret
+            provider: aws
+            region: '[[ index .Args "AWS_DEFAULT_REGION" ]]'
+        type: raw
+    status:
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
+kind: ConfigMap
+metadata:
+  annotations:
+    addons.oam.dev/description: Kubernetes Terraform Controller for AWS
+    addons.oam.dev/name: terraform/provider-aws
+  labels:
+    addons.oam.dev/type: terraform-provider-aws
+  name: terraform-provider-aws
+  namespace: {{.Values.systemDefinitionNamespace}}

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

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

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

@@ -23,7 +23,7 @@ data:
           chart: terraform-controller
           repoType: helm
           url: https://charts.kubevela.net/addons
-          version: 0.1.19
+          version: 0.2.6
         type: helm
       - name: alibaba-ack
         properties:
@@ -40,199 +40,9 @@ data:
           spec:
             schematic:
               terraform:
-                configuration: |
-                  module "kubernetes" {
-                    source = "github.com/zzxwill/terraform-alicloud-kubernetes"
-                    new_nat_gateway = true
-                    vpc_name = var.vpc_name
-                    vpc_cidr = var.vpc_cidr
-                    vswitch_name_prefix = var.vswitch_name_prefix
-                    vswitch_cidrs = var.vswitch_cidrs
-                    master_instance_types = var.master_instance_types
-                    worker_instance_types = var.worker_instance_types
-                    k8s_pod_cidr = var.k8s_pod_cidr
-                    k8s_service_cidr = var.k8s_service_cidr
-                    k8s_worker_number = var.k8s_worker_number
-                    cpu_core_count = var.cpu_core_count
-                    memory_size = var.memory_size
-                    zone_id = var.zone_id
-                    k8s_version = var.k8s_version
-                    k8s_name_prefix = var.k8s_name_prefix
-                  }
-                  ######################
-                  # Instance types variables
-                  ######################
-                  variable "cpu_core_count" {
-                    description = "CPU core count is used to fetch instance types."
-                    type = number
-                    default = 4
-                  }
-                  variable "memory_size" {
-                    description = "Memory size used to fetch instance types."
-                    type = number
-                    default = 8
-                  }
-                  ######################
-                  # VPC variables
-                  ######################
-                  variable "vpc_name" {
-                    description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
-                    type = string
-                    default = "tf-k8s-vpc"
-                  }
-                  variable "vpc_cidr" {
-                    description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
-                    type = string
-                    default = "10.0.0.0/8"
-                  }
-                  ######################
-                  # VSwitch variables
-                  ######################
-                  variable "vswitch_name_prefix" {
-                    type = string
-                    description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
-                    default = "tf-k8s-vsw"
-                  }
-                  variable "number_format" {
-                    description = "The number format used to output."
-                    type = string
-                    default = "%02d"
-                  }
-                  variable "vswitch_ids" {
-                    description = "List of existing vswitch id."
-                    type = list
-                    default = []
-                  }
-                  variable "vswitch_cidrs" {
-                    description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
-                    type = list
-                    default = [
-                      "10.1.0.0/16",
-                      "10.2.0.0/16",
-                      "10.3.0.0/16"]
-                  }
-                  variable "k8s_name_prefix" {
-                    description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
-                    type = string
-                    default = "poc"
-                  }
-                  variable "new_nat_gateway" {
-                    type = bool
-                    description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
-                    default = true
-                  }
-                  variable "master_instance_types" {
-                    description = "The ecs instance types used to launch master nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c5.xlarge",
-                      "ecs.n4.xlarge",
-                      # "ecs.n1.large",
-                      # "ecs.sn1.large",
-                      # "ecs.s6-c1m2.xlarge",
-                      # "ecs.c6e.xlarge"
-                    ]
-                  }
-                  variable "worker_instance_types" {
-                    description = "The ecs instance types used to launch worker nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c6e.xlarge",
-                      "ecs.n4.xlarge",
-                      //    "ecs.n1.large",
-                      //    "ecs.sn1.large",
-                      //    "ecs.s6-c1m2.xlarge"
-                    ]
-                  }
-                  variable "node_cidr_mask" {
-                    type = number
-                    description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
-                    default = 24
-                  }
-                  variable "enable_ssh" {
-                    description = "Enable login to the node through SSH."
-                    type = bool
-                    default = true
-                  }
-                  variable "install_cloud_monitor" {
-                    description = "Install cloud monitor agent on ECS."
-                    type = bool
-                    default = true
-                  }
-                  variable "cpu_policy" {
-                    type = string
-                    description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
-                    default = "none"
-                  }
-                  variable "proxy_mode" {
-                    description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
-                    type = string
-                    default = "iptables"
-                  }
-                  variable "password" {
-                    description = "The password of ECS instance."
-                    type = string
-                    default = "Just4Test"
-                  }
-                  variable "k8s_worker_number" {
-                    description = "The number of worker nodes in kubernetes cluster."
-                    type = number
-                    default = 2
-                  }
-                  # k8s_pod_cidr is only for flannel network
-                  variable "k8s_pod_cidr" {
-                    description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
-                    type = string
-                    default = "172.20.0.0/16"
-                  }
-                  variable "k8s_service_cidr" {
-                    description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
-                    type = string
-                    default = "192.168.0.0/16"
-                  }
-                  variable "k8s_version" {
-                    description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
-                    type = string
-                    default = "1.20.4-aliyun.1"
-                  }
-                  variable "zone_id" {
-                    description = "Availability Zone ID"
-                    type = string
-                    default = "cn-hongkong-b"
-                    # "cn-beijing-a"
-                  }
-                  output "name" {
-                    value = module.kubernetes.name
-                  }
-                  output "kubeconfig" {
-                    value = module.kubernetes.kubeconfig
-                  }
-                  output "cluster_ca_cert" {
-                    value = module.kubernetes.cluster_ca_cert
-                  }
-                  output "client_cert" {
-                    value = module.kubernetes.client_cert
-                  }
-                  output "client_key" {
-                    value = module.kubernetes.client_key
-                  }
-                  output "api_server_internet" {
-                    value = module.kubernetes.api_server_internet
-                  }
+                configuration: https://github.com/kubevela-contrib/terraform-modules.git
+                path: alibaba/cs/dedicated-kubernetes
+                type: remote
             workload:
               definition:
                 apiVersion: terraform.core.oam.dev/v1beta1
@@ -304,7 +114,7 @@ data:
               terraform:
                 configuration: |
                   module "rds" {
-                    source = "terraform-alicloud-modules/rds/alicloud"
+                    source = "github.com/kubevela-contrib/terraform-alicloud-rds"
                     engine = "MySQL"
                     engine_version = "8.0"
                     instance_type = "rds.mysql.c1.large"
@@ -312,6 +122,8 @@ data:
                     instance_name = var.instance_name
                     account_name = var.account_name
                     password = var.password
+                    allocate_public_connection = var.allocate_public_connection
+                    security_ips = ["0.0.0.0/0",]
                   }
 
                   output "DB_NAME" {
@@ -329,6 +141,9 @@ data:
                   output "DB_PASSWORD" {
                     value = var.password
                   }
+                  output "DB_PUBLIC_HOST" {
+                    value = module.rds.db_public_connection_string
+                  }
 
                   variable "instance_name" {
                     description = "RDS instance name"
@@ -347,6 +162,52 @@ data:
                     type = string
                     default = "Xyfff83jfewGGfaked"
                   }
+
+                  variable "allocate_public_connection" {
+                    description = "Whether to allocate public connection for a RDS instance."
+                    type        = bool
+                    default     = true
+                  }
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: aws-s3
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for AWS S3
+            labels:
+              type: terraform
+            name: aws-s3
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  resource "aws_s3_bucket" "bucket-acl" {
+                    bucket = var.bucket
+                    acl    = var.acl
+                  }
+
+                  output "BUCKET_NAME" {
+                    value = aws_s3_bucket.bucket-acl.bucket_domain_name
+                  }
+
+                  variable "bucket" {
+                    description = "S3 bucket name"
+                    default = "vela-website"
+                    type = string
+                  }
+
+                  variable "acl" {
+                    description = "S3 bucket ACL"
+                    default = "private"
+                    type = string
+                  }
             workload:
               definition:
                 apiVersion: terraform.core.oam.dev/v1beta1

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

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

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

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

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

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

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

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

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

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

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

@@ -1232,6 +1232,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1639,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1944,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3372,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3672,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4061,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4329,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4399,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4617,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -222,6 +222,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +510,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +791,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1053,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1123,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -151,6 +151,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -188,6 +188,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +472,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -148,6 +148,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -212,6 +216,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +458,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

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

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

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

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

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

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

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

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

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

cmd/core/main.go

@@ -32,6 +32,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/klog/v2"
+	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
@@ -43,6 +44,7 @@ import (
 	oamv1alpha2 "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 	"github.com/oam-dev/kubevela/pkg/cue/packages"
+	_ "github.com/oam-dev/kubevela/pkg/monitor/metrics"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
@@ -111,6 +113,8 @@ func main() {
 	flag.StringVar(&storageDriver, "storage-driver", "Local", "Application file save to the storage driver")
 	flag.DurationVar(&syncPeriod, "informer-re-sync-interval", 60*time.Minute,
 		"controller shared informer lister full re-sync period")
+	flag.DurationVar(&commonconfig.ReconcileTimeout, "reconcile-timeout", time.Minute*3,
+		"the timeout for controller reconcile")
 	flag.StringVar(&oam.SystemDefinitonNamespace, "system-definition-namespace", "vela-system", "define the namespace of the system-level definition")
 	flag.IntVar(&controllerArgs.ConcurrentReconciles, "concurrent-reconciles", 4, "concurrent-reconciles is the concurrent reconcile number of the controller. The default value is 4")
 	flag.Float64Var(&qps, "kube-api-qps", 50, "the qps for reconcile clients. Low qps may lead to low throughput. High qps may give stress to api-server. Raise this value if concurrent-reconciles is set to be high.")
@@ -192,7 +196,7 @@ func main() {
 			os.Exit(1)
 		}
 	}
-
+	ctrl.SetLogger(klogr.New())
 	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsAddr,

commitlint.config.js

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

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

@@ -22,6 +22,7 @@
 |        disable-caps         | string |                ""                 |           To be disabled builtin capability list.            |
 |       storage-driver        | string |               Local               |         Application file save to the storage driver          |
 |  informer-re-sync-interval  |  time  |                1h                 | Controller shared informer lister full re-sync period, the interval between two routinely reconciles for one CR (like Application) if no changes made to it. |
+|      reconcile-timeout      |  time  |                3m                 |           The timeout for controller reconcile.              |
 | system-definition-namespace | string |            vela-system            |     define the namespace of the system-level definition      |
 |    concurrent-reconciles    |  int   |                 4                 | The concurrent reconcile number of the controller. You can increase the degree of concurrency if a large number of CPU cores are provided to the controller. |
 |        kube-api-qps         |  int   |                50                 | The qps for reconcile k8s clients. Increase it if you have high concurrency. A small number might restrict the requests to the api-server which may cause a long waiting queue when there are a large number of inflight requests. Try to avoid setting it too high since it will cause large burden on apiserver. |
@@ -39,4 +40,4 @@
 | Medium | < 500   |   < 5,000     | < 30,000 |              4        |      500     |      800       |     1 |   2Gi  |
 | Large | < 1,000  |   < 12,000    | < 72,000 |              4        |      800     |     1,000      |     2 |   4Gi  |
 
-> For details, read KubeVela Performance Test Report
+> For details, read KubeVela Performance Test Report

docs/examples/nocalhost/nocalhost.yaml

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

docs/examples/obervability/application-observability.yaml

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

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

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

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

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

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

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

docs/examples/obervability/initializer-observability.yaml

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

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

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

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

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

e2e/application/application_test.go

@@ -49,11 +49,11 @@ var _ = ginkgo.Describe("Test Vela Application", func() {
 	e2e.EnvInitContext("env init", envName)
 	e2e.EnvSetContext("env set", envName)
 	e2e.JsonAppFileContext("deploy app-basic", appbasicJsonAppFile)
+	ApplicationExecContext("exec -- COMMAND", applicationName)
 	e2e.JsonAppFileContext("update app-basic, add scaler trait with replicas 2", appbasicAddTraitJsonAppFile)
 	e2e.ComponentListContext("ls", applicationName, workloadType, traitAlias)
 	ApplicationStatusContext("status", applicationName, workloadType)
 	ApplicationStatusDeeplyContext("status", applicationName, workloadType, envName)
-	ApplicationExecContext("exec -- COMMAND", applicationName)
 	// ApplicationPortForwardContext("port-forward", applicationName)
 	e2e.WorkloadDeleteContext("delete", applicationName)
 

go.mod

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

go.sum

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

hack/e2e/build_runtime_rollout.sh

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

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

@@ -1232,6 +1232,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1635,6 +1639,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -1936,6 +1944,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3360,6 +3372,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -3656,6 +3672,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4041,6 +4061,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4305,6 +4329,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider
@@ -4371,6 +4399,10 @@ spec:
                             - type
                             type: object
                           type: array
+                        configMapRef:
+                          description: ConfigMapRef refer to a ConfigMap which contains
+                            OpenAPI V3 JSON schema of Component parameters.
+                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4585,6 +4617,10 @@ spec:
                                 configuration:
                                   description: Configuration is Terraform Configuration
                                   type: string
+                                path:
+                                  description: Path is the sub-directory of remote
+                                    git repository. It's valid when remote is set
+                                  type: string
                                 providerRef:
                                   description: ProviderReference specifies the reference
                                     to Provider

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

@@ -179,6 +179,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -463,6 +467,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -222,6 +222,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -506,6 +510,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -783,6 +791,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1041,6 +1053,10 @@ spec:
                               configuration:
                                 description: Configuration is Terraform Configuration
                                 type: string
+                              path:
+                                description: Path is the sub-directory of remote git
+                                  repository. It's valid when remote is set
+                                type: string
                               providerRef:
                                 description: ProviderReference specifies the reference
                                   to Provider
@@ -1107,6 +1123,10 @@ spec:
                           - type
                           type: object
                         type: array
+                      configMapRef:
+                        description: ConfigMapRef refer to a ConfigMap which contains
+                          OpenAPI V3 JSON schema of Component parameters.
+                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -151,6 +151,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -188,6 +188,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -468,6 +472,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

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

@@ -148,6 +148,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -212,6 +216,10 @@ spec:
                   - type
                   type: object
                 type: array
+              configMapRef:
+                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
+                  V3 JSON schema of Component parameters.
+                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

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

@@ -193,6 +193,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider
@@ -454,6 +458,10 @@ spec:
                       configuration:
                         description: Configuration is Terraform Configuration
                         type: string
+                      path:
+                        description: Path is the sub-directory of remote git repository.
+                          It's valid when remote is set
+                        type: string
                       providerRef:
                         description: ProviderReference specifies the reference to
                           Provider

pkg/appfile/appfile.go

@@ -669,6 +669,7 @@ func generateTerraformConfigurationWorkload(wl *Workload, ns string) (*unstructu
 		configuration.Spec.JSON = wl.FullTemplate.Terraform.Configuration
 	case "remote":
 		configuration.Spec.Remote = wl.FullTemplate.Terraform.Configuration
+		configuration.Spec.Path = wl.FullTemplate.Terraform.Path
 	}
 
 	if wl.FullTemplate.Terraform.ProviderReference != nil {

pkg/controller/common/context.go

@@ -26,11 +26,12 @@ var (
 	PerfEnabled = false
 )
 
-const (
-	reconcileTimeout = time.Minute
+var (
+	// ReconcileTimeout timeout for controller to reconcile
+	ReconcileTimeout = time.Minute * 3
 )
 
 // NewReconcileContext create context with default timeout (60s)
 func NewReconcileContext(ctx context.Context) (context.Context, context.CancelFunc) {
-	return context.WithTimeout(ctx, reconcileTimeout)
+	return context.WithTimeout(ctx, ReconcileTimeout)
 }

pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go

@@ -40,10 +40,11 @@ import (
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	velatypes "github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/appfile"
-	common2 "github.com/oam-dev/kubevela/pkg/controller/common"
 	core "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev"
 	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha1/envbinding"
+	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2/application/assemble"
 	"github.com/oam-dev/kubevela/pkg/cue/packages"
+	monitorContext "github.com/oam-dev/kubevela/pkg/monitor/context"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
 	oamutil "github.com/oam-dev/kubevela/pkg/oam/util"
@@ -86,19 +87,24 @@ type Reconciler struct {
 // Reconcile process app event
 // nolint:gocyclo
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	ctx, cancel := common2.NewReconcileContext(ctx)
+	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
 
-	klog.InfoS("Reconcile application", "application", klog.KRef(req.Namespace, req.Name))
-
+	logCtx := monitorContext.NewTraceContext(ctx, "").AddTag("application", req.String(), "controller", "application")
+	logCtx.Info("Reconcile application")
+	defer logCtx.Commit("Reconcile application")
 	app := new(v1beta1.Application)
 	if err := r.Get(ctx, client.ObjectKey{
 		Name:      req.Name,
 		Namespace: req.Namespace,
 	}, app); err != nil {
+		logCtx.Error(err, "get application")
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
+
+	logCtx.AddTag("resource_version", app.ResourceVersion)
 	ctx = oamutil.SetNamespaceInCtx(ctx, app.Namespace)
+	logCtx.SetContext(ctx)
 	if len(app.GetAnnotations()[oam.AnnotationKubeVelaVersion]) == 0 {
 		oamutil.AddAnnotations(app, map[string]string{
 			oam.AnnotationKubeVelaVersion: version.VelaVersion,
@@ -110,76 +116,76 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		app:    app,
 		parser: appParser,
 	}
-	endReconcile, err := r.handleFinalizers(ctx, app)
+	endReconcile, err := r.handleFinalizers(logCtx, app)
 	if err != nil {
-		return r.endWithNegativeCondition(ctx, app, condition.ReconcileError(err), common.ApplicationStarting)
+		return r.endWithNegativeCondition(logCtx, app, condition.ReconcileError(err), common.ApplicationStarting)
 	}
 	if endReconcile {
 		return ctrl.Result{}, nil
 	}
 
-	appFile, err := appParser.GenerateAppFile(ctx, app)
+	appFile, err := appParser.GenerateAppFile(logCtx, app)
 	if err != nil {
-		klog.ErrorS(err, "Failed to parse application", "application", klog.KObj(app))
+		logCtx.Error(err, "Failed to parse application")
 		r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedParse, err))
-		return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Parsed", err), common.ApplicationRendering)
+		return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Parsed", err), common.ApplicationRendering)
 	}
 	app.Status.SetConditions(condition.ReadyCondition("Parsed"))
 	r.Recorder.Event(app, event.Normal(velatypes.ReasonParsed, velatypes.MessageParsed))
 
-	if err := handler.PrepareCurrentAppRevision(ctx, appFile); err != nil {
-		klog.ErrorS(err, "Failed to prepare app revision", "application", klog.KObj(app))
+	if err := handler.PrepareCurrentAppRevision(logCtx, appFile); err != nil {
+		logCtx.Error(err, "Failed to prepare app revision")
 		r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRevision, err))
-		return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Revision", err), common.ApplicationRendering)
+		return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Revision", err), common.ApplicationRendering)
 	}
-	if err := handler.FinalizeAndApplyAppRevision(ctx); err != nil {
-		klog.ErrorS(err, "Failed to apply app revision", "application", klog.KObj(app))
+	if err := handler.FinalizeAndApplyAppRevision(logCtx); err != nil {
+		logCtx.Error(err, "Failed to apply app revision")
 		r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRevision, err))
-		return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Revision", err), common.ApplicationRendering)
+		return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Revision", err), common.ApplicationRendering)
 	}
-	klog.InfoS("Successfully prepare current app revision", "revisionName", handler.currentAppRev.Name,
+	logCtx.Info("Successfully prepare current app revision", "revisionName", handler.currentAppRev.Name,
 		"revisionHash", handler.currentRevHash, "isNewRevision", handler.isNewRevision)
 	app.Status.SetConditions(condition.ReadyCondition("Revision"))
 	r.Recorder.Event(app, event.Normal(velatypes.ReasonRevisoned, velatypes.MessageRevisioned))
 
-	if err := handler.UpdateAppLatestRevisionStatus(ctx); err != nil {
-		klog.ErrorS(err, "Failed to update application status", "application", klog.KObj(app))
-		return r.endWithNegativeCondition(ctx, app, condition.ReconcileError(err), common.ApplicationRendering)
+	if err := handler.UpdateAppLatestRevisionStatus(logCtx); err != nil {
+		logCtx.Error(err, "Failed to update application status")
+		return r.endWithNegativeCondition(logCtx, app, condition.ReconcileError(err), common.ApplicationRendering)
 	}
-	klog.InfoS("Successfully apply application revision", "application", klog.KObj(app))
+	logCtx.Info("Successfully apply application revision")
 
 	policies, err := appFile.PrepareWorkflowAndPolicy()
 	if err != nil {
-		klog.Error(err, "[Handle PrepareWorkflowAndPolicy]")
+		logCtx.Error(err, "[Handle PrepareWorkflowAndPolicy]")
 		r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRender, err))
-		return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("PrepareWorkflowAndPolicy", err), common.ApplicationPolicyGenerating)
+		return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("PrepareWorkflowAndPolicy", err), common.ApplicationPolicyGenerating)
 	}
 
 	if len(policies) > 0 {
 		if err := handler.Dispatch(ctx, "", common.PolicyResourceCreator, policies...); err != nil {
-			klog.Error(err, "[Handle ApplyPolicyResources]")
+			logCtx.Error(err, "[Handle ApplyPolicyResources]")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedApply, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("ApplyPolices", err), common.ApplicationPolicyGenerating)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("ApplyPolices", err), common.ApplicationPolicyGenerating)
 		}
-		klog.InfoS("Successfully generated application policies", "application", klog.KObj(app))
+		logCtx.Info("Successfully generated application policies")
 	}
 
 	app.Status.SetConditions(condition.ReadyCondition("Render"))
 	r.Recorder.Event(app, event.Normal(velatypes.ReasonRendered, velatypes.MessageRendered))
 
 	if !appWillRollout(app) {
-		steps, err := handler.GenerateApplicationSteps(ctx, app, appParser, appFile, handler.currentAppRev, r.Client, r.dm, r.pd)
+		steps, err := handler.GenerateApplicationSteps(logCtx, app, appParser, appFile, handler.currentAppRev, r.Client, r.dm, r.pd)
 		if err != nil {
-			klog.Error(err, "[handle workflow]")
+			logCtx.Error(err, "[handle workflow]")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedWorkflow, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Workflow", err), common.ApplicationRunningWorkflow)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Workflow", err), common.ApplicationRunningWorkflow)
 		}
 
-		workflowState, err := workflow.NewWorkflow(app, r.Client, appFile.WorkflowMode).ExecuteSteps(ctx, handler.currentAppRev, steps)
+		workflowState, err := workflow.NewWorkflow(app, r.Client, appFile.WorkflowMode).ExecuteSteps(logCtx.Fork("workflow"), handler.currentAppRev, steps)
 		if err != nil {
-			klog.Error(err, "[handle workflow]")
+			logCtx.Error(err, "[handle workflow]")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedWorkflow, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Workflow", err), common.ApplicationRunningWorkflow)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Workflow", err), common.ApplicationRunningWorkflow)
 		}
 
 		handler.addServiceStatus(false, app.Status.Services...)
@@ -187,9 +193,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		app.Status.AppliedResources = handler.appliedResources
 		switch workflowState {
 		case common.WorkflowStateSuspended:
-			return ctrl.Result{}, r.patchStatus(ctx, app, common.ApplicationWorkflowSuspending)
+			logCtx.Info("Workflow return state=Suspend")
+			return ctrl.Result{}, r.patchStatus(logCtx, app, common.ApplicationWorkflowSuspending)
 		case common.WorkflowStateTerminated:
-			return ctrl.Result{}, r.patchStatus(ctx, app, common.ApplicationWorkflowTerminated)
+			return ctrl.Result{}, r.patchStatus(logCtx, app, common.ApplicationWorkflowTerminated)
 		case common.WorkflowStateExecuting:
 			return reconcile.Result{RequeueAfter: baseWorkflowBackoffWaitTime}, r.patchStatus(ctx, app, common.ApplicationRunningWorkflow)
 		case common.WorkflowStateFinished:
@@ -203,10 +210,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 					})
 				}
 				if err != nil {
-					klog.ErrorS(err, "Failed to gc after workflow",
-						"application", klog.KObj(app))
+					logCtx.Error(err, "Failed to gc after workflow")
 					r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedGC, err))
-					return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("GCAfterWorkflow", err), common.ApplicationRunningWorkflow)
+					return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("GCAfterWorkflow", err), common.ApplicationRunningWorkflow)
 				}
 				app.Status.ResourceTracker = ref
 			}
@@ -218,33 +224,33 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		var comps []*velatypes.ComponentManifest
 		comps, err = appFile.GenerateComponentManifests()
 		if err != nil {
-			klog.ErrorS(err, "Failed to render components", "application", klog.KObj(app))
+			logCtx.Error(err, "Failed to render components")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRender, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Render", err), common.ApplicationRendering)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Render", err), common.ApplicationRendering)
 		}
 
-		handler.handleCheckManageWorkloadTrait(handler.currentAppRev.Spec.TraitDefinitions, comps)
+		assemble.HandleCheckManageWorkloadTrait(*handler.currentAppRev, comps)
 
-		if err := handler.HandleComponentsRevision(ctx, comps); err != nil {
-			klog.ErrorS(err, "Failed to handle compoents revision", "application", klog.KObj(app))
+		if err := handler.HandleComponentsRevision(logCtx, comps); err != nil {
+			logCtx.Error(err, "Failed to handle components revision")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRevision, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Render", err), common.ApplicationRendering)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Render", err), common.ApplicationRendering)
 		}
 		klog.Info("Application manifests has prepared and ready for appRollout to handle", "application", klog.KObj(app))
 	}
 	// if inplace is false and rolloutPlan is nil, it means the user will use an outer AppRollout object to rollout the application
 	if handler.app.Spec.RolloutPlan != nil {
-		res, err := handler.handleRollout(ctx)
+		res, err := handler.handleRollout(logCtx)
 		if err != nil {
-			klog.ErrorS(err, "Failed to handle rollout", "application", klog.KObj(app))
+			logCtx.Error(err, "Failed to handle rollout")
 			r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedRollout, err))
-			return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition("Rollout", err), common.ApplicationRollingOut)
+			return r.endWithNegativeCondition(logCtx, app, condition.ErrorCondition("Rollout", err), common.ApplicationRollingOut)
 		}
 		// skip health check and garbage collection if rollout have not finished
 		// start next reconcile immediately
 		if res.Requeue || res.RequeueAfter > 0 {
-			if err := r.patchStatus(ctx, app, common.ApplicationRollingOut); err != nil {
-				return r.endWithNegativeCondition(ctx, app, condition.ReconcileError(err), common.ApplicationRollingOut)
+			if err := r.patchStatus(logCtx, app, common.ApplicationRollingOut); err != nil {
+				return r.endWithNegativeCondition(logCtx, app, condition.ReconcileError(err), common.ApplicationRollingOut)
 			}
 			return res, nil
 		}
@@ -252,7 +258,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		// there is no need reconcile immediately, that means the rollout operation have finished
 		r.Recorder.Event(app, event.Normal(velatypes.ReasonRollout, velatypes.MessageRollout))
 		app.Status.SetConditions(condition.ReadyCondition("Rollout"))
-		klog.InfoS("Finished rollout ", "application", klog.KObj(app))
+		logCtx.Info("Finished rollout ")
 	}
 	var phase = common.ApplicationRunning
 	if !hasHealthCheckPolicy(appFile.Policies) {
@@ -263,11 +269,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 
 	if err := garbageCollection(ctx, handler); err != nil {
-		klog.ErrorS(err, "Failed to run garbage collection")
+		logCtx.Error(err, "Failed to run garbage collection")
 		r.Recorder.Event(app, event.Warning(velatypes.ReasonFailedGC, err))
-		return r.endWithNegativeCondition(ctx, app, condition.ReconcileError(err), phase)
+		return r.endWithNegativeCondition(logCtx, app, condition.ReconcileError(err), phase)
 	}
-	klog.Info("Successfully garbage collect", "application", klog.KObj(app))
+	logCtx.Info("Successfully garbage collect")
 	app.Status.SetConditions(condition.Condition{
 		Type:               condition.TypeReady,
 		Status:             corev1.ConditionTrue,
@@ -275,17 +281,17 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		Reason:             condition.ReasonReconcileSuccess,
 	})
 	r.Recorder.Event(app, event.Normal(velatypes.ReasonDeployed, velatypes.MessageDeployed))
-	return ctrl.Result{}, r.patchStatus(ctx, app, phase)
+	return ctrl.Result{}, r.patchStatus(logCtx, app, phase)
 }
 
 // NOTE Because resource tracker is cluster-scoped resources, we cannot garbage collect them
 // by setting application(namespace-scoped) as their owners.
 // We must delete all resource trackers related to an application through finalizer logic.
-func (r *Reconciler) handleFinalizers(ctx context.Context, app *v1beta1.Application) (bool, error) {
+func (r *Reconciler) handleFinalizers(ctx monitorContext.Context, app *v1beta1.Application) (bool, error) {
 	if app.ObjectMeta.DeletionTimestamp.IsZero() {
 		if !meta.FinalizerExists(app, resourceTrackerFinalizer) {
 			meta.AddFinalizer(app, resourceTrackerFinalizer)
-			klog.InfoS("Register new finalizer for application", "application", klog.KObj(app), "finalizer", resourceTrackerFinalizer)
+			ctx.Info("Register new finalizer for application", "finalizer", resourceTrackerFinalizer)
 			return true, errors.Wrap(r.Client.Update(ctx, app), errUpdateApplicationFinalizer)
 		}
 	} else {
@@ -295,7 +301,7 @@ func (r *Reconciler) handleFinalizers(ctx context.Context, app *v1beta1.Applicat
 			rt := &v1beta1.ResourceTracker{}
 			rt.SetName(fmt.Sprintf("%s-%s", app.Namespace, app.Name))
 			if err := r.Client.Delete(ctx, rt); err != nil && !kerrors.IsNotFound(err) {
-				klog.ErrorS(err, "Failed to delete legacy resource tracker", "name", rt.Name)
+				ctx.Error(err, "Failed to delete legacy resource tracker", "name", rt.Name)
 				return true, errors.WithMessage(err, "cannot remove finalizer")
 			}
 			meta.RemoveFinalizer(app, legacyResourceTrackerFinalizer)
@@ -309,12 +315,12 @@ func (r *Reconciler) handleFinalizers(ctx context.Context, app *v1beta1.Applicat
 				}}
 			rtList := &v1beta1.ResourceTrackerList{}
 			if err := r.Client.List(ctx, rtList, listOpts...); err != nil {
-				klog.ErrorS(err, "Failed to list resource tracker of app", "name", app.Name)
+				ctx.Error(err, "Failed to list resource tracker of app", "name", app.Name)
 				return true, errors.WithMessage(err, "cannot remove finalizer")
 			}
 			for _, rt := range rtList.Items {
 				if err := r.Client.Delete(ctx, rt.DeepCopy()); err != nil && !kerrors.IsNotFound(err) {
-					klog.ErrorS(err, "Failed to delete resource tracker", "name", rt.Name)
+					ctx.Error(err, "Failed to delete resource tracker", "name", rt.Name)
 					return true, errors.WithMessage(err, "cannot remove finalizer")
 				}
 			}

pkg/controller/core.oam.dev/v1alpha2/application/application_controller_test.go

@@ -26,8 +26,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/oam-dev/kubevela/pkg/oam/testutil"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -40,6 +38,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/yaml"
@@ -52,6 +51,7 @@ import (
 	velatypes "github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/oam/testutil"
 	"github.com/oam-dev/kubevela/pkg/oam/util"
 	common2 "github.com/oam-dev/kubevela/pkg/utils/common"
 )
@@ -2069,6 +2069,51 @@ var _ = Describe("Test Application Controller", func() {
 		}))
 	})
 
+	It("app record execution state with controllerRevision", func() {
+		ns := &corev1.Namespace{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "vela-test-app-trace",
+			},
+		}
+
+		app := appwithNoTrait.DeepCopy()
+		app.Name = "vela-test-app-trace"
+		app.SetNamespace(ns.Name)
+		Expect(k8sClient.Create(ctx, ns)).Should(BeNil())
+		Expect(k8sClient.Create(ctx, app)).Should(BeNil())
+
+		appKey := client.ObjectKey{
+			Name:      app.Name,
+			Namespace: app.Namespace,
+		}
+
+		testutil.ReconcileOnceAfterFinalizer(reconciler, reconcile.Request{NamespacedName: appKey})
+		checkApp := &v1beta1.Application{}
+		Expect(k8sClient.Get(ctx, appKey, checkApp)).Should(BeNil())
+		Expect(checkApp.Status.Phase).Should(BeEquivalentTo(common.ApplicationRunning))
+		web := &v1.Deployment{}
+		Expect(k8sClient.Get(ctx, client.ObjectKey{
+			Name:      "myweb2",
+			Namespace: app.Namespace,
+		}, web)).Should(BeNil())
+		web.Spec.Replicas = pointer.Int32(0)
+		Expect(k8sClient.Update(ctx, web)).Should(BeNil())
+
+		checkApp.Status.Workflow = nil
+		Expect(k8sClient.Update(ctx, checkApp)).Should(BeNil())
+		testutil.ReconcileOnceAfterFinalizer(reconciler, reconcile.Request{NamespacedName: appKey})
+		checkApp = &v1beta1.Application{}
+		Expect(k8sClient.Get(ctx, appKey, checkApp)).Should(BeNil())
+		Expect(checkApp.Status.Phase).Should(BeEquivalentTo(common.ApplicationRunning))
+
+		checkWeb := &v1.Deployment{}
+		Expect(k8sClient.Get(ctx, client.ObjectKey{
+			Name:      "myweb2",
+			Namespace: app.Namespace,
+		}, checkWeb)).Should(BeNil())
+		Expect(*(checkWeb.Spec.Replicas)).Should(BeEquivalentTo(int32(0)))
+
+	})
 })
 
 const (

pkg/controller/core.oam.dev/v1alpha2/application/apply.go

@@ -36,8 +36,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2/application/dispatch"
 	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/v1alpha2/applicationrollout"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
-	"github.com/oam-dev/kubevela/pkg/cue/process"
-	"github.com/oam-dev/kubevela/pkg/oam"
 	oamutil "github.com/oam-dev/kubevela/pkg/oam/util"
 )
 
@@ -175,24 +173,34 @@ func (h *AppHandler) collectHealthStatus(wl *appfile.Workload, appRev *v1beta1.A
 		}
 		appName  = appRev.Spec.Application.Name
 		isHealth = true
+		err      error
 	)
 
 	if wl.CapabilityCategory == types.TerraformCategory {
-		return nil, true, nil
+		ctx := context.Background()
+		var configuration terraformapi.Configuration
+		if err := h.r.Client.Get(ctx, client.ObjectKey{Name: wl.Name, Namespace: h.app.Namespace}, &configuration); err != nil {
+			return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, check health error", appName, wl.Name)
+		}
+		if configuration.Status.Apply.State != terraformtypes.Available {
+			status.Healthy = false
+		} else {
+			status.Healthy = true
+		}
+		status.Message = configuration.Status.Apply.Message
+	} else {
+		if ok, err := wl.EvalHealth(wl.Ctx, h.r.Client, h.app.Namespace); !ok || err != nil {
+			isHealth = false
+			status.Healthy = false
+		}
+
+		status.Message, err = wl.EvalStatus(wl.Ctx, h.r.Client, h.app.Namespace)
+		if err != nil {
+			return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, evaluate workload status message error", appName, wl.Name)
+		}
 	}
 
-	if ok, err := wl.EvalHealth(wl.Ctx, h.r.Client, h.app.Namespace); !ok || err != nil {
-		isHealth = false
-		status.Healthy = false
-	}
 	var traitStatusList []common.ApplicationTraitStatus
-
-	var err error
-	status.Message, err = wl.EvalStatus(wl.Ctx, h.r.Client, h.app.Namespace)
-	if err != nil {
-		return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, evaluate workload status message error", appName, wl.Name)
-	}
-
 	for _, tr := range wl.Traits {
 		var traitStatus = common.ApplicationTraitStatus{
 			Type:    tr.Name,
@@ -215,115 +223,6 @@ func (h *AppHandler) collectHealthStatus(wl *appfile.Workload, appRev *v1beta1.A
 	return &status, isHealth, nil
 }
 
-func (h *AppHandler) aggregateHealthStatus(appFile *appfile.Appfile) ([]common.ApplicationComponentStatus, bool, error) {
-	var appStatus []common.ApplicationComponentStatus
-	var healthy = true
-	for _, wl := range appFile.Workloads {
-		var status = common.ApplicationComponentStatus{
-			Name:               wl.Name,
-			WorkloadDefinition: wl.FullTemplate.Reference.Definition,
-			Healthy:            true,
-		}
-
-		var pCtx process.Context
-
-		switch wl.CapabilityCategory {
-		case types.TerraformCategory:
-			pCtx = appfile.NewBasicContext(wl, appFile.Name, appFile.AppRevisionName, appFile.Namespace)
-			ctx := context.Background()
-			var configuration terraformapi.Configuration
-			if err := h.r.Client.Get(ctx, client.ObjectKey{Name: wl.Name, Namespace: h.app.Namespace}, &configuration); err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, check health error", appFile.Name, wl.Name)
-			}
-			if configuration.Status.Apply.State != terraformtypes.Available {
-				healthy = false
-				status.Healthy = false
-			} else {
-				status.Healthy = true
-			}
-			status.Message = configuration.Status.Apply.Message
-		default:
-			pCtx = process.NewContext(h.app.Namespace, wl.Name, appFile.Name, appFile.AppRevisionName)
-			if !h.isNewRevision && wl.CapabilityCategory != types.CUECategory {
-				templateStr, err := appfile.GenerateCUETemplate(wl)
-				if err != nil {
-					return nil, false, err
-				}
-				wl.FullTemplate.TemplateStr = templateStr
-			}
-
-			if err := wl.EvalContext(pCtx); err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, evaluate context error", appFile.Name, wl.Name)
-			}
-			workloadHealth, err := wl.EvalHealth(pCtx, h.r.Client, h.app.Namespace)
-			if err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, check health error", appFile.Name, wl.Name)
-			}
-			if !workloadHealth {
-				// TODO(wonderflow): we should add a custom way to let the template say why it's unhealthy, only a bool flag is not enough
-				status.Healthy = false
-				healthy = false
-			}
-
-			status.Message, err = wl.EvalStatus(pCtx, h.r.Client, h.app.Namespace)
-			if err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, evaluate workload status message error", appFile.Name, wl.Name)
-			}
-		}
-
-		var traitStatusList []common.ApplicationTraitStatus
-		for _, tr := range wl.Traits {
-			if err := tr.EvalContext(pCtx); err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, trait=%s, evaluate context error", appFile.Name, wl.Name, tr.Name)
-			}
-
-			var traitStatus = common.ApplicationTraitStatus{
-				Type:    tr.Name,
-				Healthy: true,
-			}
-			traitHealth, err := tr.EvalHealth(pCtx, h.r.Client, h.app.Namespace)
-			if err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, trait=%s, check health error", appFile.Name, wl.Name, tr.Name)
-			}
-			if !traitHealth {
-				// TODO(wonderflow): we should add a custom way to let the template say why it's unhealthy, only a bool flag is not enough
-				traitStatus.Healthy = false
-				healthy = false
-			}
-			traitStatus.Message, err = tr.EvalStatus(pCtx, h.r.Client, h.app.Namespace)
-			if err != nil {
-				return nil, false, errors.WithMessagef(err, "app=%s, comp=%s, trait=%s, evaluate status message error", appFile.Name, wl.Name, tr.Name)
-			}
-			traitStatusList = append(traitStatusList, traitStatus)
-		}
-
-		status.Traits = traitStatusList
-		status.Scopes = generateScopeReference(wl.Scopes)
-		appStatus = append(appStatus, status)
-	}
-	return appStatus, healthy, nil
-}
-
-func (h *AppHandler) handleCheckManageWorkloadTrait(traitDefs map[string]v1beta1.TraitDefinition, comps []*types.ComponentManifest) {
-	manageWorkloadTrait := map[string]bool{}
-	for traitName, definition := range traitDefs {
-		if definition.Spec.ManageWorkload {
-			manageWorkloadTrait[traitName] = true
-		}
-	}
-	if len(manageWorkloadTrait) == 0 {
-		return
-	}
-	for _, comp := range comps {
-		for _, trait := range comp.Traits {
-			traitType := trait.GetLabels()[oam.TraitTypeLabel]
-			if manageWorkloadTrait[traitType] {
-				trait.SetLabels(oamutil.MergeMapOverrideWithDst(trait.GetLabels(), map[string]string{oam.LabelManageWorkloadTrait: "true"}))
-			}
-		}
-	}
-}
-
 func generateScopeReference(scopes []appfile.Scope) []corev1.ObjectReference {
 	var references []corev1.ObjectReference
 	for _, scope := range scopes {

pkg/controller/core.oam.dev/v1alpha2/application/apply_test.go

@@ -24,24 +24,17 @@ import (
 
 	"github.com/oam-dev/kubevela/pkg/oam/testutil"
 
-	terraformtypes "github.com/oam-dev/terraform-controller/api/types"
-	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/yaml"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-	velatypes "github.com/oam-dev/kubevela/apis/types"
-	"github.com/oam-dev/kubevela/pkg/appfile"
-	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 const workloadDefinition = `
@@ -159,95 +152,3 @@ var _ = Describe("Test Application apply", func() {
 		Expect(strings.Compare(applabel, app.Name) == 0).Should(BeTrue())
 	})
 })
-
-var _ = Describe("Test statusAggregate", func() {
-	It("the component is Terraform type", func() {
-		var (
-			ctx           = context.TODO()
-			componentName = "sample-oss"
-			ns            = "default"
-			h             = &AppHandler{r: reconciler, app: &v1beta1.Application{
-				TypeMeta:   metav1.TypeMeta{},
-				ObjectMeta: metav1.ObjectMeta{Namespace: ns},
-			}}
-			appFile = &appfile.Appfile{
-				Workloads: []*appfile.Workload{
-					{
-						Name: componentName,
-						FullTemplate: &appfile.Template{
-							Reference: common.WorkloadTypeDescriptor{
-								Definition: common.WorkloadGVK{APIVersion: "v1", Kind: "A1"},
-							},
-						},
-						CapabilityCategory: velatypes.TerraformCategory,
-					},
-				},
-			}
-		)
-
-		By("aggregate status")
-		statuses, healthy, err := h.aggregateHealthStatus(appFile)
-		Expect(statuses).Should(BeNil())
-		Expect(healthy).Should(Equal(false))
-		Expect(err).Should(HaveOccurred())
-
-		By("create Terraform configuration")
-		configuration := terraformapi.Configuration{
-			TypeMeta:   metav1.TypeMeta{APIVersion: "terraform.core.oam.dev/v1beta1", Kind: "Configuration"},
-			ObjectMeta: metav1.ObjectMeta{Name: componentName, Namespace: ns},
-		}
-		k8sClient.Create(ctx, &configuration)
-
-		By("aggregate status again")
-		statuses, healthy, err = h.aggregateHealthStatus(appFile)
-		Expect(len(statuses)).Should(Equal(1))
-		Expect(healthy).Should(Equal(false))
-		Expect(err).Should(BeNil())
-
-		By("set status for Terraform configuration")
-		var gotConfiguration terraformapi.Configuration
-		k8sClient.Get(ctx, client.ObjectKey{Namespace: ns, Name: componentName}, &gotConfiguration)
-		gotConfiguration.Status.Apply.State = terraformtypes.Available
-		k8sClient.Status().Update(ctx, &gotConfiguration)
-
-		By("aggregate status one more time")
-		statuses, healthy, err = h.aggregateHealthStatus(appFile)
-		Expect(len(statuses)).Should(Equal(1))
-		Expect(healthy).Should(Equal(true))
-		Expect(err).Should(BeNil())
-	})
-})
-
-var _ = Describe("Test handleCheckManageWorkloadTrait func", func() {
-	It("Test every situation", func() {
-		traitDefs := map[string]v1beta1.TraitDefinition{
-			"rollout": v1beta1.TraitDefinition{
-				Spec: v1beta1.TraitDefinitionSpec{
-					ManageWorkload: true,
-				},
-			},
-			"normal": v1beta1.TraitDefinition{
-				Spec: v1beta1.TraitDefinitionSpec{},
-			},
-		}
-		rolloutTrait := &unstructured.Unstructured{}
-		rolloutTrait.SetLabels(map[string]string{oam.TraitTypeLabel: "rollout"})
-
-		normalTrait := &unstructured.Unstructured{}
-		normalTrait.SetLabels(map[string]string{oam.TraitTypeLabel: "normal"})
-		comps := []*velatypes.ComponentManifest{
-			{
-				Traits: []*unstructured.Unstructured{
-					rolloutTrait,
-					normalTrait,
-				},
-			},
-		}
-		h := AppHandler{}
-		h.handleCheckManageWorkloadTrait(traitDefs, comps)
-		Expect(len(rolloutTrait.GetLabels())).Should(BeEquivalentTo(2))
-		Expect(rolloutTrait.GetLabels()[oam.LabelManageWorkloadTrait]).Should(BeEquivalentTo("true"))
-		Expect(len(normalTrait.GetLabels())).Should(BeEquivalentTo(1))
-		Expect(normalTrait.GetLabels()[oam.LabelManageWorkloadTrait]).Should(BeEquivalentTo(""))
-	})
-})

pkg/controller/core.oam.dev/v1alpha2/application/assemble/assemble.go

@@ -232,6 +232,9 @@ func PrepareBeforeApply(comp *types.ComponentManifest, appRev *v1beta1.Applicati
 	}
 
 	assembledTraits := make([]*unstructured.Unstructured, len(comp.Traits))
+
+	HandleCheckManageWorkloadTrait(*appRev, []*types.ComponentManifest{comp})
+
 	for i, trait := range comp.Traits {
 		setTraitLabels(trait, additionalLabel)
 		assembledTraits[i] = trait
@@ -329,3 +332,25 @@ func setTraitLabels(trait *unstructured.Unstructured, additionalLabels map[strin
 	// add more trait-specific labels here
 	util.AddLabels(trait, additionalLabels)
 }
+
+// HandleCheckManageWorkloadTrait will checkout every trait whether a manage-workload trait, if yes set label and annotation in trait
+func HandleCheckManageWorkloadTrait(appRev v1beta1.ApplicationRevision, comps []*types.ComponentManifest) {
+	traitDefs := appRev.Spec.TraitDefinitions
+	manageWorkloadTrait := map[string]bool{}
+	for traitName, definition := range traitDefs {
+		if definition.Spec.ManageWorkload {
+			manageWorkloadTrait[traitName] = true
+		}
+	}
+	if len(manageWorkloadTrait) == 0 {
+		return
+	}
+	for _, comp := range comps {
+		for _, trait := range comp.Traits {
+			traitType := trait.GetLabels()[oam.TraitTypeLabel]
+			if manageWorkloadTrait[traitType] {
+				trait.SetLabels(util.MergeMapOverrideWithDst(trait.GetLabels(), map[string]string{oam.LabelManageWorkloadTrait: "true"}))
+			}
+		}
+	}
+}

pkg/controller/core.oam.dev/v1alpha2/application/assemble/assemble_suite_test.go

@@ -26,6 +26,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
+	velatypes "github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
@@ -203,3 +204,49 @@ var _ = Describe("Test Assemble Options", func() {
 		Expect(wl.GetName()).Should(Equal(workloadName))
 	})
 })
+
+var _ = Describe("Test handleCheckManageWorkloadTrait func", func() {
+	It("Test every situation", func() {
+		traitDefs := map[string]v1beta1.TraitDefinition{
+			"rollout": v1beta1.TraitDefinition{
+				Spec: v1beta1.TraitDefinitionSpec{
+					ManageWorkload: true,
+				},
+			},
+			"normal": v1beta1.TraitDefinition{
+				Spec: v1beta1.TraitDefinitionSpec{},
+			},
+		}
+		appRev := v1beta1.ApplicationRevision{
+			Spec: v1beta1.ApplicationRevisionSpec{
+				TraitDefinitions: traitDefs,
+			},
+		}
+		rolloutTrait := &unstructured.Unstructured{}
+		rolloutTrait.SetLabels(map[string]string{oam.TraitTypeLabel: "rollout"})
+
+		normalTrait := &unstructured.Unstructured{}
+		normalTrait.SetLabels(map[string]string{oam.TraitTypeLabel: "normal"})
+
+		workload := unstructured.Unstructured{}
+		workload.SetLabels(map[string]string{
+			oam.WorkloadTypeLabel: "webservice",
+		})
+
+		comps := []*velatypes.ComponentManifest{
+			{
+				Traits: []*unstructured.Unstructured{
+					rolloutTrait,
+					normalTrait,
+				},
+				StandardWorkload: &workload,
+			},
+		}
+
+		HandleCheckManageWorkloadTrait(appRev, comps)
+		Expect(len(rolloutTrait.GetLabels())).Should(BeEquivalentTo(2))
+		Expect(rolloutTrait.GetLabels()[oam.LabelManageWorkloadTrait]).Should(BeEquivalentTo("true"))
+		Expect(len(normalTrait.GetLabels())).Should(BeEquivalentTo(1))
+		Expect(normalTrait.GetLabels()[oam.LabelManageWorkloadTrait]).Should(BeEquivalentTo(""))
+	})
+})

pkg/controller/core.oam.dev/v1alpha2/application/dispatch/dispatch.go

@@ -43,7 +43,7 @@ func NewAppManifestsDispatcher(c client.Client, appRev *v1beta1.ApplicationRevis
 		c:          c,
 		applicator: apply.NewAPIApplicator(c),
 		appRev:     appRev,
-		gcHandler:  NewGCHandler(c, appRev.Namespace),
+		gcHandler:  NewGCHandler(c, appRev.Namespace, *appRev),
 	}
 }
 
@@ -241,7 +241,7 @@ func (a *AppManifestsDispatcher) applyAndRecordManifests(ctx context.Context, ma
 		ctrlUIDs = append(ctrlUIDs, rt.UID)
 	}
 
-	applyOpts := []apply.ApplyOption{apply.MustBeControllableByAny(ctrlUIDs)}
+	applyOpts := []apply.ApplyOption{apply.MustBeControllableByAny(ctrlUIDs), apply.NotUpdateRenderHashEqual()}
 	ownerRef := metav1.OwnerReference{
 		APIVersion:         v1beta1.SchemeGroupVersion.String(),
 		Kind:               reflect.TypeOf(v1beta1.ResourceTracker{}).Name(),

pkg/controller/core.oam.dev/v1alpha2/application/dispatch/dispatch_suite_test.go

@@ -26,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+
 	"github.com/crossplane/crossplane-runtime/pkg/test"
 
 	. "github.com/onsi/ginkgo"
@@ -419,7 +421,9 @@ var _ = Describe("Test handleSkipGC func", func() {
 	})
 
 	It("Test GC skip func ", func() {
-		handler := GCHandler{c: k8sClient}
+		handler := GCHandler{c: k8sClient, appRev: v1beta1.ApplicationRevision{Spec: v1beta1.ApplicationRevisionSpec{
+			Application: v1beta1.Application{Spec: v1beta1.ApplicationSpec{Components: []common.ApplicationComponent{{Name: "mywebservice"}}}},
+		}}}
 		wlName := "test-workload"
 		resourceTracker := v1beta1.ResourceTracker{
 			ObjectMeta: metav1.ObjectMeta{
@@ -430,6 +434,7 @@ var _ = Describe("Test handleSkipGC func", func() {
 		skipWorkload := &appsv1.Deployment{TypeMeta: metav1.TypeMeta{APIVersion: "apps/v1", Kind: "Deployment"}}
 		skipWorkload.SetNamespace(namespaceName)
 		skipWorkload.SetName(wlName)
+		skipWorkload.SetLabels(map[string]string{oam.LabelAppComponent: "mywebservice"})
 		skipWorkload.SetOwnerReferences([]metav1.OwnerReference{*metav1.NewControllerRef(
 			&resourceTracker, v1beta1.ResourceTrackerKindVersionKind),
 			metav1.OwnerReference{UID: "app-uid", Name: "test-app", APIVersion: v1beta1.SchemeGroupVersion.String(), Kind: v1beta1.ApplicationKind}})

pkg/controller/core.oam.dev/v1alpha2/application/dispatch/dispatch_test.go

@@ -22,6 +22,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 func TestSetOAMOwner(t *testing.T) {
@@ -107,3 +110,31 @@ func TestSetOAMOwner(t *testing.T) {
 		assert.Equal(t, ti.ExpOwner, ti.OO.GetOwnerReferences(), name)
 	}
 }
+
+func TestCheckComponentDeleted(t *testing.T) {
+	wl_1 := unstructured.Unstructured{}
+	wl_1.SetLabels(map[string]string{oam.LabelAppComponent: "comp-1"})
+
+	wl_2 := unstructured.Unstructured{}
+
+	wl_3 := unstructured.Unstructured{}
+	wl_3.SetLabels(map[string]string{oam.LabelAppComponent: "comp-3"})
+
+	components := []common.ApplicationComponent{{Name: "comp-1"}}
+
+	testCase := map[string]struct {
+		u   unstructured.Unstructured
+		res bool
+	}{
+		"exsit comp":       {wl_1, false},
+		"no label deleted": {wl_2, true},
+		"not exsit comp":   {wl_3, true},
+	}
+
+	for caseName, s := range testCase {
+		b := checkResourceRelatedCompDeleted(s.u, components)
+		if b != s.res {
+			t.Errorf("check comp deleted func meet error: %s want %v got %v", caseName, s.res, b)
+		}
+	}
+}

pkg/controller/core.oam.dev/v1alpha2/application/dispatch/gc.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	"github.com/oam-dev/kubevela/pkg/oam"
 )
@@ -38,8 +39,8 @@ type GarbageCollector interface {
 }
 
 // NewGCHandler create a GCHandler
-func NewGCHandler(c client.Client, ns string) *GCHandler {
-	return &GCHandler{c, ns, nil, nil}
+func NewGCHandler(c client.Client, ns string, appRev v1beta1.ApplicationRevision) *GCHandler {
+	return &GCHandler{c, ns, nil, nil, appRev}
 }
 
 // GCHandler implement GarbageCollector interface
@@ -49,6 +50,8 @@ type GCHandler struct {
 
 	oldRT *v1beta1.ResourceTracker
 	newRT *v1beta1.ResourceTracker
+
+	appRev v1beta1.ApplicationRevision
 }
 
 // GarbageCollect delete the old resources that are no longer in the new resource tracker
@@ -137,6 +140,10 @@ func (h *GCHandler) handleResourceSkipGC(ctx context.Context, u *unstructured.Un
 	if _, exist := res.GetAnnotations()[oam.AnnotationSkipGC]; !exist {
 		return false, nil
 	}
+	// if the component have been deleted don't skipGC
+	if checkResourceRelatedCompDeleted(*res, h.appRev.Spec.Application.Spec.Components) {
+		return false, nil
+	}
 	var owners []metav1.OwnerReference
 	for _, ownerReference := range res.GetOwnerReferences() {
 		if ownerReference.UID == oldRt.GetUID() {
@@ -152,3 +159,14 @@ func (h *GCHandler) handleResourceSkipGC(ctx context.Context, u *unstructured.Un
 	klog.InfoS("succeed to handle a skipGC res kind ", res.GetKind(), "namespace", res.GetNamespace(), "name", res.GetName())
 	return true, nil
 }
+
+func checkResourceRelatedCompDeleted(res unstructured.Unstructured, comps []common.ApplicationComponent) bool {
+	compName := res.GetLabels()[oam.LabelAppComponent]
+	deleted := true
+	for _, comp := range comps {
+		if compName == comp.Name {
+			deleted = false
+		}
+	}
+	return deleted
+}

pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/applicationconfiguration.go

@@ -693,7 +693,7 @@ func (e *GenerationUnchanged) Error() string {
 // applyOnceOnly is an ApplyOption that controls the applying mechanism for workload and trait.
 // More detail refers to the ApplyOnceOnlyMode type annotation
 func applyOnceOnly(ac *v1alpha2.ApplicationConfiguration, mode core.ApplyOnceOnlyMode) apply.ApplyOption {
-	return func(_ context.Context, existing, desired runtime.Object) error {
+	return apply.MakeCustomApplyOption(func(existing, desired client.Object) error {
 		if mode == core.ApplyOnceOnlyOff {
 			return nil
 		}
@@ -791,5 +791,5 @@ func applyOnceOnly(ac *v1alpha2.ApplicationConfiguration, mode core.ApplyOnceOnl
 		}
 		// its spec is not changed, return an error to abort applying it
 		return &GenerationUnchanged{}
-	}
+	})
 }

pkg/controller/core.oam.dev/v1alpha2/applicationrollout/helper.go

@@ -89,13 +89,10 @@ func HandleReplicas(ctx context.Context, rolloutComp string, c client.Client) as
 		pv := fieldpath.Pave(u.UnstructuredContent())
 
 		// we hard code here, but we can easily support more types of workload by add more cases logic in switch
-		var replicasFieldPath string
-		switch u.GetKind() {
-		case reflect.TypeOf(v1alpha1.CloneSet{}).Name(), reflect.TypeOf(appsv1.Deployment{}).Name(), reflect.TypeOf(appsv1.StatefulSet{}).Name():
-			replicasFieldPath = "spec.replicas"
-		default:
+		replicasFieldPath, err := GetWorkloadReplicasPath(*u)
+		if err != nil {
 			klog.Errorf("rollout meet a workload we cannot support yet", "Kind", u.GetKind(), "name", u.GetName())
-			return fmt.Errorf("rollout meet a workload we cannot support yet Kind  %s name %s", u.GetKind(), u.GetName())
+			return err
 		}
 
 		workload := u.DeepCopy()
@@ -127,6 +124,16 @@ func HandleReplicas(ctx context.Context, rolloutComp string, c client.Client) as
 	})
 }
 
+// GetWorkloadReplicasPath get replicas path of workload
+func GetWorkloadReplicasPath(u unstructured.Unstructured) (string, error) {
+	switch u.GetKind() {
+	case reflect.TypeOf(v1alpha1.CloneSet{}).Name(), reflect.TypeOf(appsv1.Deployment{}).Name(), reflect.TypeOf(appsv1.StatefulSet{}).Name():
+		return "spec.replicas", nil
+	default:
+		return "", fmt.Errorf("rollout meet a workload we cannot support yet Kind  %s name %s", u.GetKind(), u.GetName())
+	}
+}
+
 // appRollout should take over updating workload, so disable previous controller owner(resourceTracker)
 func disableControllerOwner(workload *unstructured.Unstructured) {
 	if workload == nil {

pkg/controller/core.oam.dev/v1alpha2/applicationrollout/helper_test.go

@@ -20,12 +20,13 @@ import (
 	"testing"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	oamstandard "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	"github.com/oam-dev/kubevela/pkg/oam/util"
 
 	"gotest.tools/assert"
+	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/utils/pointer"
@@ -192,3 +193,37 @@ func TestHandleTerminated(t *testing.T) {
 		}
 	}
 }
+
+func TestGetWorkloadReplicasPath(t *testing.T) {
+	deploy := appsv1.Deployment{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "appsv1",
+			Kind:       "Deployment",
+		},
+	}
+	u, err := util.Object2Unstructured(deploy)
+	if err != nil {
+		t.Errorf("deployment shounld't meet an error %w", err)
+	}
+	pathStr, err := GetWorkloadReplicasPath(*u)
+	if err != nil {
+		t.Errorf("deployment should handle deployment")
+	}
+	if pathStr != "spec.replicas" {
+		t.Errorf("deployPath error got %s", pathStr)
+	}
+	ds := appsv1.DaemonSet{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "appsv1",
+			Kind:       "DaemonSet",
+		},
+	}
+	u, err = util.Object2Unstructured(ds)
+	if err != nil {
+		t.Errorf("ds shounld't meet an error %w", err)
+	}
+	_, err = GetWorkloadReplicasPath(*u)
+	if err == nil {
+		t.Errorf("daemonset shouldn't support")
+	}
+}

pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition/componentdefinition_controller_test.go

@@ -173,7 +173,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -264,7 +264,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -306,8 +306,9 @@ spec:
 			cd.SetNamespace(namespace)
 			Expect(k8sClient.Create(ctx, &cd)).Should(Succeed())
 			req := reconcile.Request{NamespacedName: client.ObjectKey{Name: cd.Name, Namespace: cd.Namespace}}
+			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, cd.Name)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, cd.Name)
 			Eventually(func() bool {
 				testutil.ReconcileRetry(&r, req)
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: cd.Namespace, Name: name}, &cm)
@@ -347,7 +348,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -392,7 +393,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -501,7 +502,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -725,7 +726,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
+			name := fmt.Sprintf("component-%s%s", types.CapabilityConfigMapNamePrefix, componentDefinitionName)
 			Eventually(func() bool {
 				testutil.ReconcileRetry(&r, req)
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)

pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope.go

@@ -29,6 +29,7 @@ import (
 	"github.com/pkg/errors"
 	apps "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -370,7 +371,7 @@ func getAppConfigNameFromLabel(o metav1.Object) string {
 func getVersioningPeerWorkloadRefs(ctx context.Context, c client.Reader, wlRef core.ObjectReference, ns string) ([]core.ObjectReference, error) {
 	o := &unstructured.Unstructured{}
 	o.SetGroupVersionKind(wlRef.GroupVersionKind())
-	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: wlRef.Name}, o); err != nil {
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: wlRef.Name}, o); err != nil && !apierrors.IsNotFound(err) {
 		return nil, err
 	}
 

pkg/controller/core.oam.dev/v1alpha2/core/scopes/healthscope/healthscope_controller.go

@@ -18,6 +18,7 @@ package healthscope
 
 import (
 	"context"
+	"encoding/json"
 	"sort"
 	"strings"
 	"sync"
@@ -615,12 +616,34 @@ func (r *Reconciler) createWorkloadRefs(ctx context.Context, appRef v1alpha2.App
 				}, o); err != nil {
 					continue
 				}
-				if labels := o.GetLabels(); labels != nil && labels[oam.WorkloadTypeLabel] != "" {
-					wlRefs = append(wlRefs, WorkloadReference{
-						ObjectReference: rs.ObjectReference,
-						clusterName:     rs.Cluster,
-						envName:         decisionsMap[rs.Cluster],
-					})
+
+				if labels := o.GetLabels(); labels != nil {
+					if labels[oam.WorkloadTypeLabel] != "" {
+						wlRefs = append(wlRefs, WorkloadReference{
+							ObjectReference: rs.ObjectReference,
+							clusterName:     rs.Cluster,
+							envName:         decisionsMap[rs.Cluster],
+						})
+					} else if labels[oam.TraitTypeLabel] != "" && labels[oam.LabelManageWorkloadTrait] == "true" {
+						// this means this trait is a manage-Workload trait, get workload GVK and name for trait's annotation
+						objectRef := corev1.ObjectReference{}
+						err := json.Unmarshal([]byte(o.GetAnnotations()[oam.AnnotationWorkloadGVK]), &objectRef)
+						if err != nil {
+							// don't break whole check process due to this error
+							continue
+						}
+						if o.GetAnnotations() != nil && len(o.GetAnnotations()[oam.AnnotationWorkloadName]) != 0 {
+							objectRef.Name = o.GetAnnotations()[oam.AnnotationWorkloadName]
+						} else {
+							// use component name as default
+							objectRef.Name = labels[oam.LabelAppComponent]
+						}
+						wlRefs = append(wlRefs, WorkloadReference{
+							ObjectReference: objectRef,
+							clusterName:     rs.Cluster,
+							envName:         decisionsMap[rs.Cluster],
+						})
+					}
 				}
 			}
 		}

pkg/controller/core.oam.dev/v1alpha2/core/traits/traitdefinition/traitdefinition_controller_test.go

@@ -137,7 +137,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, traitDefinitionName)
+			name := fmt.Sprintf("trait-%s%s", types.CapabilityConfigMapNamePrefix, traitDefinitionName)
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
 				return err == nil
@@ -288,7 +288,7 @@ spec:
 
 			By("Check whether ConfigMap is created")
 			var cm corev1.ConfigMap
-			name := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, traitDefinitionName)
+			name := fmt.Sprintf("trait-%s%s", types.CapabilityConfigMapNamePrefix, traitDefinitionName)
 			Eventually(func() bool {
 				testutil.ReconcileRetry(&r, req)
 				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)

pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition/workflowstepdefinition_controller.go

@@ -122,6 +122,28 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		r.record.Event(&wfstepdefinition, event.Warning("failed to garbage collect DefinitionRevision of type WorkflowStepDefinition", err))
 	}
 
+	def := utils.NewCapabilityStepDef(&wfstepdefinition)
+	def.Name = req.NamespacedName.Name
+	// Store the parameter of stepDefinition to configMap
+	cmName, err := def.StoreOpenAPISchema(ctx, r.Client, r.pd, req.Namespace, req.Name, defRev.Name)
+	if err != nil {
+		klog.InfoS("Could not store capability in ConfigMap", "err", err)
+		r.record.Event(&(wfstepdefinition), event.Warning("Could not store capability in ConfigMap", err))
+		return ctrl.Result{}, util.PatchCondition(ctx, r, &wfstepdefinition,
+			condition.ReconcileError(fmt.Errorf(util.ErrStoreCapabilityInConfigMap, wfstepdefinition.Name, err)))
+	}
+
+	if wfstepdefinition.Status.ConfigMapRef != cmName {
+		wfstepdefinition.Status.ConfigMapRef = cmName
+		if err := r.UpdateStatus(ctx, &wfstepdefinition); err != nil {
+			klog.ErrorS(err, "Could not update WorkflowStepDefinition Status", "workflowStepDefinition", klog.KRef(req.Namespace, req.Name))
+			r.record.Event(&wfstepdefinition, event.Warning("Could not update WorkflowStepDefinition Status", err))
+			return ctrl.Result{}, util.PatchCondition(ctx, r, &wfstepdefinition,
+				condition.ReconcileError(fmt.Errorf(util.ErrUpdateWorkflowStepDefinition, wfstepdefinition.Name, err)))
+		}
+		klog.InfoS("Successfully updated the status.configMapRef of the WorkflowStepDefinition", "workflowStepDefinition",
+			klog.KRef(req.Namespace, req.Name), "status.configMapRef", cmName)
+	}
 	return ctrl.Result{}, nil
 }
 

pkg/controller/core.oam.dev/v1alpha2/core/workflow/workflowstepdefinition/workflowstepdefinition_controller_test.go

@@ -0,0 +1,197 @@
+/*
+
+ 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 workflowstepdefinition
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/yaml"
+
+	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
+	"github.com/oam-dev/kubevela/apis/types"
+	"github.com/oam-dev/kubevela/pkg/oam/testutil"
+	"github.com/oam-dev/kubevela/pkg/oam/util"
+)
+
+var _ = Describe("Apply WorkflowStepDefinition to store its schema to ConfigMap Test", func() {
+	ctx := context.Background()
+	var ns corev1.Namespace
+
+	Context("When the WorkflowStepDefinition is valid, but the namespace doesn't exist, should occur errors", func() {
+		It("Apply WorkflowStepDefinition", func() {
+			By("Apply WorkflowStepDefinition")
+			var validWorkflowStepDefinition = `
+apiVersion: core.oam.dev/v1beta1
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply raw kubernetes objects for your workflow steps
+  name: apply-object
+  namespace: not-exist
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value:   parameter.value
+        	cluster: parameter.cluster
+        }
+        parameter: {
+        	// +usage=Specify the value of the object
+        	value: {...}
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
+        }
+`
+
+			var def v1beta1.WorkflowStepDefinition
+			Expect(yaml.Unmarshal([]byte(validWorkflowStepDefinition), &def)).Should(BeNil())
+			Expect(k8sClient.Create(ctx, &def)).Should(Not(Succeed()))
+		})
+	})
+
+	Context("When the WorkflowStepDefinition is valid, should create a ConfigMap", func() {
+		var WorkflowStepDefinitionName = "apply-object"
+		var namespace = "ns-wfs-def-1"
+		req := reconcile.Request{NamespacedName: client.ObjectKey{Name: WorkflowStepDefinitionName, Namespace: namespace}}
+
+		It("Apply WorkflowStepDefinition", func() {
+			ns = corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: namespace,
+				},
+			}
+			By("Create a namespace")
+			Expect(k8sClient.Create(ctx, &ns)).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
+
+			By("Apply WorkflowStepDefinition")
+			var validWorkflowStepDefinition = `
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply raw kubernetes objects for your workflow steps
+  name: apply-object
+  namespace: ns-wfs-def-1
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value:   parameter.value
+        	cluster: parameter.cluster
+        }
+        parameter: {
+        	// +usage=Specify the value of the object
+        	value: {...}
+        	// +usage=Specify the cluster of the object
+        	cluster: *"" | string
+        }
+`
+
+			var def v1beta1.WorkflowStepDefinition
+			Expect(yaml.Unmarshal([]byte(validWorkflowStepDefinition), &def)).Should(BeNil())
+			Expect(k8sClient.Create(ctx, &def)).Should(Succeed())
+			testutil.ReconcileRetry(&r, req)
+
+			By("Check whether ConfigMap is created")
+			var cm corev1.ConfigMap
+			name := fmt.Sprintf("workflowstep-%s%s", types.CapabilityConfigMapNamePrefix, WorkflowStepDefinitionName)
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, &cm)
+				return err == nil
+			}, 30*time.Second, time.Second).Should(BeTrue())
+			Expect(cm.Data[types.OpenapiV3JSONSchema]).Should(Not(Equal("")))
+			Expect(cm.Labels["definition.oam.dev/name"]).Should(Equal(WorkflowStepDefinitionName))
+
+			By("Check whether ConfigMapRef refer to right")
+			Eventually(func() string {
+				_ = k8sClient.Get(ctx, client.ObjectKey{Namespace: def.Namespace, Name: def.Name}, &def)
+				return def.Status.ConfigMapRef
+			}, 30*time.Second, time.Second).Should(Equal(name))
+
+			By("Delete the workflowstep")
+			Expect(k8sClient.Delete(ctx, &def)).Should(Succeed())
+			testutil.ReconcileRetry(&r, req)
+		})
+	})
+
+	Context("When the WorkflowStepDefinition is invalid, should report issues", func() {
+		var invalidWorkflowStepDefinitionName = "invalid-wf1"
+		var namespace = "ns-wfs-def2"
+		BeforeEach(func() {
+			ns = corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: namespace,
+				},
+			}
+			By("Create a namespace")
+			Expect(k8sClient.Create(ctx, &ns)).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
+		})
+
+		It("Applying invalid WorkflowStepDefinition", func() {
+			By("Apply the WorkflowStepDefinition")
+			var invalidWorkflowStepDefinition = `
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply raw kubernetes objects for your workflow steps
+  name: invalid-wf1
+  namespace: ns-wfs-def2
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value:   parameter.value
+        	cluster: parameter.cluster
+        }
+`
+
+			var invalidDef v1beta1.WorkflowStepDefinition
+			Expect(yaml.Unmarshal([]byte(invalidWorkflowStepDefinition), &invalidDef)).Should(BeNil())
+			Expect(k8sClient.Create(ctx, &invalidDef)).Should(Succeed())
+			gotWorkflowStepDefinition := &v1beta1.WorkflowStepDefinition{}
+			Expect(k8sClient.Get(ctx, client.ObjectKey{Name: invalidWorkflowStepDefinitionName, Namespace: namespace}, gotWorkflowStepDefinition)).Should(BeNil())
+		})
+	})
+})

pkg/controller/standard.oam.dev/v1alpha1/rollout/handler.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/utils/pointer"
 
 	"github.com/crossplane/crossplane-runtime/pkg/event"
+	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
@@ -240,6 +241,19 @@ func (h *handler) checkWorkloadNotExist(ctx context.Context) (bool, error) {
 	return false, nil
 }
 
+func getWorkloadReplicasNum(u unstructured.Unstructured) (int32, error) {
+	replicaPath, err := applicationrollout.GetWorkloadReplicasPath(u)
+	if err != nil {
+		return 0, fmt.Errorf("get workload replicas path err %w", err)
+	}
+	wlpv := fieldpath.Pave(u.UnstructuredContent())
+	replicas, err := wlpv.GetInteger(replicaPath)
+	if err != nil {
+		return 0, fmt.Errorf("get workload replicas err %w", err)
+	}
+	return int32(replicas), nil
+}
+
 // checkRollingTerminated check the rollout if have finished
 func checkRollingTerminated(rollout v1alpha1.Rollout) bool {
 	// handle rollout completed

pkg/controller/standard.oam.dev/v1alpha1/rollout/handler_suit_test.go

@@ -40,6 +40,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/pointer"
 )
 
 var _ = Describe("Test rollout related handler func", func() {
@@ -513,6 +514,50 @@ var _ = Describe("Test rollout related handler func", func() {
 			Expect(checkRt.Status.TrackedResources[0].Name).Should(BeEquivalentTo(u.GetName()))
 			Expect(checkRt.Status.TrackedResources[0].UID).Should(BeEquivalentTo(u.GetUID()))
 		})
+
+		It("TestGetWorkloadReplicasNum", func() {
+			deployName := "test-workload-get"
+			deploy := appsv1.Deployment{
+				TypeMeta: metav1.TypeMeta{
+					Kind: "Deployment",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: namespace,
+					Name:      deployName,
+				},
+				Spec: appsv1.DeploymentSpec{
+					Replicas: pointer.Int32Ptr(3),
+					Selector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{
+							"app": "test",
+						},
+					},
+					Template: v1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Labels: map[string]string{
+								"app": "test",
+							},
+						},
+						Spec: v1.PodSpec{
+							Containers: []v1.Container{
+								{
+									Name:  "test-container",
+									Image: "test-image",
+								},
+							},
+						},
+					},
+				},
+			}
+			Expect(k8sClient.Create(ctx, &deploy)).Should(BeNil())
+			u := unstructured.Unstructured{}
+			u.SetAPIVersion("apps/v1")
+			u.SetKind("Deployment")
+			Expect(k8sClient.Get(ctx, types.NamespacedName{Name: deployName, Namespace: namespace}, &u)).Should(BeNil())
+			rep, err := getWorkloadReplicasNum(u)
+			Expect(err).Should(BeNil())
+			Expect(rep).Should(BeEquivalentTo(3))
+		})
 	})
 })
 

pkg/controller/standard.oam.dev/v1alpha1/rollout/rollout_controller.go

@@ -18,6 +18,10 @@ package rollout
 
 import (
 	"context"
+	"encoding/json"
+	"math"
+
+	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/pkg/errors"
 
@@ -34,6 +38,8 @@ import (
 	common2 "github.com/oam-dev/kubevela/pkg/controller/common"
 	rolloutplan "github.com/oam-dev/kubevela/pkg/controller/common/rollout"
 	oamctrl "github.com/oam-dev/kubevela/pkg/controller/core.oam.dev"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
 	oamutil "github.com/oam-dev/kubevela/pkg/oam/util"
 	"github.com/oam-dev/kubevela/pkg/utils/apply"
 )
@@ -110,6 +116,33 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, err
 	}
 
+	if rollout.Status.RollingState == v1alpha1.LocatingTargetAppState {
+		if rollout.GetAnnotations() == nil || rollout.GetAnnotations()[oam.AnnotationWorkloadName] != h.targetWorkload.GetName() {
+			// this is a update operation, the target workload will change so modify annotation
+			gvk := map[string]string{"apiVersion": h.targetWorkload.GetAPIVersion(), "kind": h.targetWorkload.GetKind()}
+			gvkValue, _ := json.Marshal(gvk)
+			rollout.SetAnnotations(oamutil.MergeMapOverrideWithDst(rollout.GetAnnotations(),
+				map[string]string{oam.AnnotationWorkloadName: h.targetWorkload.GetName(), oam.AnnotationWorkloadGVK: string(gvkValue)}))
+			klog.InfoS("rollout controller set targetWorkload ", h.targetWorkload.GetName(),
+				"in annotation in rollout namespace: ", rollout.Namespace, " name", rollout.Name, "gvk", gvkValue)
+			// exit current reconcile before create target workload, this reconcile don't update status just modify annotation
+			// next round reconcile will create workload and pass `LocatingTargetAppState` phase
+			return ctrl.Result{}, h.Update(ctx, rollout)
+		}
+
+		// this is a scale operation, if user don't fill rolloutBatches, fill it with default value
+		if len(h.sourceRevName) == 0 && len(rollout.Spec.RolloutPlan.RolloutBatches) == 0 {
+			// logic reach here means cannot get an error, so ignore it
+			replicas, _ := getWorkloadReplicasNum(*h.targetWorkload)
+			rollout.Spec.RolloutPlan.RolloutBatches = []v1alpha1.RolloutBatch{{
+				Replicas: intstr.FromInt(int(math.Abs(float64(*rollout.Spec.RolloutPlan.TargetSize - replicas))))},
+			}
+			klog.InfoS("rollout controller set default rollout  batches ", h.rollout.GetName(),
+				" namespace: ", rollout.Namespace, "targetSize", rollout.Spec.RolloutPlan.TargetSize)
+			return ctrl.Result{}, h.Update(ctx, rollout)
+		}
+	}
+
 	switch rollout.Status.RollingState {
 	case v1alpha1.RolloutDeletingState:
 		removed, err := h.checkWorkloadNotExist(ctx)

pkg/controller/utils/capability.go

@@ -61,6 +61,10 @@ const (
 	TerraformTupleTypePrefix  string = "tuple("
 	TerraformMapTypePrefix    string = "map("
 	TerraformObjectTypePrefix string = "object("
+
+	typeTraitDefinition        = "trait"
+	typeComponentDefinition    = "component"
+	typeWorkflowStepDefinition = "workflowstep"
 )
 
 // ErrNoSectionParameterInCue means there is not parameter section in Cue template of a workload
@@ -245,7 +249,7 @@ func (def *CapabilityComponentDefinition) StoreOpenAPISchema(ctx context.Context
 		Controller:         pointer.BoolPtr(true),
 		BlockOwnerDeletion: pointer.BoolPtr(true),
 	}}
-	cmName, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, componentDefinition.Name, jsonSchema, ownerReference)
+	cmName, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, componentDefinition.Name, typeComponentDefinition, jsonSchema, ownerReference)
 	if err != nil {
 		return cmName, err
 	}
@@ -263,7 +267,7 @@ func (def *CapabilityComponentDefinition) StoreOpenAPISchema(ctx context.Context
 		Controller:         pointer.BoolPtr(true),
 		BlockOwnerDeletion: pointer.BoolPtr(true),
 	}}
-	_, err = def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, revName, jsonSchema, ownerReference)
+	_, err = def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, revName, typeComponentDefinition, jsonSchema, ownerReference)
 	if err != nil {
 		return cmName, err
 	}
@@ -326,7 +330,7 @@ func (def *CapabilityTraitDefinition) StoreOpenAPISchema(ctx context.Context, k8
 		Controller:         pointer.BoolPtr(true),
 		BlockOwnerDeletion: pointer.BoolPtr(true),
 	}}
-	cmName, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, traitDefinition.Name, jsonSchema, ownerReference)
+	cmName, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, traitDefinition.Name, typeTraitDefinition, jsonSchema, ownerReference)
 	if err != nil {
 		return cmName, err
 	}
@@ -344,7 +348,76 @@ func (def *CapabilityTraitDefinition) StoreOpenAPISchema(ctx context.Context, k8
 		Controller:         pointer.BoolPtr(true),
 		BlockOwnerDeletion: pointer.BoolPtr(true),
 	}}
-	_, err = def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, revName, jsonSchema, ownerReference)
+	_, err = def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, revName, typeTraitDefinition, jsonSchema, ownerReference)
+	if err != nil {
+		return cmName, err
+	}
+	return cmName, nil
+}
+
+// CapabilityStepDefinition is the Capability struct for WorkflowStepDefinition
+type CapabilityStepDefinition struct {
+	Name           string                         `json:"name"`
+	StepDefinition v1beta1.WorkflowStepDefinition `json:"stepDefinition"`
+
+	CapabilityBaseDefinition
+}
+
+// NewCapabilityStepDef will create a CapabilityStepDefinition
+func NewCapabilityStepDef(stepdefinition *v1beta1.WorkflowStepDefinition) CapabilityStepDefinition {
+	var def CapabilityStepDefinition
+	def.Name = stepdefinition.Name
+	def.StepDefinition = *stepdefinition.DeepCopy()
+	return def
+}
+
+// GetOpenAPISchema gets OpenAPI v3 schema by StepDefinition name
+func (def *CapabilityStepDefinition) GetOpenAPISchema(pd *packages.PackageDiscover, name string) ([]byte, error) {
+	capability, err := appfile.ConvertTemplateJSON2Object(name, nil, def.StepDefinition.Spec.Schematic)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert WorkflowStepDefinition to Capability Object")
+	}
+	return getOpenAPISchema(capability, pd)
+}
+
+// StoreOpenAPISchema stores OpenAPI v3 schema from StepDefinition in ConfigMap
+func (def *CapabilityStepDefinition) StoreOpenAPISchema(ctx context.Context, k8sClient client.Client, pd *packages.PackageDiscover, namespace, name string, revName string) (string, error) {
+	var jsonSchema []byte
+	var err error
+
+	jsonSchema, err = def.GetOpenAPISchema(pd, name)
+	if err != nil {
+		return "", fmt.Errorf("failed to generate OpenAPI v3 JSON schema for capability %s: %w", def.Name, err)
+	}
+
+	stepDefinition := def.StepDefinition
+	ownerReference := []metav1.OwnerReference{{
+		APIVersion:         stepDefinition.APIVersion,
+		Kind:               stepDefinition.Kind,
+		Name:               stepDefinition.Name,
+		UID:                stepDefinition.GetUID(),
+		Controller:         pointer.BoolPtr(true),
+		BlockOwnerDeletion: pointer.BoolPtr(true),
+	}}
+	cmName, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, stepDefinition.Name, typeWorkflowStepDefinition, jsonSchema, ownerReference)
+	if err != nil {
+		return cmName, err
+	}
+
+	// Create a configmap to store parameter for each definitionRevision
+	defRev := new(v1beta1.DefinitionRevision)
+	if err = k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: revName}, defRev); err != nil {
+		return "", err
+	}
+	ownerReference = []metav1.OwnerReference{{
+		APIVersion:         defRev.APIVersion,
+		Kind:               defRev.Kind,
+		Name:               defRev.Name,
+		UID:                defRev.GetUID(),
+		Controller:         pointer.BoolPtr(true),
+		BlockOwnerDeletion: pointer.BoolPtr(true),
+	}}
+	_, err = def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, revName, typeWorkflowStepDefinition, jsonSchema, ownerReference)
 	if err != nil {
 		return cmName, err
 	}
@@ -357,8 +430,8 @@ type CapabilityBaseDefinition struct {
 
 // CreateOrUpdateConfigMap creates ConfigMap to store OpenAPI v3 schema or or updates data in ConfigMap
 func (def *CapabilityBaseDefinition) CreateOrUpdateConfigMap(ctx context.Context, k8sClient client.Client, namespace,
-	definitionName string, jsonSchema []byte, ownerReferences []metav1.OwnerReference) (string, error) {
-	cmName := fmt.Sprintf("%s%s", types.CapabilityConfigMapNamePrefix, definitionName)
+	definitionName, definitionType string, jsonSchema []byte, ownerReferences []metav1.OwnerReference) (string, error) {
+	cmName := fmt.Sprintf("%s-%s%s", definitionType, types.CapabilityConfigMapNamePrefix, definitionName)
 	var cm v1.ConfigMap
 	var data = map[string]string{
 		types.OpenapiV3JSONSchema: string(jsonSchema),
@@ -399,7 +472,7 @@ func (def *CapabilityBaseDefinition) CreateOrUpdateConfigMap(ctx context.Context
 	return cmName, nil
 }
 
-// getDefinition is the main function for GetDefinition API
+// getOpenAPISchema is the main function for GetDefinition API
 func getOpenAPISchema(capability types.Capability, pd *packages.PackageDiscover) ([]byte, error) {
 	openAPISchema, err := generateOpenAPISchemaFromCapabilityParameter(capability, pd)
 	if err != nil {

pkg/controller/utils/capability_integrate_test.go

@@ -181,7 +181,7 @@ spec:
 				Controller:         pointer.BoolPtr(true),
 				BlockOwnerDeletion: pointer.BoolPtr(true),
 			}}
-			_, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, definitionName, []byte(""), ownerReference)
+			_, err := def.CreateOrUpdateConfigMap(ctx, k8sClient, namespace, definitionName, typeTraitDefinition, []byte(""), ownerReference)
 			Expect(err).Should(BeNil())
 		})
 	})

pkg/cue/definition/template.go

@@ -231,10 +231,11 @@ func (wd *workloadDef) Status(ctx process.Context, cli client.Client, ns string,
 	if err != nil {
 		return "", errors.WithMessage(err, "get template context")
 	}
-	return getStatusMessage(templateContext, customStatusTemplate, parameter)
+	return getStatusMessage(wd.pd, templateContext, customStatusTemplate, parameter)
 }
 
-func getStatusMessage(templateContext map[string]interface{}, customStatusTemplate string, parameter interface{}) (string, error) {
+func getStatusMessage(pd *packages.PackageDiscover, templateContext map[string]interface{}, customStatusTemplate string, parameter interface{}) (string, error) {
+	bi := build.NewContext().NewInstance("", nil)
 	var ctxBuff string
 	var paramBuff = "parameter: {}\n"
 
@@ -251,10 +252,12 @@ func getStatusMessage(templateContext map[string]interface{}, customStatusTempla
 	if string(bt) != "null" {
 		paramBuff = "parameter: " + string(bt) + "\n"
 	}
-	var buff = ctxBuff + paramBuff + customStatusTemplate
+	var buff = customStatusTemplate + "\n" + ctxBuff + paramBuff
+	if err := bi.AddFile("-", buff); err != nil {
+		return "", errors.WithMessagef(err, "invalid cue template of customStatus")
+	}
 
-	var r cue.Runtime
-	inst, err := r.Compile("-", buff)
+	inst, err := pd.ImportPackagesAndBuildInstance(bi)
 	if err != nil {
 		return "", errors.WithMessage(err, "compile customStatus template")
 	}
@@ -426,7 +429,7 @@ func (td *traitDef) Status(ctx process.Context, cli client.Client, ns string, cu
 	if err != nil {
 		return "", errors.WithMessage(err, "get template context")
 	}
-	return getStatusMessage(templateContext, customStatusTemplate, parameter)
+	return getStatusMessage(td.pd, templateContext, customStatusTemplate, parameter)
 }
 
 // HealthCheck address health check for trait

pkg/cue/definition/template_test.go

@@ -1245,9 +1245,36 @@ if len(context.outputs.ingress.status.loadBalancer.ingress) == 0 {
 			statusTemp: `message: parameter.configInfo.name + ".type: " + context.outputs["\(parameter.configInfo.name)"].spec.type`,
 			expMessage: "test-name.type: NodePort",
 		},
+		"import package in template": {
+			tpContext: map[string]interface{}{
+				"outputs": map[string]interface{}{
+					"service": map[string]interface{}{
+						"spec": map[string]interface{}{
+							"type":      "NodePort",
+							"clusterIP": "10.0.0.1",
+							"ports": []interface{}{
+								map[string]interface{}{
+									"port": 80,
+								},
+							},
+						},
+					},
+					"ingress": map[string]interface{}{
+						"rules": []interface{}{
+							map[string]interface{}{
+								"host": "example.com",
+							},
+						},
+					},
+				},
+			},
+			statusTemp: `import "strconv"
+      message: "ports: " + strconv.FormatInt(context.outputs.service.spec.ports[0].port,10)`,
+			expMessage: "ports: 80",
+		},
 	}
 	for message, ca := range cases {
-		gotMessage, err := getStatusMessage(ca.tpContext, ca.statusTemp, ca.parameter)
+		gotMessage, err := getStatusMessage(&packages.PackageDiscover{}, ca.tpContext, ca.statusTemp, ca.parameter)
 		assert.NoError(t, err, message)
 		assert.Equal(t, ca.expMessage, gotMessage, message)
 	}

pkg/cue/model/sets/utils.go

@@ -311,8 +311,11 @@ func openBaiscLit(root ast.Node) {
 		field, ok := node.(*ast.Field)
 		if ok {
 			v := field.Value
-			if lit, ok := v.(*ast.BasicLit); ok {
+			switch lit := v.(type) {
+			case *ast.BasicLit:
 				field.Value = ast.NewBinExpr(token.OR, &ast.UnaryExpr{X: lit, Op: token.MUL}, ast.NewIdent("_"))
+			case *ast.ListLit:
+				field.Value = ast.NewBinExpr(token.OR, &ast.UnaryExpr{X: lit, Op: token.MUL}, ast.NewList(&ast.Ellipsis{}))
 			}
 		}
 		return true

pkg/cue/model/sets/utils_test.go

@@ -248,6 +248,7 @@ b: "foo"
 b1: string
 c: true
 c1: bool
+arr: [1,2]
 top: _
 bottom: _|_
 `)
@@ -258,6 +259,7 @@ b:      *"foo" | _
 b1:     string
 c:      *true | _
 c1:     bool
+arr:    *[1, 2] | [...]
 top:    _
 bottom: _|_
 `)

pkg/cue/packages/package.go

@@ -35,6 +35,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+
+	"github.com/oam-dev/kubevela/pkg/stdlib"
 )
 
 const (
@@ -107,6 +109,9 @@ func (pd *PackageDiscover) ImportBuiltinPackagesFor(bi *build.Instance) {
 // ImportPackagesAndBuildInstance Combine import built-in packages and build cue template together to avoid data race
 func (pd *PackageDiscover) ImportPackagesAndBuildInstance(bi *build.Instance) (inst *cue.Instance, err error) {
 	pd.ImportBuiltinPackagesFor(bi)
+	if err := stdlib.AddImportsFor(bi, ""); err != nil {
+		return nil, err
+	}
 	var r cue.Runtime
 	pd.mutex.Lock()
 	defer pd.mutex.Unlock()

pkg/cue/process/handle.go

@@ -197,7 +197,7 @@ func (ctx *templateContext) BaseContextFile() string {
 	if len(ctx.auxiliaries) > 0 {
 		var auxLines []string
 		for _, auxiliary := range ctx.auxiliaries {
-			auxLines = append(auxLines, fmt.Sprintf("%s: %s", auxiliary.Name, structMarshal(auxiliary.Ins.String())))
+			auxLines = append(auxLines, fmt.Sprintf("\"%s\": %s", auxiliary.Name, structMarshal(auxiliary.Ins.String())))
 		}
 		if len(auxLines) > 0 {
 			buff += fmt.Sprintf(model.OutputsFieldName+": {%s}\n", strings.Join(auxLines, "\n"))

pkg/cue/process/handle_test.go

@@ -64,6 +64,11 @@ image: "myserver"
 		Name: "service",
 	}
 
+	svcAuxWithAbnormalName := Auxiliary{
+		Ins:  svcIns,
+		Name: "service-1",
+	}
+
 	targetParams := map[string]interface{}{
 		"parameter1": "string",
 		"parameter2": map[string]string{
@@ -98,6 +103,7 @@ image: "myserver"
 	ctx := NewContext("myns", "mycomp", "myapp", "myapp-v1")
 	ctx.SetBase(base)
 	ctx.AppendAuxiliaries(svcAux)
+	ctx.AppendAuxiliaries(svcAuxWithAbnormalName)
 	ctx.SetParameters(targetParams)
 	ctx.PushData(model.ContextDataArtifacts, targetData)
 	ctx.PushData("arbitraryData", targetArbitraryData)
@@ -132,6 +138,10 @@ image: "myserver"
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\"}", string(outputsJs))
 
+	outputsJs, err = ctxInst.Lookup("context", model.OutputsFieldName, "service-1").MarshalJSON()
+	assert.Equal(t, nil, err)
+	assert.Equal(t, "{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\"}", string(outputsJs))
+
 	ns, err := ctxInst.Lookup("context", model.ContextNamespace).String()
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "myns", ns)

pkg/monitor/README.md

@@ -0,0 +1,46 @@
+# Package Usage
+
+## Context
+First, this context is compatible with built-in context interface.
+Also it supports fork and commit like trace span.
+
+### Fork
+`Fork` will generate a sub context that inherit the parent's tags. When new tags are added to the `sub-context`, the `parent-context` will not be affected.
+
+### Commit
+`Commit` will log the context duration, and export metrics or other execution information.
+
+### usage
+```
+tracerCtx:=context.NewTraceContext(stdCtx,"$id") 
+defer tracerCtx.Commit("success")
+
+// Execute sub-code logic
+subCtx:=tracerCtx.Fork("sub-id")
+...
+subCtx.Commit("step is executed")
+
+```
+
+## Metrics
+First, you need register `metricVec` in package `pkg/monitor/metrics`, like below:
+```
+StepDurationSummary = prometheus.NewSummaryVec(prometheus.SummaryOpts{
+		Name:        "step_duration_ms",
+		Help:        "step latency distributions.",
+		Objectives:  map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		ConstLabels: prometheus.Labels{},
+	}, []string{"application", "workflow_revision", "step_name", "step_type"})
+```
+
+Now, you can export metrics by context,for example
+```
+subCtx:=tracerCtx.Fork("sub-id",DurationMetric(func(v float64) {
+					metrics.StepDurationSummary.WithLabelValues(e.app.Name, e.status.AppRevision, stepStatus.Name, stepStatus.Type).Observe(v)
+				})
+subCtx.Commit("export") // At this time, it will export the StepDurationSummary metrics. 			
+
+```
+
+Context only support `DurationMetric` exporter. you can submit pr to support more exporters.
+If metrics have nothing to do with context, there is no need to extend it through context exporter

pkg/monitor/context/context.go

@@ -0,0 +1,170 @@
+/*
+ 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 context
+
+import (
+	stdctx "context"
+	"fmt"
+	"time"
+
+	"github.com/oam-dev/kubevela/pkg/utils"
+
+	"k8s.io/klog/v2"
+)
+
+const (
+	// spanTagID is the tag name of span ID.
+	spanTagID = "spanID"
+)
+
+// Context keep the trace info
+type Context interface {
+	stdctx.Context
+	Logger
+	GetContext() stdctx.Context
+	SetContext(ctx stdctx.Context)
+	AddTag(keysAndValues ...interface{}) Context
+	Fork(name string, exporters ...Exporter) Context
+	Commit(msg string)
+}
+
+// Logger represents the ability to log messages, both errors and not.
+type Logger interface {
+	InfoDepth(depth int, msg string, keysAndValues ...interface{})
+	Info(msg string, keysAndValues ...interface{})
+	Error(err error, msg string, keysAndValues ...interface{})
+	ErrorDepth(depth int, err error, msg string, keysAndValues ...interface{})
+	Printf(format string, args ...interface{})
+	V(level int)
+}
+
+type traceContext struct {
+	stdctx.Context
+
+	id             string
+	beginTimestamp time.Time
+	logLevel       int
+
+	tags      []interface{}
+	exporters []Exporter
+	parent    *traceContext
+}
+
+// Fork a child Context extends parent Context
+func (t *traceContext) Fork(id string, exporters ...Exporter) Context {
+	if id == "" {
+		id = t.id
+	} else {
+		id = t.id + "." + id
+	}
+
+	return &traceContext{
+		Context:        t.Context,
+		id:             id,
+		tags:           copySlice(t.tags),
+		logLevel:       t.logLevel,
+		parent:         t,
+		beginTimestamp: time.Now(),
+		exporters:      exporters,
+	}
+}
+
+// Commit finish the span record
+func (t *traceContext) Commit(msg string) {
+	msg = fmt.Sprintf("[Finished]: %s(%s)", t.id, msg)
+	duration := time.Since(t.beginTimestamp)
+	for _, export := range t.exporters {
+		export(t, duration.Microseconds())
+	}
+	klog.InfoSDepth(1, msg, t.getTagsWith("duration", duration.String())...)
+}
+
+func (t *traceContext) getTagsWith(keysAndValues ...interface{}) []interface{} {
+	tags := append(t.tags, keysAndValues...)
+	return append(tags, spanTagID, t.id)
+}
+
+// Info logs a non-error message with the given key/value pairs as context.
+func (t *traceContext) Info(msg string, keysAndValues ...interface{}) {
+	klog.InfoSDepth(1, msg, t.getTagsWith(keysAndValues...)...)
+}
+
+// GetContext get raw context.
+func (t *traceContext) GetContext() stdctx.Context {
+	return t.Context
+}
+
+// SetContext set raw context.
+func (t *traceContext) SetContext(ctx stdctx.Context) {
+	t.Context = ctx
+}
+
+// InfoDepth acts as Info but uses depth to determine which call frame to log.
+func (t *traceContext) InfoDepth(depth int, msg string, keysAndValues ...interface{}) {
+	klog.InfoSDepth(depth+1, msg, t.getTagsWith(keysAndValues...)...)
+}
+
+// Error logs an error, with the given message and key/value pairs as context.
+func (t *traceContext) Error(err error, msg string, keysAndValues ...interface{}) {
+	klog.ErrorSDepth(1, err, msg, t.getTagsWith(keysAndValues...)...)
+}
+
+// ErrorDepth acts as Error but uses depth to determine which call frame to log.
+func (t *traceContext) ErrorDepth(depth int, err error, msg string, keysAndValues ...interface{}) {
+	klog.ErrorSDepth(depth+1, err, msg, t.getTagsWith(keysAndValues...)...)
+}
+
+// Printf formats according to a format specifier and logs.
+func (t *traceContext) Printf(format string, args ...interface{}) {
+	klog.InfoSDepth(1, fmt.Sprintf(format, args...), t.getTagsWith()...)
+}
+
+// V reports whether verbosity at the call site is at least the requested level.
+func (t *traceContext) V(level int) {
+	t.logLevel = level
+}
+
+// AddTag adds some key-value pairs of context to a logger.
+func (t *traceContext) AddTag(keysAndValues ...interface{}) Context {
+	t.tags = append(t.tags, keysAndValues...)
+	return t
+}
+
+// NewTraceContext new a TraceContext
+func NewTraceContext(ctx stdctx.Context, id string) Context {
+	if id == "" {
+		id = "i-" + utils.RandomString(8)
+	}
+	return &traceContext{
+		Context:        ctx,
+		id:             id,
+		beginTimestamp: time.Now(),
+	}
+}
+
+func copySlice(in []interface{}) []interface{} {
+	out := make([]interface{}, len(in))
+	copy(out, in)
+	return out
+}
+
+// Exporter export context info.
+type Exporter func(t *traceContext, duration int64)
+
+// DurationMetric export context duration metric.
+func DurationMetric(h func(v float64)) Exporter {
+	return func(t *traceContext, duration int64) {
+		h(float64(duration / 1000))
+	}
+}

pkg/monitor/context/context_test.go

@@ -0,0 +1,45 @@
+/*
+ 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 context
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+func TestLog(t *testing.T) {
+	ctx := NewTraceContext(context.Background(), types.NamespacedName{
+		Namespace: "default",
+		Name:      "test-app",
+	}.String())
+
+	ctx.AddTag("controller", "application")
+	ctx.Info("init")
+	ctx.InfoDepth(1, "init")
+	defer ctx.Commit("close")
+	spanCtx := ctx.Fork("child1", DurationMetric(func(v float64) {
+		fmt.Println(v)
+	}))
+	time.Sleep(time.Millisecond * 30)
+	err := errors.New("mock error")
+	ctx.Error(err, "test case", "generated", "test_log")
+	ctx.ErrorDepth(1, err, "test case", "generated", "test_log")
+	spanCtx.Commit("finished")
+
+}

pkg/monitor/metrics/workflow.go

@@ -0,0 +1,36 @@
+/*
+ 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 metrics
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
+)
+
+var (
+	// StepDurationSummary report the step execution duration summary.
+	StepDurationSummary = prometheus.NewSummaryVec(prometheus.SummaryOpts{
+		Name:        "step_duration_ms",
+		Help:        "step latency distributions.",
+		Objectives:  map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		ConstLabels: prometheus.Labels{},
+	}, []string{"application", "workflow_revision", "step_name", "step_type"})
+)
+
+func init() {
+	if err := metrics.Registry.Register(StepDurationSummary); err != nil {
+		klog.Error(err)
+	}
+}

pkg/oam/labels.go

@@ -125,4 +125,10 @@ const (
 
 	// AnnotationLastAppliedConfiguration is kubectl annotations for 3-way merge
 	AnnotationLastAppliedConfiguration = "kubectl.kubernetes.io/last-applied-configuration"
+
+	// AnnotationWorkloadGVK indicates the managed workload's GVK by trait
+	AnnotationWorkloadGVK = "trait.oam.dev/workload-gvk"
+
+	// AnnotationWorkloadName indicates the managed workload's name by trait
+	AnnotationWorkloadName = "trait.oam.dev/workload-name"
 )

pkg/oam/util/helper.go

@@ -100,6 +100,8 @@ const (
 	ErrUpdateComponentDefinition = "cannot update ComponentDefinition %s: %v"
 	// ErrUpdateTraitDefinition is the error while update TraitDefinition
 	ErrUpdateTraitDefinition = "cannot update TraitDefinition %s: %v"
+	// ErrUpdateStepDefinition is the error while update WorkflowStepDefinition
+	ErrUpdateStepDefinition = "cannot update WorkflowStepDefinition %s: %v"
 	// ErrUpdatePolicyDefinition is the error while update PolicyDefinition
 	ErrUpdatePolicyDefinition = "cannot update PolicyDefinition %s: %v"
 	// ErrUpdateWorkflowStepDefinition is the error while update WorkflowStepDefinition

pkg/stdlib/packages.go

@@ -27,8 +27,7 @@ import (
 
 var (
 	//go:embed pkgs op.cue
-	fs         embed.FS
-	pkgContent string
+	fs embed.FS
 )
 
 // GetPackages Get Stdlib packages
@@ -44,7 +43,7 @@ func GetPackages(tagTempl string) (map[string]string, error) {
 		return nil, err
 	}
 
-	pkgContent = string(opBytes) + "\n"
+	pkgContent := string(opBytes) + "\n"
 	for _, file := range files {
 		body, err := fs.ReadFile("pkgs/" + file.Name())
 		if err != nil {